Synchronize changes from 1.6 master branch [ci skip]

e9c9a39 Fix #3612 Explosions breaking glass cause crash (#3613)
09699dc Update client en_US pot

Author: github-actions[bot]

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -559,7 +559,6 @@ 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();
 
@@ -754,7 +753,6 @@ 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);
@@ -6827,6 +6825,8 @@ void _declspec(naked) HOOK_CGlass_WindowRespondsToCollision()
         pop eax
     }
 
+    pObjectAttacker = nullptr;
+
     if (WindowRespondsToCollision_CalledFrom != CALL_FROM_CGlass_WindowRespondsToExplosion)
     {
         _asm
@@ -6836,45 +6836,42 @@ void _declspec(naked) HOOK_CGlass_WindowRespondsToCollision()
     }
 
     // Get attacker for the glass break
-    switch (WindowRespondsToCollision_CalledFrom)
+    if (WindowRespondsToCollision_CalledFrom == CALL_FROM_CPhysical_ApplyCollision ||
+        WindowRespondsToCollision_CalledFrom == CALL_FROM_CPhysical_ApplyCollision_2 ||
+        WindowRespondsToCollision_CalledFrom == CALL_FROM_CPhysical_ApplySoftCollision)
     {
-        case CALL_FROM_CPhysical_ApplyCollision:
-        case CALL_FROM_CPhysical_ApplyCollision_2:
-        case CALL_FROM_CPhysical_ApplySoftCollision:
+        _asm
         {
-            _asm
-            {
-                mov pObjectAttacker, edi
-            }
+            mov pObjectAttacker, edi
+        }
+    }
 
-            break;
+    if (WindowRespondsToCollision_CalledFrom == CALL_FROM_CGlass_WasGlassHitByBullet)
+    {
+        _asm
+        {
+            mov pObjectAttacker, ebx // WasGlassHitByBullet called from CWeapon::DoBulletImpact
         }
-        case CALL_FROM_CGlass_WasGlassHitByBullet:
+
+        if (!pObjectAttacker || (pObjectAttacker && !pObjectAttacker->m_pRwObject)) // WasGlassHitByBullet called from CBulletInfo::Update
         {
             _asm
             {
-                mov pObjectAttacker, ebx // WasGlassHitByBullet called from CWeapon::DoBulletImpact
+                push ecx
+                mov ecx, [edi]
+                mov pObjectAttacker, ecx
+                pop ecx
             }
-
-            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:
+    }
+
+    if (WindowRespondsToCollision_CalledFrom == CALL_FROM_CGlass_WindowRespondsToExplosion)
+    {
+        _asm
         {
-            break;
+            mov pDamagedObject, edx
+            mov pObjectAttacker, ebp
         }
-        default:
-            pObjectAttacker = nullptr;
     }
 
     if (pObjectAttacker && !pObjectAttacker->m_pRwObject) // Still wrong?
@@ -6936,17 +6933,6 @@ 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()
 {