EZ1 v4 Linux/gcc build fixes

sp/src/game/server/ez2/npc_basepredator.cpp

@@ -10,8 +10,8 @@
 //=============================================================================//
 
 #include "cbase.h"
-#include "AI_Hint.h"
-#include "AI_Senses.h"
+#include "ai_hint.h"
+#include "ai_senses.h"
 #include "npc_basepredator.h"
 #include "ai_localnavigator.h"
 #include "fire.h"
@@ -1156,4 +1156,4 @@ AI_BEGIN_CUSTOM_NPC( npc_predator, CNPC_BasePredator )
 		"	Interrupts"
 	)
 
-AI_END_CUSTOM_NPC()
+AI_END_CUSTOM_NPC()

sp/src/game/server/hl2/npc_combine.cpp

@@ -88,7 +88,7 @@ ConVar sv_combine_eye_tracers("sv_combine_eye_tracers", "1", FCVAR_REPLICATED);
 //-----------------------------------------------------------------------------
 // This is the index to the name of the shotgun's classname in the string pool
 // so that we can get away with an integer compare rather than a string compare.
-string_t	s_iszShotgunClassname;
+static string_t s_iszShotgunClassname;
 
 //-----------------------------------------------------------------------------
 // Interactions
@@ -106,8 +106,8 @@ int	g_interactionCombineBash		= 0; // melee bash attack
 #define COMBINE_AE_GREN_DROP		( 9 )
 #define COMBINE_AE_CAUGHT_ENEMY		( 10) // grunt established sight with an enemy (player only) that had previously eluded the squad.
 
-int COMBINE_AE_BEGIN_ALTFIRE;
-int COMBINE_AE_ALTFIRE;
+static int COMBINE_AE_BEGIN_ALTFIRE;
+static int COMBINE_AE_ALTFIRE;
 #ifdef EZ
 static int AE_METROPOLICE_START_DEPLOY;
 static int AE_METROPOLICE_DEPLOY_MANHACK;
@@ -116,23 +116,23 @@ static int AE_METROPOLICE_DEPLOY_MANHACK;
 //=========================================================
 // Combine activities
 //=========================================================
-//Activity ACT_COMBINE_STANDING_SMG1;
-//Activity ACT_COMBINE_CROUCHING_SMG1;
-//Activity ACT_COMBINE_STANDING_AR2;
-//Activity ACT_COMBINE_CROUCHING_AR2;
-//Activity ACT_COMBINE_WALKING_AR2;
-//Activity ACT_COMBINE_STANDING_SHOTGUN;
-//Activity ACT_COMBINE_CROUCHING_SHOTGUN;
-Activity ACT_COMBINE_THROW_GRENADE;
-Activity ACT_COMBINE_LAUNCH_GRENADE;
-Activity ACT_COMBINE_BUGBAIT;
-Activity ACT_COMBINE_AR2_ALTFIRE;
+//static Activity ACT_COMBINE_STANDING_SMG1;
+//static Activity ACT_COMBINE_CROUCHING_SMG1;
+//static Activity ACT_COMBINE_STANDING_AR2;
+//static Activity ACT_COMBINE_CROUCHING_AR2;
+//static Activity ACT_COMBINE_WALKING_AR2;
+//static Activity ACT_COMBINE_STANDING_SHOTGUN;
+//static Activity ACT_COMBINE_CROUCHING_SHOTGUN;
+static Activity ACT_COMBINE_THROW_GRENADE;
+static Activity ACT_COMBINE_LAUNCH_GRENADE;
+static Activity ACT_COMBINE_BUGBAIT;
+static Activity ACT_COMBINE_AR2_ALTFIRE;
 Activity ACT_WALK_EASY;
 Activity ACT_WALK_MARCH; 
 #ifdef EZ
-Activity ACT_IDLE_UNARMED;
-Activity ACT_WALK_UNARMED;
-Activity ACT_METROPOLICE_DEPLOY_MANHACK;
+static Activity ACT_IDLE_UNARMED;
+static Activity ACT_WALK_UNARMED;
+static Activity ACT_METROPOLICE_DEPLOY_MANHACK;
 #endif
 
 // -----------------------------------------------

sp/src/game/server/hl2/npc_combines.cpp

@@ -457,4 +457,4 @@ BEGIN_DATADESC( CNPC_CombineS )
 #endif
 
 END_DATADESC()
-#endif
+#endif

sp/src/game/server/hl2/npc_metropolice.cpp

@@ -123,12 +123,12 @@ ConVar  metropolice_charge("metropolice_charge", "1" );
 #define METROPOLICE_NUM_CLIPS			5
 #define METROPOLICE_BURST_RELOAD_COUNT	20
 
-int AE_METROPOLICE_BATON_ON;
-int	AE_METROPOLICE_BATON_OFF;
-int AE_METROPOLICE_SHOVE;
-int AE_METROPOLICE_START_DEPLOY;
-int AE_METROPOLICE_DRAW_PISTOL;		// was	50
-int AE_METROPOLICE_DEPLOY_MANHACK;	// was	51
+static int AE_METROPOLICE_BATON_ON;
+static int AE_METROPOLICE_BATON_OFF;
+static int AE_METROPOLICE_SHOVE;
+static int AE_METROPOLICE_START_DEPLOY;
+static int AE_METROPOLICE_DRAW_PISTOL;    // was 50
+static int AE_METROPOLICE_DEPLOY_MANHACK; // was 51
 
 // -----------------------------------------------
 //	> Squad slots
@@ -149,16 +149,16 @@ enum SquadSlot_T
 //=========================================================
 // Metro Police  Activities
 //=========================================================
-int ACT_METROPOLICE_DRAW_PISTOL;
-int ACT_METROPOLICE_DEPLOY_MANHACK;
-int ACT_METROPOLICE_FLINCH_BEHIND;
-
-int	ACT_WALK_BATON;
-int	ACT_IDLE_ANGRY_BATON;
-int	ACT_PUSH_PLAYER;
-int ACT_MELEE_ATTACK_THRUST;
-int ACT_ACTIVATE_BATON;
-int ACT_DEACTIVATE_BATON;
+static int ACT_METROPOLICE_DRAW_PISTOL;
+static int ACT_METROPOLICE_DEPLOY_MANHACK;
+static int ACT_METROPOLICE_FLINCH_BEHIND;
+
+static int ACT_WALK_BATON;
+static int ACT_IDLE_ANGRY_BATON;
+static int ACT_PUSH_PLAYER;
+static int ACT_MELEE_ATTACK_THRUST;
+static int ACT_ACTIVATE_BATON;
+static int ACT_DEACTIVATE_BATON;
 
 LINK_ENTITY_TO_CLASS( npc_metropolice, CNPC_MetroPolice );
 

sp/src/game/server/hl2/weapon_shotgun.cpp

@@ -746,7 +746,7 @@ CWeaponShotgun::CWeaponShotgun( void )
 	m_fMaxRange1		= 500;
 #else
 	m_fMaxRange1		= 1400; // BREADMAN
-#endif;
+#endif
 	m_fMinRange2		= 0.0;
 #ifndef EZ2
 	m_fMaxRange2		= 200;