Implementing more accurate way for weapon hiding fix

See previous commit for details
OpenXRay · Aug 14, 2017 · 42ac33e · 42ac33e
1 parent d243af2
commit 42ac33e
Show file tree

Hide file tree

Showing 32 changed files with 69 additions and 67 deletions.
diff --git a/src/xrGame/Artefact.cpp b/src/xrGame/Artefact.cpp
@@ -410,10 +410,9 @@ bool CArtefact::Action(u16 cmd, u32 flags)
     return inherited::Action(cmd, flags);
 }
 
-void CArtefact::OnStateSwitch(u32 S)
+void CArtefact::OnStateSwitch(u32 S, u32 oldState)
 {
-    u32 oldState = GetState();
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     switch (S)
     {
     case eShowing: { PlayHUDMotion("anm_show", FALSE, this, S);

diff --git a/src/xrGame/Artefact.h b/src/xrGame/Artefact.h
@@ -96,7 +96,7 @@ class CArtefact : public CHudItemObject, public CPHUpdateObject
     virtual void Show();
     virtual void UpdateXForm();
     virtual bool Action(u16 cmd, u32 flags);
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
     virtual void OnAnimationEnd(u32 state);
     virtual bool IsHidden() const { return GetState() == eHidden; }
     // optimization FAST/SLOW mode

diff --git a/src/xrGame/CustomDetector.cpp b/src/xrGame/CustomDetector.cpp
@@ -117,10 +117,9 @@ void CCustomDetector::ToggleDetector(bool bFastMode)
         SwitchState(eHiding);
 }
 
-void CCustomDetector::OnStateSwitch(u32 S)
+void CCustomDetector::OnStateSwitch(u32 S, u32 oldState)
 {
-    u32 oldState = GetState();
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
 
     switch (S)
     {

diff --git a/src/xrGame/CustomDetector.h b/src/xrGame/CustomDetector.h
@@ -144,7 +144,7 @@ class CCustomDetector : public CHudItemObject
 
     virtual void OnActiveItem();
     virtual void OnHiddenItem();
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
     virtual void OnAnimationEnd(u32 state);
     virtual void UpdateXForm();
 

diff --git a/src/xrGame/Grenade.cpp b/src/xrGame/Grenade.cpp
@@ -136,8 +136,12 @@ bool CGrenade::DropGrenade()
 
 void CGrenade::DiscardState()
 {
-    if (IsGameTypeSingle() && (GetState() == eReady || GetState() == eThrow))
-        OnStateSwitch(eIdle);
+    if (IsGameTypeSingle())
+    {
+        u32 state = GetState();
+        if (state == eReady || state == eThrow)
+            OnStateSwitch(eIdle, state);
+    }
 }
 
 void CGrenade::SendHiddenItem()

diff --git a/src/xrGame/HudItem.cpp b/src/xrGame/HudItem.cpp
@@ -97,13 +97,13 @@ void CHudItem::OnEvent(NET_Packet& P, u16 type)
     {
         u8 S;
         P.r_u8(S);
-        OnStateSwitch(u32(S));
+        OnStateSwitch(u32(S), GetState());
     }
     break;
     }
 }
 
-void CHudItem::OnStateSwitch(u32 S)
+void CHudItem::OnStateSwitch(u32 S, u32 oldState)
 {
     SetState(S);
 

diff --git a/src/xrGame/HudItem.h b/src/xrGame/HudItem.h
@@ -48,7 +48,7 @@ class CHUDState
     IC u32 CurrStateTime() const { return Device.dwTimeGlobal - m_dw_curr_state_time; }
     IC void ResetSubStateTime() { m_dw_curr_substate_time = Device.dwTimeGlobal; }
     virtual void SwitchState(u32 S) = 0;
-    virtual void OnStateSwitch(u32 S) = 0;
+    virtual void OnStateSwitch(u32 S, u32 oldState) = 0;
 };
 
 class CHudItem : public CHUDState
@@ -110,7 +110,7 @@ class CHudItem : public CHUDState
     bool IsHiding() const { return GetState() == eHiding; }
     bool IsShowing() const { return GetState() == eShowing; }
     virtual void SwitchState(u32 S);
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
 
     virtual void OnAnimationEnd(u32 state);
     virtual void OnMotionMark(u32 state, const motion_marks&){};

diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp
@@ -385,7 +385,7 @@ void CLevel::IR_OnKeyboardPress(int key)
                     CHudItem* pHudItem = smart_cast<CHudItem*>(pActor->inventory().ActiveItem());
                     if (pHudItem)
                     {
-                        pHudItem->OnStateSwitch(pHudItem->GetState());
+                        pHudItem->OnStateSwitch(pHudItem->GetState(), pHudItem->GetState());
                     }
                 }
             }

