Shield constants code cleaning (#843)

dystopm · web-flow · commit 11d6b086b4de · 2023-07-13T01:29:56.000+03:00
* Change constant name (SHIELDREN -&gt; SHIELDGREN)

* Correct and separate constant names
diff --git a/regamedll/dlls/weapons.h b/regamedll/dlls/weapons.h
@@ -534,7 +534,7 @@ enum usp_shield_e
 	USP_SHIELD_SHOOT_EMPTY,
 	USP_SHIELD_RELOAD,
 	USP_SHIELD_DRAW,
-	USP_SHIELD_UP_IDLE,
+	USP_SHIELD_IDLE_UP,
 	USP_SHIELD_UP,
 	USP_SHIELD_DOWN,
 };
@@ -900,6 +900,19 @@ enum deagle_e
 	DEAGLE_DRAW,
 };
 
+enum deagle_shield_e
+{
+	DEAGLE_SHIELD_IDLE1,
+	DEAGLE_SHIELD_SHOOT,
+	DEAGLE_SHIELD_SHOOT2,
+	DEAGLE_SHIELD_SHOOT_EMPTY,
+	DEAGLE_SHIELD_RELOAD,
+	DEAGLE_SHIELD_DRAW,
+	DEAGLE_SHIELD_IDLE_UP,
+	DEAGLE_SHIELD_UP,
+	DEAGLE_SHIELD_DOWN,
+};
+
 class CDEAGLE: public CBasePlayerWeapon
 {
 public:
@@ -1065,7 +1078,7 @@ enum glock18_shield_e
 	GLOCK18_SHIELD_SHOOT_EMPTY,
 	GLOCK18_SHIELD_RELOAD,
 	GLOCK18_SHIELD_DRAW,
-	GLOCK18_SHIELD_IDLE,
+	GLOCK18_SHIELD_IDLE_UP,
 	GLOCK18_SHIELD_UP,
 	GLOCK18_SHIELD_DOWN,
 };
@@ -1180,7 +1193,7 @@ enum knife_shield_e
 	KNIFE_SHIELD_SLASH,
 	KNIFE_SHIELD_ATTACKHIT,
 	KNIFE_SHIELD_DRAW,
-	KNIFE_SHIELD_UPIDLE,
+	KNIFE_SHIELD_IDLE_UP,
 	KNIFE_SHIELD_UP,
 	KNIFE_SHIELD_DOWN,
 };
@@ -1858,6 +1871,19 @@ enum fiveseven_e
 	FIVESEVEN_DRAW,
 };
 
+enum fiveseven_shield_e
+{
+	FIVESEVEN_SHIELD_IDLE1,
+	FIVESEVEN_SHIELD_SHOOT,
+	FIVESEVEN_SHIELD_SHOOT2,
+	FIVESEVEN_SHIELD_SHOOT_EMPTY,
+	FIVESEVEN_SHIELD_RELOAD,
+	FIVESEVEN_SHIELD_DRAW,
+	FIVESEVEN_SHIELD_IDLE_UP,
+	FIVESEVEN_SHIELD_UP,
+	FIVESEVEN_SHIELD_DOWN,
+};
+
 class CFiveSeven: public CBasePlayerWeapon
 {
 public:
diff --git a/regamedll/dlls/weapontype.h b/regamedll/dlls/weapontype.h
@@ -318,25 +318,12 @@ enum AmmoBuyAmount
 	AMMO_SMOKEGRENADE_BUY = 1,
 };
 
-enum shieldgun_e
-{
-	SHIELDGUN_IDLE,
-	SHIELDGUN_SHOOT1,
-	SHIELDGUN_SHOOT2,
-	SHIELDGUN_SHOOT_EMPTY,
-	SHIELDGUN_RELOAD,
-	SHIELDGUN_DRAW,
-	SHIELDGUN_DRAWN_IDLE,
-	SHIELDGUN_UP,
-	SHIELDGUN_DOWN,
-};
-
 // custom
 enum shieldgren_e
 {
-	SHIELDREN_IDLE = 4,
-	SHIELDREN_UP,
-	SHIELDREN_DOWN
+	SHIELDGREN_IDLE = 4, // 3 is last grenade viewmodel sequence
+	SHIELDGREN_UP,
+	SHIELDGREN_DOWN
 };
 
 enum InventorySlotType
