Skip to content

Fix #624 & 3532 onClientObjectBreak has attacker=nil when broken object is glass #3533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Fix #624 & 3532 onClientObjectBreak has attacker=nil when broken object is glass #3533

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b998c4
Fix old bugs
FileEX Jul 1, 2024
bb78f3f
Merge branch 'master' into bugfix/glass_attacker
FileEX Jul 1, 2024
09aa4d1
Merge branch 'master' into bugfix/glass_attacker
FileEX Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 83 additions & 10 deletions Client/multiplayer_sa/CMultiplayerSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@ DWORD JMP_DynamicObject_Cond_Zero = 0x548E98;
DWORD RETURN_CGlass_WindowRespondsToCollision = 0x71BC48;
#define HOOKPOS_CGlass__BreakGlassPhysically 0x71D14B
DWORD RETURN_CGlass__BreakGlassPhysically = 0x71D150;
#define HOOKPOS_CGlass_WindowRespondsToExplosion 0x71C255
DWORD RETURN_CGlass_WindowRespondsToExplosion = 0x71C25A;
constexpr const DWORD CALL_FROM_CGlass_WindowRespondsToExplosion = 0x71C28E;
constexpr const DWORD CALL_FROM_CGlass_WasGlassHitByBullet = 0x71C192;
constexpr const DWORD CALL_FROM_CPhysical_ApplyCollision = 0x548F39;
constexpr const DWORD CALL_FROM_CPhysical_ApplyCollision_2 = 0x5490AE;
constexpr const DWORD CALL_FROM_CPhysical_ApplySoftCollision = 0x54A816;

#define HOOKPOS_FxManager_c__DestroyFxSystem 0x4A989A

Expand Down Expand Up @@ -552,6 +559,7 @@ void HOOK_CObject_ProcessBreak();
void HOOK_CObject_ProcessCollision();
void HOOK_CGlass_WindowRespondsToCollision();
void HOOK_CGlass__BreakGlassPhysically();
void HOOK_CGlass_WindowRespondsToExplosion(); // get attacker & object

void HOOK_FxManager_c__DestroyFxSystem();

Expand Down Expand Up @@ -746,7 +754,8 @@ void CMultiplayerSA::InitHooks()
HookInstall(HOOKPOS_CObject_ProcessCollision, (DWORD)HOOK_CObject_ProcessCollision, 10);
HookInstall(HOOKPOS_CGlass_WindowRespondsToCollision, (DWORD)HOOK_CGlass_WindowRespondsToCollision, 8);
HookInstall(HOOKPOS_CGlass__BreakGlassPhysically, (DWORD)HOOK_CGlass__BreakGlassPhysically, 5);

HookInstall(HOOKPOS_CGlass_WindowRespondsToExplosion, (DWORD)HOOK_CGlass_WindowRespondsToExplosion, 5);

// Post-destruction hook for FxSystems
HookInstall(HOOKPOS_FxManager_c__DestroyFxSystem, (DWORD)HOOK_FxManager_c__DestroyFxSystem, 5);

Expand Down Expand Up @@ -6801,22 +6810,74 @@ void _declspec(naked) HOOK_CObject_ProcessCollision()
}
}

DWORD WindowRespondsToCollision_CalledFrom = 0;
void _declspec(naked) HOOK_CGlass_WindowRespondsToCollision()
{
_asm
{
pushad
mov ecx, [esp+4]
mov pDamagedObject, ecx
push eax
mov eax, [esp + 4]
mov WindowRespondsToCollision_CalledFrom, eax
pop eax
}
pObjectAttacker = NULL;

if (TriggerObjectBreakEvent())
if (WindowRespondsToCollision_CalledFrom != CALL_FROM_CGlass_WindowRespondsToExplosion)
{
_asm
{
popad
mov pDamagedObject, esi
}
}

// Get attacker for the glass break
switch (WindowRespondsToCollision_CalledFrom)
{
case CALL_FROM_CPhysical_ApplyCollision:
case CALL_FROM_CPhysical_ApplyCollision_2:
case CALL_FROM_CPhysical_ApplySoftCollision:
{
_asm
{
mov pObjectAttacker, edi
}

break;
}
case CALL_FROM_CGlass_WasGlassHitByBullet:
{
_asm
{
mov pObjectAttacker, ebx // WasGlassHitByBullet called from CWeapon::DoBulletImpact
}

if (!pObjectAttacker || (pObjectAttacker && !pObjectAttacker->m_pRwObject)) // WasGlassHitByBullet called from CBulletInfo::Update
{
_asm
{
push ecx
mov ecx, [edi]
mov pObjectAttacker, ecx
pop ecx
}
}

break;
}
case CALL_FROM_CGlass_WindowRespondsToExplosion:
{
break;
}
default:
pObjectAttacker = nullptr;
}

if (pObjectAttacker && !pObjectAttacker->m_pRwObject) // Still wrong?
pObjectAttacker = nullptr;

if (TriggerObjectBreakEvent())
{
_asm
{
sub esp, 68h
push esi
mov esi, [esp+6Ch+4]
Expand All @@ -6827,7 +6888,6 @@ void _declspec(naked) HOOK_CGlass_WindowRespondsToCollision()
{
_asm
{
popad
retn
}
}
Expand All @@ -6840,9 +6900,11 @@ void _declspec(naked) HOOK_CGlass__BreakGlassPhysically()
_asm
{
mov pDamagedObject, esi
push ecx
mov ecx, [esp+4]
mov pObjectAttacker, ecx
pop ecx
}
// we can't get attacker from here
pObjectAttacker = NULL;

if (TriggerObjectBreakEvent())
{
Expand All @@ -6868,6 +6930,17 @@ void _declspec(naked) HOOK_CGlass__BreakGlassPhysically()
}
}

void _declspec(naked) HOOK_CGlass_WindowRespondsToExplosion()
{
_asm {
push 1
sub esp, 0Ch
mov pDamagedObject, edx
mov pObjectAttacker, ebp
jmp RETURN_CGlass_WindowRespondsToExplosion
}
}

void* pFxSystemToBeDestroyed;
void FxManager_c__DestroyFxSystem()
{
Expand Down