Fix crash when calling partyMemberGetCurLevel_ on a critter that has no data in party.txt.

NovaRain · NovaRain · commit 5786cfb26771 · 2017-10-18T14:56:38.000+08:00
Updated version number.
diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini
@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.5
+;v3.8.6
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
diff --git a/sfall/Bugs.cpp b/sfall/Bugs.cpp
@@ -1104,6 +1104,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:[_partyMemberMaxCount];
+		push 0x495FFC;
+		retn;
+	}
+}
+
 
 void BugsInit()
 {
@@ -1405,4 +1414,7 @@ void BugsInit()
 		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
@@ -22,12 +22,12 @@
 
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 8
-#define VERSION_BUILD 5
+#define VERSION_BUILD 6
 #define VERSION_REV 0
 #ifdef WIN2K
-#define VERSION_STRING "3.8.5 win2k"
+#define VERSION_STRING "3.8.6 win2k"
 #else
-#define VERSION_STRING "3.8.5"
+#define VERSION_STRING "3.8.6"
 #endif
 
 #define CHECK_VAL  (4)

Original file line number	Diff line number	Diff line change
`@@ -1104,6 +1104,15 @@ static void __declspec(naked) compute_attack_hook() {`
`1104`	`1104`	`}`
`1105`	`1105`	`}`
`1106`	`1106`
	`1107`	`+static void __declspec(naked) partyMemberGetCurLevel_hack() {`
	`1108`	`+ __asm {`
	`1109`	`+ mov esi, 0xFFFFFFFF; // initialize party member index`
	`1110`	`+ mov edi, dword ptr ds:[_partyMemberMaxCount];`
	`1111`	`+ push 0x495FFC;`
	`1112`	`+ retn;`
	`1113`	`+ }`
	`1114`	`+}`
	`1115`	`+`
`1107`	`1116`
`1108`	`1117`	`void BugsInit()`
`1109`	`1118`	`{`
`@@ -1405,4 +1414,7 @@ void BugsInit()`
`1405`	`1414`	`HookCall(0x423A99, &compute_attack_hook);`
`1406`	`1415`	`dlogr(" Done", DL_INIT);`
`1407`	`1416`	`//}`
	`1417`	`+`
	`1418`	`+ // Fix crash when calling partyMemberGetCurLevel_ on a critter that has no data in party.txt`
	`1419`	`+ MakeJump(0x495FF6, partyMemberGetCurLevel_hack);`
`1408`	`1420`	`}`