diff --git a/regamedll/dlls/wpn_shared/wpn_deagle.cpp b/regamedll/dlls/wpn_shared/wpn_deagle.cpp
@@ -93,7 +93,7 @@ void CDEAGLE::PrimaryAttack()
 
 void CDEAGLE::SecondaryAttack()
 {
-	ShieldSecondaryFire(SHIELDGUN_UP, SHIELDGUN_DOWN);
+	ShieldSecondaryFire(DEAGLE_SHIELD_UP, DEAGLE_SHIELD_DOWN);
 }
 
 void CDEAGLE::DEAGLEFire(float flSpread, float flCycleTime, BOOL fUseSemi)
@@ -204,7 +204,7 @@ void CDEAGLE::WeaponIdle()
 
 		if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 		{
-			SendWeaponAnim(SHIELDGUN_DRAWN_IDLE, UseDecrement() != FALSE);
+			SendWeaponAnim(DEAGLE_SHIELD_IDLE_UP, UseDecrement() != FALSE);
 		}
 	}
 }
diff --git a/regamedll/dlls/wpn_shared/wpn_fiveseven.cpp b/regamedll/dlls/wpn_shared/wpn_fiveseven.cpp
@@ -92,7 +92,7 @@ void CFiveSeven::PrimaryAttack()
 
 void CFiveSeven::SecondaryAttack()
 {
-	ShieldSecondaryFire(SHIELDGUN_UP, SHIELDGUN_DOWN);
+	ShieldSecondaryFire(FIVESEVEN_SHIELD_UP, FIVESEVEN_SHIELD_DOWN);
 }
 
 void CFiveSeven::FiveSevenFire(float flSpread, float flCycleTime, BOOL fUseSemi)
@@ -208,7 +208,7 @@ void CFiveSeven::WeaponIdle()
 
 		if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 		{
-			SendWeaponAnim(SHIELDGUN_DRAWN_IDLE, UseDecrement() != FALSE);
+			SendWeaponAnim(FIVESEVEN_SHIELD_IDLE_UP, UseDecrement() != FALSE);
 		}
 	}
 	else if (m_iClip)
diff --git a/regamedll/dlls/wpn_shared/wpn_flashbang.cpp b/regamedll/dlls/wpn_shared/wpn_flashbang.cpp
@@ -142,7 +142,7 @@ bool CFlashbang::ShieldSecondaryFire(int iUpAnim, int iDownAnim)
 
 void CFlashbang::SecondaryAttack()
 {
-	ShieldSecondaryFire(SHIELDGUN_DRAW, SHIELDGUN_DRAWN_IDLE);
+	ShieldSecondaryFire(SHIELDGREN_UP, SHIELDGREN_DOWN);
 }
 
 void CFlashbang::SetPlayerShieldAnim()
@@ -236,7 +236,7 @@ void CFlashbang::WeaponIdle()
 
 			if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 			{
-				SendWeaponAnim(SHIELDREN_IDLE, UseDecrement() != FALSE);
+				SendWeaponAnim(SHIELDGREN_IDLE, UseDecrement() != FALSE);
 			}
 		}
 		else
diff --git a/regamedll/dlls/wpn_shared/wpn_glock18.cpp b/regamedll/dlls/wpn_shared/wpn_glock18.cpp
@@ -295,7 +295,7 @@ void CGLOCK18::WeaponIdle()
 
 		if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 		{
-			SendWeaponAnim(GLOCK18_SHIELD_IDLE, UseDecrement() != FALSE);
+			SendWeaponAnim(GLOCK18_SHIELD_IDLE_UP, UseDecrement() != FALSE);
 		}
 	}
 	// only idle if the slid isn't back
diff --git a/regamedll/dlls/wpn_shared/wpn_hegrenade.cpp b/regamedll/dlls/wpn_shared/wpn_hegrenade.cpp
@@ -144,7 +144,7 @@ bool CHEGrenade::ShieldSecondaryFire(int iUpAnim, int iDownAnim)
 
 void CHEGrenade::SecondaryAttack()
 {
-	ShieldSecondaryFire(SHIELDGUN_DRAW, SHIELDGUN_DRAWN_IDLE);
+	ShieldSecondaryFire(SHIELDGREN_UP, SHIELDGREN_DOWN);
 }
 
 void CHEGrenade::SetPlayerShieldAnim()
