Merge branch 'develop'

sfall-team · Jun 3, 2019 · 250e7be · 250e7be
2 parents e105b8c + 2299113
commit 250e7be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/sfall/Modules/Combat.cpp b/sfall/Modules/Combat.cpp
@@ -168,8 +168,8 @@ static double ApplyModifiers(std::vector<KnockbackModifier>* mods, fo::GameObjec
 
 static DWORD __fastcall CalcKnockbackMod(int knockValue, int damage, fo::GameObject* weapon, fo::GameObject* attacker, fo::GameObject* target) {
 	double result = (double)damage / (double)knockValue;
-	result = ApplyModifiers(&mWeapons, weapon, result);
-	result = ApplyModifiers(&mAttackers, attacker, result);
+	if (weapon) result = ApplyModifiers(&mWeapons, weapon, result);
+	if (attacker) result = ApplyModifiers(&mAttackers, attacker, result);
 	result = ApplyModifiers(&mTargets, target, result);
 	return (DWORD)floor(result);
 }
@@ -192,9 +192,9 @@ static void __declspec(naked) compute_dmg_damage_hack() {
 	__asm {
 		push ecx
 		push esi;               // Target
-		mov  eax, -1;
-		push eax;               // Attacker
-		push eax;               // Weapon
+		xor  eax, eax;
+		push eax;               // Attacker (no attacker)
+		push eax;               // Weapon   (no weapon)
 		mov  edx, ebx;          // Damage
 		mov  ecx, 10;           // Knockback value
 		call CalcKnockbackMod;

diff --git a/sfall/ddraw.vcxproj b/sfall/ddraw.vcxproj
@@ -148,7 +148,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -197,7 +197,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -246,7 +246,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>

diff --git a/sfall/version.h b/sfall/version.h
@@ -25,9 +25,9 @@
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 1
 #define VERSION_BUILD 8
-#define VERSION_REV 0
+#define VERSION_REV 1
 
-#define VERSION_STRING "4.1.8"
+#define VERSION_STRING "4.1.8.1"
 
 //#define CHECK_VAL  (4)