Fix crash when player dies on fire (#4210)

FileEX · web-flow · commit 1f8ad3725d84 · 2025-05-08T00:08:21.000Z
diff --git a/Client/game_sa/CFireSA.cpp b/Client/game_sa/CFireSA.cpp
@@ -242,13 +242,16 @@ static void _declspec(naked) HOOK_CFire_Extinguish()
     _asm
     {
         mov [eax+730h], edi
-        mov ebx, [esp+8]
+
+        push ebx
+        mov ebx, [esp+0Ch]
 
         push ebx
         push eax
         call AbortFireTask
         add esp, 8
 
+        pop ebx
         jmp CONTINUE_CFire_Extinguish
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -242,13 +242,16 @@ static void _declspec(naked) HOOK_CFire_Extinguish()`
`242`	`242`	`_asm`
`243`	`243`	`{`
`244`	`244`	`mov [eax+730h], edi`
`245`		`- mov ebx, [esp+8]`
	`245`	`+`
	`246`	`+ push ebx`
	`247`	`+ mov ebx, [esp+0Ch]`
`246`	`248`
`247`	`249`	`push ebx`
`248`	`250`	`push eax`
`249`	`251`	`call AbortFireTask`
`250`	`252`	`add esp, 8`
`251`	`253`
	`254`	`+ pop ebx`
`252`	`255`	`jmp CONTINUE_CFire_Extinguish`
`253`	`256`	`}`
`254`	`257`	`}`