fix s1lentq#927 (s1lentq#985)

lozatto · Aug 12, 2024 · f9969ac · f9969ac
1 parent b6c2c62
commit f9969ac
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/regamedll/dlls/wpn_shared/wpn_deagle.cpp b/regamedll/dlls/wpn_shared/wpn_deagle.cpp
@@ -204,11 +204,23 @@ void CDEAGLE::WeaponIdle()
 
 	if (m_flTimeWeaponIdle <= UTIL_WeaponTimeBase())
 	{
-		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 20.0f;
+#ifdef REGAMEDLL_FIXES
+		if (m_pPlayer->HasShield())
+#endif
+		{
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 20.0f;
 
-		if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
+			if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
+			{
+				SendWeaponAnim(DEAGLE_SHIELD_IDLE_UP, UseDecrement() != FALSE);
+			}
+		}
+#ifdef REGAMEDLL_FIXES
+		else if (m_iClip)
 		{
-			SendWeaponAnim(DEAGLE_SHIELD_IDLE_UP, UseDecrement() != FALSE);
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3.0625f;
+			SendWeaponAnim(DEAGLE_IDLE1, UseDecrement() != FALSE);
 		}
+#endif
 	}
 }