Deduplicate bIsMultiplayer conditions. Remove more redundant nodes.h …

…inclusions
FreeSlave · Sep 14, 2024 · 2f68141 · 2f68141
1 parent ccd8aed
commit 2f68141
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 128 deletions.
diff --git a/dlls/ammunition.cpp b/dlls/ammunition.cpp
@@ -295,11 +295,7 @@ class CRpgAmmo : public CBasePlayerAmmo
 	}
 	int DefaultAmount() {
 		int iGive;
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 		{
 			// hand out more ammo per rocket in multiplayer.
 			iGive = AMMO_RPGCLIP_GIVE * 2;

diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp
@@ -321,11 +321,7 @@ void CCrossbow::Holster()
 
 void CCrossbow::PrimaryAttack( void )
 {
-#if CLIENT_DLL
 	if( InZoom() && bIsMultiplayer() )
-#else
-	if( InZoom() && g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		FireSniperBolt();
 		return;

diff --git a/dlls/defaultai.cpp b/dlls/defaultai.cpp
@@ -22,7 +22,6 @@
 #include	"schedule.h"
 #include	"defaultai.h"
 #include	"soundent.h"
-#include	"nodes.h"
 #include	"scripted.h"
 
 //=========================================================

diff --git a/dlls/gauss.cpp b/dlls/gauss.cpp
@@ -34,11 +34,7 @@ LINK_ENTITY_TO_CLASS( weapon_gauss, CGauss )
 
 float CGauss::GetFullChargeTime( void )
 {
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		return 1.5f;
 	}
@@ -212,11 +208,7 @@ void CGauss::SecondaryAttack()
 		// during the charging process, eat one bit of ammo every once in a while
 		if( UTIL_WeaponTimeBase() >= m_pPlayer->m_flNextAmmoBurn && m_pPlayer->m_flNextAmmoBurn != 1000 )
 		{
-#if CLIENT_DLL
 			if( bIsMultiplayer() )
-#else
-			if( g_pGameRules->IsMultiplayer() )
-#endif
 			{
 				m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
 				m_pPlayer->m_flNextAmmoBurn = UTIL_WeaponTimeBase() + 0.1f;

diff --git a/dlls/hornetgun.cpp b/dlls/hornetgun.cpp
@@ -261,11 +261,7 @@ void CHgun::Reload( void )
 	while( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] < g_AmmoRegistry.GetMaxAmmo(m_iPrimaryAmmoType) && m_flRechargeTime < gpGlobals->time )
 	{
 		float flRechargeTimePause = 0.5f;
-#if CLIENT_DLL
 		if( bIsMultiplayer() )
-#else
-		if( g_pGameRules->IsMultiplayer() )
-#endif
 			flRechargeTimePause = 0.3f;
 
 		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]++;

diff --git a/dlls/m249.cpp b/dlls/m249.cpp
@@ -148,22 +148,10 @@ void CM249::PrimaryAttack()
 
 	Vector vecSrc = m_pPlayer->GetGunPosition();
 	Vector vecAiming = m_pPlayer->GetAutoaimVector(AUTOAIM_5DEGREES);
-	Vector vecDir;
 
-#if CLIENT_DLL
-	if (bIsMultiplayer())
-#else
-	if (g_pGameRules->IsMultiplayer())
-#endif
-	{
-		// optimized multiplayer. Widened to make it easier to hit a moving player
-		vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, VECTOR_CONE_6DEGREES, 8192, BULLET_PLAYER_556, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed);
-	}
-	else
-	{
-		// single player spread
-		vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_556, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed);
-	}
+	// optimized multiplayer. Widened to make it easier to hit a moving player
+	const Vector vecSpread = bIsMultiplayer() ? VECTOR_CONE_6DEGREES : VECTOR_CONE_3DEGREES;
+	Vector vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, vecSpread, 8192, BULLET_PLAYER_556, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed);
 
 	int flags;
 #if defined( CLIENT_WEAPONS )

diff --git a/dlls/medkit.cpp b/dlls/medkit.cpp
@@ -273,11 +273,7 @@ BOOL CMedkit::PlayEmptySound(void)
 
 bool CMedkit::CanRecharge()
 {
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		return gSkillData.plrMedkitTime != 0;
 	}

diff --git a/dlls/monsterstate.cpp b/dlls/monsterstate.cpp
@@ -20,7 +20,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "nodes.h"
 #include "monsters.h"
 #include "animation.h"
 #include "saverestore.h"

diff --git a/dlls/mp5.cpp b/dlls/mp5.cpp
@@ -40,11 +40,7 @@ void CMP5::Spawn()
 
 	InitDefaultAmmo(MP5_DEFAULT_GIVE);
 
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 		m_iDefaultAmmo = MP5_DEFAULT_GIVE_MP;
 
 	FallInit();// get ready to fall down.
@@ -133,21 +129,10 @@ void CMP5::PrimaryAttack()
 
 	Vector vecSrc = m_pPlayer->GetGunPosition();
 	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
-	Vector vecDir;
-#if CLIENT_DLL
-	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
-	{
-		// optimized multiplayer. Widened to make it easier to hit a moving player
-		vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_6DEGREES, 8192, BULLET_PLAYER_MP5, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
-	}
-	else
-	{
-		// single player spread
-		vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
-	}
+
+	// optimized multiplayer. Widened to make it easier to hit a moving player
+	const Vector vecSpread = bIsMultiplayer() ? VECTOR_CONE_6DEGREES : VECTOR_CONE_3DEGREES;
+	Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, vecSpread, 8192, BULLET_PLAYER_MP5, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
 
 	int flags;
 #if CLIENT_WEAPONS

diff --git a/dlls/pitdrone.cpp b/dlls/pitdrone.cpp
@@ -18,7 +18,6 @@
 #include	"cbase.h"
 #include	"monsters.h"
 #include	"schedule.h"
-#include	"nodes.h"
 #include	"effects.h"
 #include	"decals.h"
 #include	"soundent.h"

diff --git a/dlls/python.cpp b/dlls/python.cpp
@@ -79,11 +79,7 @@ void CPython::Precache( void )
 
 BOOL CPython::Deploy()
 {
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		// enable laser sight geometry.
 		pev->body = 1;
@@ -112,11 +108,7 @@ void CPython::Holster()
 
 void CPython::SecondaryAttack( void )
 {
-#if CLIENT_DLL
 	if( !bIsMultiplayer() )
-#else
-	if( !g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		return;
 	}
@@ -198,12 +190,7 @@ void CPython::Reload( void )
 		m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 0;  // 0 means reset to default fov
 	}
 
-	int bUseScope = FALSE;
-#if CLIENT_DLL
-	bUseScope = bIsMultiplayer();
-#else
-	bUseScope = g_pGameRules->IsMultiplayer();
-#endif
+	int bUseScope = bIsMultiplayer() ? 1 : 0;
 	if( DefaultReload( PYTHON_MAX_CLIP, PYTHON_RELOAD, 2.0f, bUseScope ) )
 	{
 		m_flSoundDelay = 1.5f;
@@ -249,11 +236,6 @@ void CPython::WeaponIdle( void )
 		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + ( 170.0f / 30.0f );
 	}
 
-	int bUseScope = FALSE;
-#if CLIENT_DLL
-	bUseScope = bIsMultiplayer();
-#else
-	bUseScope = g_pGameRules->IsMultiplayer();
-#endif
+	int bUseScope = bIsMultiplayer() ? 1 : 0;
 	SendWeaponAnim( iAnim, bUseScope );
 }
diff --git a/dlls/robocop.cpp b/dlls/robocop.cpp
@@ -3,7 +3,6 @@
 #include	"cbase.h"
 #include	"monsters.h"
 #include	"schedule.h"
-#include	"nodes.h"
 #include	"soundent.h"
 #include	"animation.h"
 #include	"effects.h"

diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
@@ -374,11 +374,7 @@ void CRpg::Spawn()
 	SET_MODEL( ENT( pev ), MyWModel() );
 	m_fSpotActive = 1;
 
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		// more default ammo in multiplay. 
 		InitDefaultAmmo(RPG_DEFAULT_GIVE * 2);
@@ -418,11 +414,7 @@ int CRpg::GetItemInfo( ItemInfo *p )
 	p->iFlags = ITEM_FLAG_NOCHOICE;
 	p->iWeight = RPG_WEIGHT;
 	p->pszAmmoEntity = "ammo_rpgclip";
-#ifdef CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		// hand out more ammo per rocket in multiplayer.
 		p->iDropAmmo = AMMO_RPGCLIP_GIVE * 2;

diff --git a/dlls/shockrifle.cpp b/dlls/shockrifle.cpp
@@ -124,11 +124,7 @@ int CShockrifle::GetItemInfo(ItemInfo *p)
 
 BOOL CShockrifle::Deploy()
 {
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 		m_flRechargeTime = gpGlobals->time + 0.25;
 	else
 		m_flRechargeTime = gpGlobals->time + 0.5;
@@ -203,11 +199,7 @@ void CShockrifle::PrimaryAttack()
 
 	// player "shoot" animation
 	m_pPlayer->SetAnimation(PLAYER_ATTACK1);
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 		m_flNextPrimaryAttack = GetNextAttackDelay(0.1);
 	else
 		m_flNextPrimaryAttack = GetNextAttackDelay(0.2);

diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp
@@ -132,11 +132,7 @@ void CShotgun::PrimaryAttack()
 
 	Vector vecDir;
 
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		vecDir = m_pPlayer->FireBulletsPlayer( 4, vecSrc, vecAiming, VECTOR_CONE_DM_SHOTGUN, 2048, BULLET_PLAYER_BUCKSHOT, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
 	}
@@ -202,11 +198,7 @@ void CShotgun::SecondaryAttack( void )
 
 	Vector vecDir;
 
-#if CLIENT_DLL
 	if( bIsMultiplayer() )
-#else
-	if( g_pGameRules->IsMultiplayer() )
-#endif
 	{
 		// tuned for deathmatch
 		vecDir = m_pPlayer->FireBulletsPlayer( 8, vecSrc, vecAiming, VECTOR_CONE_DM_DOUBLESHOTGUN, 2048, BULLET_PLAYER_BUCKSHOT, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );

diff --git a/dlls/squadmonster.cpp b/dlls/squadmonster.cpp
@@ -19,7 +19,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "nodes.h"
 #include "monsters.h"
 #include "animation.h"
 #include "saverestore.h"

diff --git a/dlls/tripmine.cpp b/dlls/tripmine.cpp
@@ -412,12 +412,9 @@ void CTripmine::Spawn()
 
 	InitDefaultAmmo(TRIPMINE_DEFAULT_GIVE);
 
-#if CLIENT_DLL
 	if( !bIsMultiplayer() )
-#else
-	if( !g_pGameRules->IsDeathmatch() )
-#endif
 	{
+		// TODO: why a different size in singleplayer?
 		UTIL_SetSize( pev, Vector( -16.0f, -16.0f, 0.0f ), Vector( 16.0f, 16.0f, 28.0f ) ); 
 	}
 }

diff --git a/dlls/uzi.cpp b/dlls/uzi.cpp
@@ -137,21 +137,8 @@ void CUzi::PrimaryAttack()
 
 	Vector vecSrc = m_pPlayer->GetGunPosition();
 	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
-	Vector vecDir;
-#if CLIENT_DLL
-	if( !bIsMultiplayer() )
-#else
-	if( !g_pGameRules->IsMultiplayer() )
-#endif
-	{
-		// optimized multiplayer. Widened to make it easier to hit a moving player
-		vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_4DEGREES, 8192, BULLET_PLAYER_UZI, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
-	}
-	else
-	{
-		// single player spread
-		vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_2DEGREES, 8192, BULLET_PLAYER_UZI, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
-	}
+	// single player spread
+	Vector vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_UZI, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
 
 	int flags;
 #if defined( CLIENT_WEAPONS )

diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp
@@ -27,7 +27,6 @@
 #include "monsters.h"
 #include "weapons.h"
 #include "rpgrocket.h"
-#include "nodes.h"
 #include "soundent.h"
 #include "decals.h"
 #include "game.h"
@@ -214,6 +213,11 @@ void ExplodeModel( const Vector &vecOrigin, float speed, int model, int count )
 }
 #endif
 
+bool bIsMultiplayer()
+{
+	return g_pGameRules->IsMultiplayer();
+}
+
 // Precaches the weapon and queues the weapon info for sending to clients
 bool UTIL_PrecacheOtherWeapon( const char *szClassname )
 {

diff --git a/dlls/weapons.h b/dlls/weapons.h
@@ -385,8 +385,9 @@ class CWeaponBox : public CBaseDelay
 	int m_cAmmoTypes;// how many ammo types packed into this box (if packed by a level designer)
 };
 
-#if CLIENT_DLL
 bool bIsMultiplayer ( void );
+
+#if CLIENT_DLL
 void LoadVModel ( const char *szViewModel, CBasePlayer *m_pPlayer );
 #endif