server: code review fixes for PR #197

SNMetamorph · Nov 23, 2023 · 1f44613 · 1f44613
1 parent 4845f7c
commit 1f44613
Show file tree

Hide file tree

Showing 49 changed files with 440 additions and 433 deletions.
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
@@ -23,7 +23,6 @@ list(APPEND SVDLL_SOURCES
 	"ggrenade.cpp"
 	"globals.cpp"
 	"h_battery.cpp"
-	"healthkit.cpp"
 	"h_cycler.cpp"
 	"items.cpp"
 	"lights.cpp"

diff --git a/server/entities/apache_rocket.h b/server/entities/apache_rocket.h
@@ -25,6 +25,7 @@
 
 class CApacheHVR : public CGrenade
 {
+public:
 	DECLARE_CLASS( CApacheHVR, CGrenade );
 	void Spawn( void );
 	void Precache( void );

diff --git a/server/entities/controller_zapball.cpp → server/entities/controller_energy_ball.cpp b/server/entities/controller_zapball.cpp → server/entities/controller_energy_ball.cpp
@@ -17,7 +17,7 @@
 // CONTROLLER ZAPBALL
 //=========================================================
 
-#include	"controller_zapball.h"
+#include	"controller_energy_ball.h"
 
 LINK_ENTITY_TO_CLASS( controller_energy_ball, CControllerZapBall );
 

diff --git a/server/entities/controller_zapball.h → server/entities/controller_energy_ball.h b/server/entities/controller_zapball.h → server/entities/controller_energy_ball.h
diff --git a/server/entities/controller_headball.cpp → server/entities/controller_head_ball.cpp b/server/entities/controller_headball.cpp → server/entities/controller_head_ball.cpp
@@ -17,7 +17,7 @@
 // CONTROLLER HEADBALL
 //=========================================================
 
-#include	"controller_headball.h"
+#include	"controller_head_ball.h"
 
 LINK_ENTITY_TO_CLASS( controller_head_ball, CControllerHeadBall );
 

diff --git a/server/entities/controller_headball.h → server/entities/controller_head_ball.h b/server/entities/controller_headball.h → server/entities/controller_head_ball.h
diff --git a/server/entities/gargantua_smoker.cpp → server/entities/env_smoker.cpp b/server/entities/gargantua_smoker.cpp → server/entities/env_smoker.cpp
@@ -16,7 +16,7 @@
 //=========================================================
 // Gargantua
 //=========================================================
-#include	"gargantua_smoker.h"
+#include	"env_smoker.h"
 
 LINK_ENTITY_TO_CLASS( env_smoker, CSmoker );
 

diff --git a/server/entities/gargantua_smoker.h → server/entities/env_smoker.h b/server/entities/gargantua_smoker.h → server/entities/env_smoker.h
diff --git a/server/healthkit.cpp → server/entities/func_healthcharger.cpp b/server/healthkit.cpp → server/entities/func_healthcharger.cpp
@@ -14,7 +14,7 @@
 //-------------------------------------------------------------
 // Wall mounted health kit
 //-------------------------------------------------------------
-#include "healthkit.h"
+#include "func_healthcharger.h"
 
 LINK_ENTITY_TO_CLASS(func_healthcharger, CWallHealth);
 

diff --git a/server/healthkit.h → server/entities/func_healthcharger.h b/server/healthkit.h → server/entities/func_healthcharger.h
diff --git a/server/entities/info_BM.cpp → server/entities/info_bigmomma.cpp b/server/entities/info_BM.cpp → server/entities/info_bigmomma.cpp
@@ -16,7 +16,7 @@
 //=========================================================
 // monster template
 //=========================================================
-#include	"info_BM.h"
+#include	"info_bigmomma.h"
 
 LINK_ENTITY_TO_CLASS( info_bigmomma, CInfoBM );
 

diff --git a/server/entities/info_BM.h → server/entities/info_bigmomma.h b/server/entities/info_BM.h → server/entities/info_bigmomma.h
diff --git a/server/entities/nihilanth_hvr.cpp → server/entities/nihilanth_energy_ball.cpp b/server/entities/nihilanth_hvr.cpp → server/entities/nihilanth_energy_ball.cpp
@@ -13,7 +13,7 @@
 *
 ****/
 
-#include "nihilanth_hvr.h"
+#include "nihilanth_energy_ball.h"
 
 LINK_ENTITY_TO_CLASS( nihilanth_energy_ball, CNihilanthHVR );
 

diff --git a/server/entities/nihilanth_hvr.h → server/entities/nihilanth_energy_ball.h b/server/entities/nihilanth_hvr.h → server/entities/nihilanth_energy_ball.h
diff --git a/server/entities/gargantua_spiral.cpp → server/entities/streak_spiral.cpp b/server/entities/gargantua_spiral.cpp → server/entities/streak_spiral.cpp
@@ -16,7 +16,7 @@
 //=========================================================
 // Gargantua
 //=========================================================
-#include	"gargantua_spiral.h"
+#include	"streak_spiral.h"
 
 extern void StreakSplash(const Vector &origin, const Vector &direction, int color, int count, int speed, int velocityRange);
 

diff --git a/server/entities/gargantua_spiral.h → server/entities/streak_spiral.h b/server/entities/gargantua_spiral.h → server/entities/streak_spiral.h
diff --git a/server/monsters/agrunt.cpp b/server/monsters/agrunt.cpp
@@ -29,6 +29,58 @@ BEGIN_DATADESC( CAGrunt )
 	DEFINE_FIELD( m_iLastWord, FIELD_INTEGER ),
 END_DATADESC()
 
+const char *CAGrunt::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CAGrunt::pAttackMissSounds[] = 
+{
+	"zombie/claw_miss1.wav",
+	"zombie/claw_miss2.wav",
+};
+
+const char *CAGrunt::pAttackSounds[] =
+{
+	"agrunt/ag_attack1.wav",
+	"agrunt/ag_attack2.wav",
+	"agrunt/ag_attack3.wav",
+};
+
+const char *CAGrunt::pDieSounds[] =
+{
+	"agrunt/ag_die1.wav",
+	"agrunt/ag_die4.wav",
+	"agrunt/ag_die5.wav",
+};
+
+const char *CAGrunt::pPainSounds[] =
+{
+	"agrunt/ag_pain1.wav",
+	"agrunt/ag_pain2.wav",
+	"agrunt/ag_pain3.wav",
+	"agrunt/ag_pain4.wav",
+	"agrunt/ag_pain5.wav",
+};
+
+const char *CAGrunt::pIdleSounds[] =
+{
+	"agrunt/ag_idle1.wav",
+	"agrunt/ag_idle2.wav",
+	"agrunt/ag_idle3.wav",
+	"agrunt/ag_idle4.wav",
+};
+
+const char *CAGrunt::pAlertSounds[] =
+{
+	"agrunt/ag_alert1.wav",
+	"agrunt/ag_alert3.wav",
+	"agrunt/ag_alert4.wav",
+	"agrunt/ag_alert5.wav",
+};
+
 //=========================================================
 // IRelationship - overridden because Human Grunts are 
 // Alien Grunt's nemesis.

diff --git a/server/monsters/agrunt.h b/server/monsters/agrunt.h
@@ -126,55 +126,3 @@ class CAGrunt : public CSquadMonster
 	float	m_flNextWordTime;
 	int	m_iLastWord;
 };
-
-const char *CAGrunt::pAttackHitSounds[] = 
-{
-	"zombie/claw_strike1.wav",
-	"zombie/claw_strike2.wav",
-	"zombie/claw_strike3.wav",
-};
-
-const char *CAGrunt::pAttackMissSounds[] = 
-{
-	"zombie/claw_miss1.wav",
-	"zombie/claw_miss2.wav",
-};
-
-const char *CAGrunt::pAttackSounds[] =
-{
-	"agrunt/ag_attack1.wav",
-	"agrunt/ag_attack2.wav",
-	"agrunt/ag_attack3.wav",
-};
-
-const char *CAGrunt::pDieSounds[] =
-{
-	"agrunt/ag_die1.wav",
-	"agrunt/ag_die4.wav",
-	"agrunt/ag_die5.wav",
-};
-
-const char *CAGrunt::pPainSounds[] =
-{
-	"agrunt/ag_pain1.wav",
-	"agrunt/ag_pain2.wav",
-	"agrunt/ag_pain3.wav",
-	"agrunt/ag_pain4.wav",
-	"agrunt/ag_pain5.wav",
-};
-
-const char *CAGrunt::pIdleSounds[] =
-{
-	"agrunt/ag_idle1.wav",
-	"agrunt/ag_idle2.wav",
-	"agrunt/ag_idle3.wav",
-	"agrunt/ag_idle4.wav",
-};
-
-const char *CAGrunt::pAlertSounds[] =
-{
-	"agrunt/ag_alert1.wav",
-	"agrunt/ag_alert3.wav",
-	"agrunt/ag_alert4.wav",
-	"agrunt/ag_alert5.wav",
-};
diff --git a/server/monsters/barney.cpp b/server/monsters/barney.cpp
@@ -790,6 +790,9 @@ LINK_ENTITY_TO_CLASS( monster_barney_dead, CDeadBarney );
 //=========================================================
 // ********** DeadBarney SPAWN **********
 //=========================================================
+
+char *CDeadBarney::m_szPoses[] = { "lying_on_back", "lying_on_side", "lying_on_stomach" };
+
 void CDeadBarney :: Spawn( )
 {
 	PRECACHE_MODEL("models/barney.mdl");

diff --git a/server/monsters/barney.h b/server/monsters/barney.h
@@ -102,5 +102,3 @@ class CDeadBarney : public CBaseMonster
 	int m_iPose;// which sequence to display	-- temporary, don't need to save
 	static char *m_szPoses[3];
 };
-
-char *CDeadBarney::m_szPoses[] = { "lying_on_back", "lying_on_side", "lying_on_stomach" };
diff --git a/server/monsters/bigmomma.cpp b/server/monsters/bigmomma.cpp
@@ -18,7 +18,7 @@
 //=========================================================
 #include	"bigmomma.h"
 #include	"bigmomma_mortar.h"
-#include	"info_BM.h"
+#include	"info_bigmomma.h"
 
 extern void MortarSpray(const Vector &position, const Vector &direction, int spriteModel, int count);
 
@@ -32,6 +32,66 @@ BEGIN_DATADESC( CBigMomma )
 	DEFINE_FIELD( m_crabCount, FIELD_INTEGER ),
 END_DATADESC()
 
+const char *CBigMomma::pChildDieSounds[] = 
+{
+	"gonarch/gon_childdie1.wav",
+	"gonarch/gon_childdie2.wav",
+	"gonarch/gon_childdie3.wav",
+};
+
+const char *CBigMomma::pSackSounds[] = 
+{
+	"gonarch/gon_sack1.wav",
+	"gonarch/gon_sack2.wav",
+	"gonarch/gon_sack3.wav",
+};
+
+const char *CBigMomma::pDeathSounds[] = 
+{
+	"gonarch/gon_die1.wav",
+};
+
+const char *CBigMomma::pAttackSounds[] = 
+{
+	"gonarch/gon_attack1.wav",
+	"gonarch/gon_attack2.wav",
+	"gonarch/gon_attack3.wav",
+};
+const char *CBigMomma::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CBigMomma::pBirthSounds[] = 
+{
+	"gonarch/gon_birth1.wav",
+	"gonarch/gon_birth2.wav",
+	"gonarch/gon_birth3.wav",
+};
+
+const char *CBigMomma::pAlertSounds[] = 
+{
+	"gonarch/gon_alert1.wav",
+	"gonarch/gon_alert2.wav",
+	"gonarch/gon_alert3.wav",
+};
+
+const char *CBigMomma::pPainSounds[] = 
+{
+	"gonarch/gon_pain2.wav",
+	"gonarch/gon_pain4.wav",
+	"gonarch/gon_pain5.wav",
+};
+
+const char *CBigMomma::pFootSounds[] = 
+{
+	"gonarch/gon_step1.wav",
+	"gonarch/gon_step2.wav",
+	"gonarch/gon_step3.wav",
+};
+
 //=========================================================
 // Classify - indicates this monster's place in the 
 // relationship table.

diff --git a/server/monsters/bigmomma.h b/server/monsters/bigmomma.h
@@ -141,63 +141,3 @@ class CBigMomma : public CBaseMonster
 	float	m_painSoundTime;
 	int	m_crabCount;
 };