@@ -247,7 +247,7 @@ void CHEGrenade::WeaponIdle()
 
 			if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 			{
-				SendWeaponAnim(SHIELDREN_IDLE, UseDecrement() != FALSE);
+				SendWeaponAnim(SHIELDGREN_IDLE, UseDecrement() != FALSE);
 			}
 		}
 		else
diff --git a/regamedll/dlls/wpn_shared/wpn_p228.cpp b/regamedll/dlls/wpn_shared/wpn_p228.cpp
@@ -92,7 +92,7 @@ void CP228::PrimaryAttack()
 
 void CP228::SecondaryAttack()
 {
-	ShieldSecondaryFire(SHIELDGUN_UP, SHIELDGUN_DOWN);
+	ShieldSecondaryFire(P228_SHIELD_UP, P228_SHIELD_DOWN);
 }
 
 void CP228::P228Fire(float flSpread, float flCycleTime, BOOL fUseSemi)
diff --git a/regamedll/dlls/wpn_shared/wpn_smokegrenade.cpp b/regamedll/dlls/wpn_shared/wpn_smokegrenade.cpp
@@ -145,7 +145,7 @@ bool CSmokeGrenade::ShieldSecondaryFire(int iUpAnim, int iDownAnim)
 
 void CSmokeGrenade::SecondaryAttack()
 {
-	ShieldSecondaryFire(SHIELDGUN_DRAW, SHIELDGUN_DRAWN_IDLE);
+	ShieldSecondaryFire(SHIELDGREN_UP, SHIELDGREN_DOWN);
 }
 
 void CSmokeGrenade::SetPlayerShieldAnim()
@@ -251,7 +251,7 @@ void CSmokeGrenade::WeaponIdle()
 
 			if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 			{
-				SendWeaponAnim(SHIELDREN_IDLE, UseDecrement() != FALSE);
+				SendWeaponAnim(SHIELDGREN_IDLE, UseDecrement() != FALSE);
 			}
 		}
 		else