diff --git a/src/xrGame/Missile.cpp b/src/xrGame/Missile.cpp
@@ -239,7 +239,7 @@ void CMissile::shedule_Update(u32 dt)
     }
 }
 
-void CMissile::State(u32 state, u32 old_state)
+void CMissile::State(u32 state, u32 oldState)
 {
     switch (state)
     {
@@ -259,7 +259,7 @@ void CMissile::State(u32 state, u32 old_state)
     {
         if (H_Parent())
         {
-            if (old_state != eHiding)
+            if (oldState != eHiding)
             {
                 SetPending(TRUE);
                 PlayHUDMotion("anm_hide", TRUE, this, GetState());
@@ -311,11 +311,10 @@ void CMissile::State(u32 state, u32 old_state)
     }
 }
 
-void CMissile::OnStateSwitch(u32 S)
+void CMissile::OnStateSwitch(u32 S, u32 oldState)
 {
     m_dwStateTime = 0;
-    u32 oldState = GetState();
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     State(S, oldState);
 }
 

diff --git a/src/xrGame/Missile.h b/src/xrGame/Missile.h
@@ -45,8 +45,8 @@ class CMissile : public CHudItemObject
 
     virtual bool Action(u16 cmd, u32 flags);
 
-    virtual void State(u32 state, u32 old_state);
-    virtual void OnStateSwitch(u32 S);
+    virtual void State(u32 state, u32 oldState);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
     virtual bool GetBriefInfo(II_BriefInfo& info);
 
 protected:

diff --git a/src/xrGame/Spectator.cpp b/src/xrGame/Spectator.cpp
@@ -364,11 +364,11 @@ void CSpectator::FirstEye_ToPlayer(IGameObject* pObject)
         {
             pActor->inventory().Items_SetCurrentEntityHud(true);
 
-            /*			CHudItem* pHudItem = smart_cast<CHudItem*>(pActor->inventory().ActiveItem());
-                        if (pHudItem)
-                        {
-                            pHudItem->OnStateSwitch(pHudItem->GetState());
-                        }*/
+            /*CHudItem* pHudItem = smart_cast<CHudItem*>(pActor->inventory().ActiveItem());
+            if (pHudItem)
+            {
+                pHudItem->OnStateSwitch(pHudItem->GetState(), pHudItem->GetState());
+            }*/
         }
     };
     if (Device.Paused() && pOldActor)

diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp
@@ -683,7 +683,7 @@ void CWeapon::OnEvent(NET_Packet& P, u16 type)
 
         if (OnClient())
             SetAmmoElapsed(int(AmmoElapsed));
-        OnStateSwitch(u32(state));
+        OnStateSwitch(u32(state), GetState());
     }
     break;
     default: { inherited::OnEvent(P, type);
@@ -1817,9 +1817,9 @@ const float& CWeapon::hit_probability() const
     return (m_hit_probability[egdNovice]);
 }
 
-void CWeapon::OnStateSwitch(u32 S)
+void CWeapon::OnStateSwitch(u32 S, u32 oldState)
 {
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     m_BriefInfo_CalcFrame = 0;
 
     // if(GetState()==eReload)

diff --git a/src/xrGame/Weapon.h b/src/xrGame/Weapon.h
@@ -312,7 +312,7 @@ class CWeapon : public CHudItemObject, public CShootingObject
     virtual void SetDefaults();
 
     virtual bool MovingAnimAllowedNow();
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
     virtual void OnAnimationEnd(u32 state);
 
     //трассирование полета пули

diff --git a/src/xrGame/WeaponAutomaticShotgun.cpp b/src/xrGame/WeaponAutomaticShotgun.cpp
@@ -99,15 +99,15 @@ void CWeaponAutomaticShotgun::TriStateReload()
     SwitchState(eReload);
 }
 
-void CWeaponAutomaticShotgun::OnStateSwitch(u32 S)
+void CWeaponAutomaticShotgun::OnStateSwitch(u32 S, u32 oldState)
 {
     if (!m_bTriStateReload || S != eReload)
     {
-        inherited::OnStateSwitch(S);
+        inherited::OnStateSwitch(S, oldState);
         return;
     }
 
-    CWeapon::OnStateSwitch(S);
+    CWeapon::OnStateSwitch(S, oldState);
 
     if (m_magazine.size() == (u32)iMagazineSize || !HaveCartridgeInInventory(1))
     {

diff --git a/src/xrGame/WeaponAutomaticShotgun.h b/src/xrGame/WeaponAutomaticShotgun.h
@@ -29,7 +29,7 @@ class CWeaponAutomaticShotgun : public CWeaponMagazined
 protected:
     virtual void OnAnimationEnd(u32 state);
     void TriStateReload();
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
 
     bool HaveCartridgeInInventory(u8 cnt);
     virtual u8 AddCartridge(u8 cnt);

diff --git a/src/xrGame/WeaponKnife.cpp b/src/xrGame/WeaponKnife.cpp
@@ -68,17 +68,16 @@ void CWeaponKnife::Load(LPCSTR section)
     knife_material_idx = GMLib.GetMaterialIdx(KNIFE_MATERIAL_NAME);
 }
 
-void CWeaponKnife::OnStateSwitch(u32 S)
+void CWeaponKnife::OnStateSwitch(u32 S, u32 oldState)
 {
-    u32 old_state = GetState();
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     switch (S)
     {
     case eIdle: switch2_Idle(); break;
     case eShowing: switch2_Showing(); break;
     case eHiding:
     {
-        if (old_state != eHiding)
+        if (oldState != eHiding)
             switch2_Hiding();
         break;
     }

diff --git a/src/xrGame/WeaponKnife.h b/src/xrGame/WeaponKnife.h
@@ -17,7 +17,7 @@ class CWeaponKnife : public CWeapon
 
     virtual void OnAnimationEnd(u32 state);
     virtual void OnMotionMark(u32 state, const motion_marks&);
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
 
     void state_Attacking(float dt);
 

diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp
@@ -380,10 +380,9 @@ void CWeaponMagazined::ReloadMagazine()
     VERIFY((u32)iAmmoElapsed == m_magazine.size());
 }
 
-void CWeaponMagazined::OnStateSwitch(u32 S)
+void CWeaponMagazined::OnStateSwitch(u32 S, u32 oldState)
 {
-	u32 old_state = GetState();
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     CInventoryOwner* owner = smart_cast<CInventoryOwner*>(this->H_Parent());
     switch (S)
     {
@@ -407,7 +406,7 @@ void CWeaponMagazined::OnStateSwitch(u32 S)
     case eHiding:
         if (owner)
             m_sounds_enabled = owner->CanPlayShHdRldSounds();
-		if (old_state != eHiding)
+		if (oldState != eHiding)
 			switch2_Hiding();
         break;
     case eHidden: switch2_Hidden(); break;

diff --git a/src/xrGame/WeaponMagazined.h b/src/xrGame/WeaponMagazined.h
@@ -49,7 +49,7 @@ class CWeaponMagazined : public CWeapon
     virtual void OnEmptyClick();
 
     virtual void OnAnimationEnd(u32 state);
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
 
     virtual void UpdateSounds();
 

diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp
@@ -405,7 +405,7 @@ void CWeaponMagazinedWGrenade::ReloadMagazine()
     }
 }
 
-void CWeaponMagazinedWGrenade::OnStateSwitch(u32 S)
+void CWeaponMagazinedWGrenade::OnStateSwitch(u32 S, u32 oldState)
 {
     switch (S)
     {
@@ -420,7 +420,7 @@ void CWeaponMagazinedWGrenade::OnStateSwitch(u32 S)
     break;
     }
 
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     UpdateGrenadeVisibility(!!iAmmoElapsed || S == eReload);
 }
 

diff --git a/src/xrGame/WeaponMagazinedWGrenade.h b/src/xrGame/WeaponMagazinedWGrenade.h
@@ -35,7 +35,7 @@ class CWeaponMagazinedWGrenade : public CWeaponMagazined, public CRocketLauncher
     virtual void FireEnd();
     void LaunchGrenade();
 
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
 
     virtual void switch2_Reload();
     virtual void state_Fire(float dt);

diff --git a/src/xrGame/WeaponRPG7.cpp b/src/xrGame/WeaponRPG7.cpp
@@ -59,9 +59,9 @@ BOOL CWeaponRPG7::net_Spawn(CSE_Abstract* DC)
     return l_res;
 }
 
-void CWeaponRPG7::OnStateSwitch(u32 S)
+void CWeaponRPG7::OnStateSwitch(u32 S, u32 oldState)
 {
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     UpdateMissileVisibility();
 }
 

diff --git a/src/xrGame/WeaponRPG7.h b/src/xrGame/WeaponRPG7.h
@@ -13,7 +13,7 @@ class CWeaponRPG7 : public CWeaponCustomPistol, public CRocketLauncher
     virtual ~CWeaponRPG7();
 
     virtual BOOL net_Spawn(CSE_Abstract* DC);
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
     virtual void OnEvent(NET_Packet& P, u16 type);
     virtual void ReloadMagazine();
     virtual void Load(LPCSTR section);

diff --git a/src/xrGame/WeaponShotgun.cpp b/src/xrGame/WeaponShotgun.cpp
@@ -106,15 +106,15 @@ void CWeaponShotgun::TriStateReload()
     SwitchState(eReload);
 }
 
-void CWeaponShotgun::OnStateSwitch(u32 S)
+void CWeaponShotgun::OnStateSwitch(u32 S, u32 oldState)
 {
     if (!m_bTriStateReload || S != eReload)
     {
-        inherited::OnStateSwitch(S);
+        inherited::OnStateSwitch(S, oldState);
         return;
     }
 
-    CWeapon::OnStateSwitch(S);
+    CWeapon::OnStateSwitch(S, oldState);
 
     if (m_magazine.size() == (u32)iMagazineSize || !HaveCartridgeInInventory(1))
     {

diff --git a/src/xrGame/WeaponShotgun.h b/src/xrGame/WeaponShotgun.h
@@ -31,7 +31,7 @@ class CWeaponShotgun : public CWeaponCustomPistol
 protected:
     virtual void OnAnimationEnd(u32 state);
     void TriStateReload();
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
 
     bool HaveCartridgeInInventory(u8 cnt);
     virtual u8 AddCartridge(u8 cnt);

diff --git a/src/xrGame/ai/stalker/ai_stalker_debug.cpp b/src/xrGame/ai/stalker/ai_stalker_debug.cpp
@@ -133,7 +133,7 @@ void restore_actor()
     CHudItem* pHudItem = smart_cast<CHudItem*>(g_debug_actor->inventory().ActiveItem());
     if (pHudItem)
     {
-        pHudItem->OnStateSwitch(pHudItem->GetState());
+        pHudItem->OnStateSwitch(pHudItem->GetState(), pHudItem->GetState());
     }
 }
 

diff --git a/src/xrGame/cta_game_artefact.cpp b/src/xrGame/cta_game_artefact.cpp
@@ -57,9 +57,9 @@ bool CtaGameArtefact::Action(s32 cmd, u32 flags)
     return inherited::Action((u16)cmd, flags);
 }
 
-void CtaGameArtefact::OnStateSwitch(u32 S)
+void CtaGameArtefact::OnStateSwitch(u32 S, u32 oldState)
 {
-    inherited::OnStateSwitch(S);
+    inherited::OnStateSwitch(S, oldState);
     /*// just temporary (before we get huds for artefact activation)
     if (S == eActivating)
     {
@@ -68,7 +68,7 @@ void CtaGameArtefact::OnStateSwitch(u32 S)
         return;
     } else
     {
-        //inherited::OnStateSwitch(S);
+        //inherited::OnStateSwitch(S, oldState);
     }*/
 }
 

diff --git a/src/xrGame/cta_game_artefact.h b/src/xrGame/cta_game_artefact.h
@@ -20,7 +20,7 @@ class CtaGameArtefact : public CArtefact
     virtual ~CtaGameArtefact();
 
     virtual bool Action(s32 cmd, u32 flags);
-    virtual void OnStateSwitch(u32 S);
+    virtual void OnStateSwitch(u32 S, u32 oldState);
     virtual void OnAnimationEnd(u32 state);
     virtual void UpdateCLChild();
     virtual bool CanTake() const;