-
-const char *CBigMomma::pChildDieSounds[] = 
-{
-	"gonarch/gon_childdie1.wav",
-	"gonarch/gon_childdie2.wav",
-	"gonarch/gon_childdie3.wav",
-};
-
-const char *CBigMomma::pSackSounds[] = 
-{
-	"gonarch/gon_sack1.wav",
-	"gonarch/gon_sack2.wav",
-	"gonarch/gon_sack3.wav",
-};
-
-const char *CBigMomma::pDeathSounds[] = 
-{
-	"gonarch/gon_die1.wav",
-};
-
-const char *CBigMomma::pAttackSounds[] = 
-{
-	"gonarch/gon_attack1.wav",
-	"gonarch/gon_attack2.wav",
-	"gonarch/gon_attack3.wav",
-};
-const char *CBigMomma::pAttackHitSounds[] = 
-{
-	"zombie/claw_strike1.wav",
-	"zombie/claw_strike2.wav",
-	"zombie/claw_strike3.wav",
-};
-
-const char *CBigMomma::pBirthSounds[] = 
-{
-	"gonarch/gon_birth1.wav",
-	"gonarch/gon_birth2.wav",
-	"gonarch/gon_birth3.wav",
-};
-
-const char *CBigMomma::pAlertSounds[] = 
-{
-	"gonarch/gon_alert1.wav",
-	"gonarch/gon_alert2.wav",
-	"gonarch/gon_alert3.wav",
-};
-
-const char *CBigMomma::pPainSounds[] = 
-{
-	"gonarch/gon_pain2.wav",
-	"gonarch/gon_pain4.wav",
-	"gonarch/gon_pain5.wav",
-};
-
-const char *CBigMomma::pFootSounds[] = 
-{
-	"gonarch/gon_step1.wav",
-	"gonarch/gon_step2.wav",
-	"gonarch/gon_step3.wav",
-};
diff --git a/server/monsters/bullsquid.cpp b/server/monsters/bullsquid.cpp
@@ -28,6 +28,8 @@ BEGIN_DATADESC( CBullsquid )
 	DEFINE_FIELD( m_flNextSpitTime, FIELD_TIME ),
 END_DATADESC()
 
+int			   iSquidSpitSprite;
+
 //=========================================================
 // IgnoreConditions 
 //=========================================================

diff --git a/server/monsters/bullsquid.h b/server/monsters/bullsquid.h
@@ -31,7 +31,7 @@
 
 #define		SQUID_SPRINT_DIST	256 // how close the squid has to get before starting to sprint and refusing to swerve
 
-int			   iSquidSpitSprite;
+extern int			   iSquidSpitSprite;
 
 //=========================================================
 // monster-specific schedule types
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     *
     ****/
-    #include "nihilanth_hvr.h"
+    #include "nihilanth_energy_ball.h"
     LINK_ENTITY_TO_CLASS( nihilanth_energy_ball, CNihilanthHVR );
@@ Expand Down @@