Merge branch 'develop'

sfall-team · Oct 18, 2017 · 8ae705d · 8ae705d
2 parents ee67b9b + 94fdfb4
commit 8ae705d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini
@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v4.0
+;v4.0.1
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.

diff --git a/sfall/Modules/BugFixes.cpp b/sfall/Modules/BugFixes.cpp
@@ -1079,6 +1079,15 @@ static void __declspec(naked) compute_attack_hook() {
 	}
 }
 
+static void __declspec(naked) partyMemberGetCurLevel_hack() {
+	__asm {
+		mov  esi, 0xFFFFFFFF; // initialize party member index
+		mov  edi, dword ptr ds:[FO_VAR_partyMemberMaxCount];
+		push 0x495FFC;
+		retn;
+	}
+}
+
 
 void BugFixes::init()
 {
@@ -1377,6 +1386,9 @@ void BugFixes::init()
 		HookCall(0x423A99, &compute_attack_hook);
 		dlogr(" Done", DL_INIT);
 	//}
+
+	// Fix crash when calling partyMemberGetCurLevel_ on a critter that has no data in party.txt
+	MakeJump(0x495FF6, partyMemberGetCurLevel_hack);
 }
 
 }
diff --git a/sfall/version.h b/sfall/version.h
@@ -24,13 +24,13 @@
 
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 0
-#define VERSION_BUILD 0
+#define VERSION_BUILD 1
 #define VERSION_REV 0
 
 #ifdef WIN2K
-#define VERSION_STRING "4.0 win2k"
+#define VERSION_STRING "4.0.1 win2k"
 #else
-#define VERSION_STRING "4.0"
+#define VERSION_STRING "4.0.1"
 #endif
 
 #define CHECK_VAL  (4)