diff --git a/regamedll/dlls/wpn_shared/wpn_usp.cpp b/regamedll/dlls/wpn_shared/wpn_usp.cpp
@@ -279,7 +279,7 @@ void CUSP::WeaponIdle()
 
 		if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)
 		{
-			SendWeaponAnim(USP_DRAW, UseDecrement());
+			SendWeaponAnim(USP_SHIELD_IDLE_UP, UseDecrement());
 		}
 	}
 	else if (m_iClip)

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void CDEAGLE::PrimaryAttack()`
`93`	`93`
`94`	`94`	`void CDEAGLE::SecondaryAttack()`
`95`	`95`	`{`
`96`		`- ShieldSecondaryFire(SHIELDGUN_UP, SHIELDGUN_DOWN);`
	`96`	`+ ShieldSecondaryFire(DEAGLE_SHIELD_UP, DEAGLE_SHIELD_DOWN);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`void CDEAGLE::DEAGLEFire(float flSpread, float flCycleTime, BOOL fUseSemi)`
`@@ -204,7 +204,7 @@ void CDEAGLE::WeaponIdle()`
`204`	`204`
`205`	`205`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`206`	`206`	`{`
`207`		`- SendWeaponAnim(SHIELDGUN_DRAWN_IDLE, UseDecrement() != FALSE);`
	`207`	`+ SendWeaponAnim(DEAGLE_SHIELD_IDLE_UP, UseDecrement() != FALSE);`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ void CFiveSeven::PrimaryAttack()`
`92`	`92`
`93`	`93`	`void CFiveSeven::SecondaryAttack()`
`94`	`94`	`{`
`95`		`- ShieldSecondaryFire(SHIELDGUN_UP, SHIELDGUN_DOWN);`
	`95`	`+ ShieldSecondaryFire(FIVESEVEN_SHIELD_UP, FIVESEVEN_SHIELD_DOWN);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void CFiveSeven::FiveSevenFire(float flSpread, float flCycleTime, BOOL fUseSemi)`
`@@ -208,7 +208,7 @@ void CFiveSeven::WeaponIdle()`
`208`	`208`
`209`	`209`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`210`	`210`	`{`
`211`		`- SendWeaponAnim(SHIELDGUN_DRAWN_IDLE, UseDecrement() != FALSE);`
	`211`	`+ SendWeaponAnim(FIVESEVEN_SHIELD_IDLE_UP, UseDecrement() != FALSE);`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`	`else if (m_iClip)`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ bool CFlashbang::ShieldSecondaryFire(int iUpAnim, int iDownAnim)`
`142`	`142`
`143`	`143`	`void CFlashbang::SecondaryAttack()`
`144`	`144`	`{`
`145`		`- ShieldSecondaryFire(SHIELDGUN_DRAW, SHIELDGUN_DRAWN_IDLE);`
	`145`	`+ ShieldSecondaryFire(SHIELDGREN_UP, SHIELDGREN_DOWN);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`void CFlashbang::SetPlayerShieldAnim()`
`@@ -236,7 +236,7 @@ void CFlashbang::WeaponIdle()`
`236`	`236`
`237`	`237`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`238`	`238`	`{`
`239`		`- SendWeaponAnim(SHIELDREN_IDLE, UseDecrement() != FALSE);`
	`239`	`+ SendWeaponAnim(SHIELDGREN_IDLE, UseDecrement() != FALSE);`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`else`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ void CGLOCK18::WeaponIdle()`
`295`	`295`
`296`	`296`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`297`	`297`	`{`
`298`		`- SendWeaponAnim(GLOCK18_SHIELD_IDLE, UseDecrement() != FALSE);`
	`298`	`+ SendWeaponAnim(GLOCK18_SHIELD_IDLE_UP, UseDecrement() != FALSE);`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`	`// only idle if the slid isn't back`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ bool CHEGrenade::ShieldSecondaryFire(int iUpAnim, int iDownAnim)`
`144`	`144`
`145`	`145`	`void CHEGrenade::SecondaryAttack()`
`146`	`146`	`{`
`147`		`- ShieldSecondaryFire(SHIELDGUN_DRAW, SHIELDGUN_DRAWN_IDLE);`
	`147`	`+ ShieldSecondaryFire(SHIELDGREN_UP, SHIELDGREN_DOWN);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`void CHEGrenade::SetPlayerShieldAnim()`
`@@ -247,7 +247,7 @@ void CHEGrenade::WeaponIdle()`
`247`	`247`
`248`	`248`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`249`	`249`	`{`
`250`		`- SendWeaponAnim(SHIELDREN_IDLE, UseDecrement() != FALSE);`
	`250`	`+ SendWeaponAnim(SHIELDGREN_IDLE, UseDecrement() != FALSE);`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`	`else`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ void CP228::PrimaryAttack()`
`92`	`92`
`93`	`93`	`void CP228::SecondaryAttack()`
`94`	`94`	`{`
`95`		`- ShieldSecondaryFire(SHIELDGUN_UP, SHIELDGUN_DOWN);`
	`95`	`+ ShieldSecondaryFire(P228_SHIELD_UP, P228_SHIELD_DOWN);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void CP228::P228Fire(float flSpread, float flCycleTime, BOOL fUseSemi)`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ bool CSmokeGrenade::ShieldSecondaryFire(int iUpAnim, int iDownAnim)`
`145`	`145`
`146`	`146`	`void CSmokeGrenade::SecondaryAttack()`
`147`	`147`	`{`
`148`		`- ShieldSecondaryFire(SHIELDGUN_DRAW, SHIELDGUN_DRAWN_IDLE);`
	`148`	`+ ShieldSecondaryFire(SHIELDGREN_UP, SHIELDGREN_DOWN);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`void CSmokeGrenade::SetPlayerShieldAnim()`
`@@ -251,7 +251,7 @@ void CSmokeGrenade::WeaponIdle()`
`251`	`251`
`252`	`252`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`253`	`253`	`{`
`254`		`- SendWeaponAnim(SHIELDREN_IDLE, UseDecrement() != FALSE);`
	`254`	`+ SendWeaponAnim(SHIELDGREN_IDLE, UseDecrement() != FALSE);`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`	`else`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ void CUSP::WeaponIdle()`
`279`	`279`
`280`	`280`	`if (m_iWeaponState & WPNSTATE_SHIELD_DRAWN)`
`281`	`281`	`{`
`282`		`- SendWeaponAnim(USP_DRAW, UseDecrement());`
	`282`	`+ SendWeaponAnim(USP_SHIELD_IDLE_UP, UseDecrement());`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`else if (m_iClip)`