Added a safeguard to stat_level engine function

(ref. fallout2-ce/fallout2-ce#76)

Unified the naming style of return addr variables for some ASM code.

Author: NovaRain

sfall/Modules/BugFixes.cpp

@@ -1054,7 +1054,7 @@ static __declspec(naked) void MultiHexRetargetTileFix() {
 }
 
 static __declspec(naked) void MultiHexCombatMoveFix() {
-	static const DWORD ai_move_steps_closer_move_object_ret = 0x42A192;
+	static const DWORD ai_move_steps_closer_move_object_Ret = 0x42A192;
 	__asm {
 		test [edi + flags + 1], 0x08; // is target multihex?
 		jnz  multiHex;
@@ -1068,12 +1068,12 @@ static __declspec(naked) void MultiHexCombatMoveFix() {
 		retn;                         // tilenums are not equal, always move to tile
 moveToObject:
 		add  esp, 4;
-		jmp  ai_move_steps_closer_move_object_ret; // move to object
+		jmp  ai_move_steps_closer_move_object_Ret; // move to object
 	}
 }
 
 static __declspec(naked) void MultiHexCombatRunFix() {
-	static const DWORD ai_move_steps_closer_run_object_ret = 0x42A169;
+	static const DWORD ai_move_steps_closer_run_object_Ret = 0x42A169;
 	__asm {
 		test [edi + flags + 1], 0x08; // is target multihex?
 		jnz  multiHex;
@@ -1087,7 +1087,7 @@ static __declspec(naked) void MultiHexCombatRunFix() {
 		retn;                         // tilenums are not equal, always run to tile
 runToObject:
 		add  esp, 4;
-		jmp  ai_move_steps_closer_run_object_ret; // run to object
+		jmp  ai_move_steps_closer_run_object_Ret; // run to object
 	}
 }
 
@@ -2070,15 +2070,15 @@ static __declspec(naked) void inven_find_id_hack() {
 }
 
 static __declspec(naked) void op_start_gdialog_hack() {
-	static const DWORD op_start_gdialog_ret = 0x456F4B;
+	static const DWORD op_start_gdialog_Ret = 0x456F4B;
 	__asm {
 		cmp  eax, -1;                                 // check mood arg
 		jnz  useMood;
 		mov  eax, dword ptr [esp + 0x3C - 0x30 + 4];  // fix dialog_target (overwritten engine code)
 		retn;
 useMood:
 		add  esp, 4;                                  // Destroy the return address
-		jmp  op_start_gdialog_ret;
+		jmp  op_start_gdialog_Ret;
 	}
 }
 

sfall/Modules/DebugEditor.cpp

@@ -298,12 +298,12 @@ void RunDebugEditor() {
 }
 
 static __declspec(naked) void dbg_error_hack() {
-	static const DWORD dbg_error_ret = 0x453FD8;
+	static const DWORD dbg_error_Ret = 0x453FD8;
 	__asm {
 		cmp  ebx, 1;
 		je   hide;
 		sub  esp, 0x104;
-		jmp  dbg_error_ret;
+		jmp  dbg_error_Ret;
 hide:
 		pop  esi;
 		pop  ecx;

sfall/Modules/Interface.cpp

@@ -164,13 +164,13 @@ static __declspec(naked) void intface_init_hack() {
 }
 
 static __declspec(naked) void intface_update_move_points_hack() {
-	static const DWORD intface_update_move_points_ret = 0x45EE3E;
+	static const DWORD intface_update_move_points_Ret = 0x45EE3E;
 	__asm {
 		mov  eax, 16 * 9
 		push eax;
 		push 5;
 		push eax;
-		jmp  intface_update_move_points_ret;
+		jmp  intface_update_move_points_Ret;
 	}
 }
 

sfall/Modules/Stats.cpp

@@ -52,13 +52,22 @@ static struct StatFormula {
 static fo::GameObject* cCritter;
 
 static __declspec(naked) void stat_level_hack() {
+	static const DWORD stat_level_Ret = 0x4AEF93;
 	using namespace fo;
+	using namespace Fields;
 	__asm {
+		mov  esi, [eax + protoId];
+		shr  esi, 24;
+		cmp  esi, OBJ_TYPE_CRITTER;
+		jne  skip; // only critters have stats
 		mov  cCritter, eax;
 		// overwritten engine code
 		mov  esi, edx;
 		cmp  edx, STAT_current_hp;
 		retn;
+skip:
+		add  esp, 4;
+		jmp  stat_level_Ret;
 	}
 }
 

sfall/Modules/SubModules/ObjectName.cpp

@@ -51,7 +51,7 @@ const char* __stdcall ObjectName::GetName(fo::GameObject* object) {
 }
 
 static __declspec(naked) void critter_name_hack() {
-	static DWORD critter_name_hack_ret = 0x42D125;
+	static DWORD critter_name_hack_Ret = 0x42D125;
 	using namespace fo::Fields;
 	__asm {
 		push ebx; // object
@@ -62,12 +62,12 @@ static __declspec(naked) void critter_name_hack() {
 		retn;
 override:
 		add  esp, 4;
-		jmp  critter_name_hack_ret;
+		jmp  critter_name_hack_Ret;
 	}
 }
 
 static __declspec(naked) void critter_name_hack_check() {
-	static DWORD critter_name_hack_ret = 0x42D12F;
+	static DWORD critter_name_hack_Ret = 0x42D12F;
 	using namespace fo::Fields;
 	__asm {
 		mov  ecx, [ebx + scriptId];
@@ -77,7 +77,7 @@ static __declspec(naked) void critter_name_hack_check() {
 		jne  default;
 		add  esp, 4;
 		mov  eax, ds:[FO_VAR_name_critter];
-		jmp  critter_name_hack_ret;
+		jmp  critter_name_hack_Ret;
 checkScrIdx:
 		mov  ecx, [ebx + scriptIndex];
 		cmp  ecx, -1; // no inherited script index
@@ -86,7 +86,7 @@ static __declspec(naked) void critter_name_hack_check() {
 		jne  end;
 		add  esp, 4;
 		mov  eax, ds:[FO_VAR_name_critter];
-		jmp  critter_name_hack_ret;
+		jmp  critter_name_hack_Ret;
 default:
 		mov  ecx, [ebx + scriptIndex];
 end:

sfall/Modules/Unarmed.cpp

@@ -309,7 +309,7 @@ static long __fastcall get_unarmed_damage(fo::GameObject* source, fo::AttackType
 }
 
 static __declspec(naked) void item_w_damage_hack() {
-	static DWORD item_w_damage_hack_ret = 0x478553;
+	static DWORD item_w_damage_hack_Ret = 0x478553;
 	__asm {
 		lea  eax, [esp + 4]; // min_DMG
 		lea  edx, [esp + 0]; // max_DMG
@@ -320,7 +320,7 @@ static __declspec(naked) void item_w_damage_hack() {
 		call get_unarmed_damage;
 		mov  ebx, eax; // bonus
 		pop  ecx;
-		jmp  item_w_damage_hack_ret;
+		jmp  item_w_damage_hack_Ret;
 	}
 }