Merge pull request #37 from nekonomicon/string_t

A little fixes.

cl_dll/GameStudioModelRenderer.h

@@ -5,11 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( GAMESTUDIOMODELRENDERER_H )
 #define GAMESTUDIOMODELRENDERER_H
-#if defined( _WIN32 )
-#pragma once
-#endif
 
 /*
 ====================

cl_dll/GameStudioModelRenderer_Sample.h

@@ -5,11 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( GAMESTUDIOMODELRENDERER_H )
 #define GAMESTUDIOMODELRENDERER_H
-#if defined( _WIN32 )
-#pragma once
-#endif
 
 /*
 ====================

cl_dll/StudioModelRenderer.h

@@ -5,11 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined ( STUDIOMODELRENDERER_H )
 #define STUDIOMODELRENDERER_H
-#if defined( _WIN32 )
-#pragma once
-#endif
 
 /*
 ====================

cl_dll/ammo.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef __AMMO_H__
 #define __AMMO_H__
 

cl_dll/ammohistory.h

@@ -15,6 +15,9 @@
 //
 // ammohistory.h
 //
+#pragma once
+#ifndef AMMOHISTORY_H
+#define AMMOHISTORY_H
 
 // this is the max number of items in each bucket
 #define MAX_WEAPON_POSITIONS		MAX_WEAPON_SLOTS
@@ -137,3 +140,4 @@ public:
 };
 
 extern HistoryResource gHR;
+#endif // AMMOHISTORY_H

cl_dll/camera.h

@@ -7,7 +7,7 @@
 
 // Camera.h  --  defines and such for a 3rd person camera
 // NOTE: must include quakedef.h first
-
+#pragma once
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
 

cl_dll/cl_dll.h

@@ -25,6 +25,7 @@
 //		- Drawing the HUD graphics every frame
 //		- Handling the custum HUD-update packets
 //
+#pragma once
 #ifndef CL_DLL_H
 #define CL_DLL_H
 typedef unsigned char byte;

cl_dll/com_weapons.h

@@ -7,11 +7,9 @@
 
 // com_weapons.h
 // Shared weapons common function prototypes
+#pragma once
 #if !defined( COM_WEAPONSH )
 #define COM_WEAPONSH
-#ifdef _WIN32
-#pragma once
-#endif
 
 #include "hud_iface.h"
 

cl_dll/demo.h

@@ -5,9 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( DEMOH )
 #define DEMOH
-#pragma once
 
 // Types of demo messages we can write/parse
 enum

cl_dll/ev_hldm.h

@@ -5,6 +5,7 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined ( EV_HLDMH )
 #define EV_HLDMH
 

cl_dll/eventscripts.h

@@ -6,6 +6,7 @@
 //=============================================================================
 
 // eventscripts.h
+#pragma once
 #if !defined ( EVENTSCRIPTSH )
 #define EVENTSCRIPTSH
 

cl_dll/health.h

@@ -12,6 +12,9 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
+#ifndef HEALTH_H
+#define HEALTH_H
 
 #define DMG_IMAGE_LIFE		2	// seconds that image is up
 
@@ -122,3 +125,4 @@ private:
 	void CalcDamageDirection( vec3_t vecFrom );
 	void UpdateTiles( float fTime, long bits );
 };
+#endif // HEALTH_H

cl_dll/hud.h

@@ -19,6 +19,7 @@
 //
 // CHud handles the message, calculation, and drawing the HUD
 //
+#pragma once
 #ifndef HUD_H
 #define HUD_H
 #define RGB_YELLOWISH 0x00FFA000 //255,160,0

cl_dll/hud_iface.h

@@ -5,9 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( HUD_IFACEH )
 #define HUD_IFACEH
-#pragma once
 
 #include "exportdef.h"
 

cl_dll/hud_spectator.h

@@ -5,9 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
-#ifndef SPECTATOR_H
-#define SPECTATOR_H
 #pragma once
+#ifndef HUD_SPECTATOR_H
+#define HUD_SPECTATOR_H
 
 #include "cl_entity.h"
 

cl_dll/in_defs.h

@@ -5,9 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( IN_DEFSH )
 #define IN_DEFSH
-#pragma once
 
 // up / down
 #define	PITCH	0

cl_dll/input_mouse.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef INPUT_MOUSE_H
 #define INPUT_MOUSE_H
 #include "cl_dll.h"

cl_dll/kbutton.h

@@ -4,10 +4,9 @@
 //
 // $NoKeywords: $
 //=============================================================================
-
+#pragma once
 #if !defined( KBUTTONH )
 #define KBUTTONH
-#pragma once
 
 typedef struct kbutton_s
 {

cl_dll/overview.h

@@ -5,9 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #ifndef OVERVIEW_H
 #define OVERVIEW_H
-#pragma once
 
 //-----------------------------------------------------------------------------
 // Purpose: Handles the drawing of the top-down map and all the things on it

cl_dll/parsemsg.h

@@ -15,6 +15,9 @@
 //
 //  parsemsg.h
 //
+#pragma once
+#ifndef PARSEMSG_H
+#define PARSEMSG_H
 
 #define ASSERT( x )
 
@@ -30,6 +33,7 @@ float READ_COORD( void );
 float READ_ANGLE( void );
 float READ_HIRESANGLE( void );
 
+#endif // PARSEMSG_H
 
 
 

cl_dll/studio_util.h

@@ -5,11 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( STUDIO_UTIL_H )
 #define STUDIO_UTIL_H
-#if defined( WIN32 )
-#pragma once
-#endif
 
 #ifndef M_PI
 #define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h

cl_dll/util_vector.h

@@ -15,6 +15,9 @@
 //  Vector.h
 // A subset of the extdll.h in the project HL Entity DLL
 //
+#pragma once
+#ifndef UTIL_VECTOR_H
+#define UTIL_VECTOR_H
 
 // Misc C-runtime library headers
 #include "stdio.h"
@@ -23,7 +26,7 @@
 
 // Header file containing definition of globalvars_t and entvars_t
 typedef unsigned int func_t;					//
-typedef unsigned int string_t;				// from engine's pr_comp.h;
+typedef int string_t;				// from engine's pr_comp.h;
 typedef float vec_t;				// needed before including progdefs.h
 
 //=========================================================
@@ -124,3 +127,4 @@ inline float DotProduct( const Vector& a, const Vector& b) { return( a.x * b.x +
 inline Vector CrossProduct(const Vector& a, const Vector& b) { return Vector( a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x ); }
 
 #define vec3_t Vector
+#endif // UTIL_VECTOR_H

common/beamdef.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef BEAMDEF_H
 #define BEAMDEF_H
 

common/bspfile.h

@@ -12,7 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
+#pragma once
 #ifndef BSPFILE_H
 #define BSPFILE_H
 

common/cl_entity.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef CL_ENTITY_H
 #define CL_ENTITY_H
 

common/com_model.h

@@ -12,7 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
+#pragma once
 #ifndef COM_MODEL_H
 #define COM_MODEL_H
 

common/con_nprint.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef CON_NPRINT_H
 #define CON_NPRINT_H
 

common/const.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef CONST_H
 #define CONST_H
 //
@@ -733,7 +734,7 @@ enum
 };
 
 typedef unsigned int		func_t;
-typedef unsigned int		string_t;
+typedef int		string_t;
 
 typedef unsigned char	byte;
 typedef unsigned short	word;

common/cvardef.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef CVARDEF_H
 #define CVARDEF_H
 

common/demo_api.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef DEMO_API_H
 #define DEMO_API_H
 

common/dlight.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef DLIGHT_H
 #define DLIGHT_H
 

common/entity_state.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef ENTITY_STATE_H
 #define ENTITY_STATE_H
 

common/entity_types.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef ENTITY_TYPES_H
 #define ENTITY_TYPES_H
 

common/event_api.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef EVENT_API_H
 #define EVENT_API_H
 

common/event_args.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef EVENT_ARGS_H
 #define EVENT_ARGS_H
 

common/event_flags.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef EVENT_FLAGS_H
 #define EVENT_FLAGS_H
 

common/gameinfo.h

@@ -12,7 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
+#pragma once
 #ifndef GAMEINFO_H
 #define GAMEINFO_H
 

common/hltv.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef HLTV_H
 #define HLTV_H
 

common/ivoicetweak.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef IVOICETWEAK_H
 #define IVOICETWEAK_H
 

common/lightstyle.h

@@ -12,7 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
+#pragma once
 #ifndef LIGHTSTYLE_H
 #define LIGHTSTYLE_H
 

common/mathlib.h

@@ -13,7 +13,9 @@
 *
 ****/
 // mathlib.h
-
+#pragma once
+#ifndef MATHLIB_H
+#define MATHLIB_H
 #include <math.h>
 
 typedef float vec_t;
@@ -98,3 +100,4 @@ float	anglemod(float a);
 	)										\
 	:										\
 		BoxOnPlaneSide( (emins), (emaxs), (p)))
+#endif // MATHLIB_H

common/net_api.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef NET_API_H
 #define NET_API_H
 
@@ -94,4 +94,4 @@ typedef struct net_api_s
 	void		(*SetValueForKey)( char *s, const char *key, const char *value, int maxsize );
 } net_api_t;
 
-#endif//NET_APIH
+#endif // NET_APIH

common/netadr.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef NETADR_H
 #define NETADR_H
 

common/particledef.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef PARTICLEDEF_H
 #define PARTICLEDEF_H
 

common/pmtrace.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef PM_TRACE_H
 #define PM_TRACE_H
 

common/qfont.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef QFONT_H
 #define QFONT_H
 

common/r_efx.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef R_EFX_H
 #define R_EFX_H
 

common/r_studioint.h

@@ -12,8 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
-
+#pragma once
 #ifndef R_STUDIOINT_H
 #define R_STUDIOINT_H
 

common/ref_params.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef REF_PARAMS_H
 #define REF_PARAMS_H
 

common/render_api.h

@@ -12,7 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
+#pragma once
 #ifndef RENDER_API_H
 #define RENDER_API_H
 

common/screenfade.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef SCREENFADE_H
 #define SCREENFADE_H
 

common/studio_event.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef STUDIO_EVENT_H
 #define STUDIO_EVENT_H
 

common/triangleapi.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef TRIANGLEAPI_H
 #define TRIANGLEAPI_H
 

common/usercmd.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef USERCMD_H
 #define USERCMD_H
 

common/wadfile.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef WADFILE_H
 #define WADFILE_H
 

common/weaponinfo.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef WEAPONINFO_H
 #define WEAPONINFO_H
 

common/wrect.h

@@ -12,7 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
+#pragma once
 #ifndef WRECT_H
 #define WRECT_H
 

dlls/activity.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef	ACTIVITY_H
 #define	ACTIVITY_H
 

dlls/activitymap.h

@@ -12,7 +12,9 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
+#ifndef ACTIVITYMAP_H
+#define ACTIVITYMAP_H
 #define _A( a ) { a, #a }
 
 activity_map_t activity_map[] =
@@ -95,3 +97,4 @@ _A(	ACT_FLINCH_LEFTLEG ),
 _A(	ACT_FLINCH_RIGHTLEG ),
 { 0, NULL }
 };
+#endif // ACTIVITYMAP_H

dlls/animation.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef ANIMATION_H
 #define ANIMATION_H
 

dlls/basemonster.h

@@ -12,7 +12,7 @@
 *   use or distribution of this code by or to any unlicensed person is illegal.
 *
 ****/
-
+#pragma once
 #ifndef BASEMONSTER_H
 #define BASEMONSTER_H
 

dlls/bigmomma.cpp

@@ -49,7 +49,7 @@ public:
 	virtual int Restore( CRestore &restore );
 	static TYPEDESCRIPTION m_SaveData[];
 
-	int m_preSequence;
+	string_t m_preSequence;
 };
 
 LINK_ENTITY_TO_CLASS( info_bigmomma, CInfoBM )

dlls/cbase.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef CBASE_H
 #define CBASE_H
 /*
@@ -438,7 +439,7 @@ class CBaseDelay : public CBaseEntity
 {
 public:
 	float m_flDelay;
-	int m_iszKillTarget;
+	string_t m_iszKillTarget;
 
 	virtual void KeyValue( KeyValueData *pkvd );
 	virtual int Save( CSave &save );

dlls/cdll_dll.h

@@ -16,7 +16,7 @@
 //  cdll_dll.h
 
 // this file is included by both the game-dll and the client-dll,
-
+#pragma once
 #ifndef CDLL_DLL_H
 #define CDLL_DLL_H
 

dlls/client.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef CLIENT_H
 #define CLIENT_H
 

dlls/decals.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef DECALS_H
 #define DECALS_H
 

dlls/doors.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef DOORS_H
 #define DOORS_H
 

dlls/effects.cpp

@@ -380,8 +380,8 @@ public:
 	void BeamUpdateVars( void );
 
 	int	m_active;
-	int	m_iszStartEntity;
-	int	m_iszEndEntity;
+	string_t	m_iszStartEntity;
+	string_t	m_iszEndEntity;
 	float	m_life;
 	int	m_boltWidth;
 	int	m_noiseAmplitude;
@@ -389,7 +389,7 @@ public:
 	int	m_speed;
 	float	m_restrike;
 	int	m_spriteTexture;
-	int	m_iszSpriteName;
+	string_t	m_iszSpriteName;
 	int	m_frameStart;
 
 	float	m_radius;
@@ -2181,6 +2181,8 @@ public:
 
 void CItemSoda::Precache( void )
 {
+	PRECACHE_MODEL( "models/can.mdl" );
+	PRECACHE_SOUND( "weapons/g_bounce.wav" );
 }
 
 LINK_ENTITY_TO_CLASS( item_sodacan, CItemSoda )

dlls/effects.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef EFFECTS_H
 #define EFFECTS_H
 
@@ -321,7 +322,7 @@ public:
 	static	TYPEDESCRIPTION m_SaveData[];
 
 	CSprite	*m_pSprite;
-	int	m_iszSpriteName;
+	string_t	m_iszSpriteName;
 	Vector	m_firePosition;
 };
 #endif		//EFFECTS_H

dlls/explode.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef EXPLODE_H
 #define EXPLODE_H
 
@@ -26,4 +27,4 @@ extern DLL_GLOBAL short g_sModelIndexFireball;
 extern DLL_GLOBAL short g_sModelIndexSmoke;
 
 extern void ExplosionCreate( const Vector &center, const Vector &angles, edict_t *pOwner, int magnitude, BOOL doDamage );
-#endif			//EXPLODE_H
+#endif	// EXPLODE_H

dlls/exportdef.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef EXPORTDEF_H
 #define EXPORTDEF_H
 #if defined _WIN32 || defined __CYGWIN__

dlls/extdll.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef EXTDLL_H
 #define EXTDLL_H
 
@@ -69,7 +70,7 @@ typedef int BOOL;
 
 // Header file containing definition of globalvars_t and entvars_t
 typedef unsigned int func_t;
-typedef unsigned int string_t;				// from engine's pr_comp.h;
+typedef int string_t;				// from engine's pr_comp.h;
 typedef float vec_t;				// needed before including progdefs.h
 
 // Vector class

dlls/flyingmonster.h

@@ -13,7 +13,7 @@
 *
 ****/
 // Base class for flying monsters.  This overrides the movement test & execution code from CBaseMonster
-
+#pragma once
 #ifndef FLYINGMONSTER_H
 #define FLYINGMONSTER_H
 

dlls/func_break.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef FUNC_BREAK_H
 #define FUNC_BREAK_H
 
@@ -84,7 +85,7 @@ public:
 	Explosions m_Explosion;
 	int m_idShard;
 	float m_angle;
-	int m_iszGibModel;
-	int m_iszSpawnObject;
+	string_t m_iszGibModel;
+	string_t m_iszSpawnObject;
 };
 #endif	// FUNC_BREAK_H

dlls/func_tank.cpp

@@ -120,14 +120,14 @@ protected:
 
 	Vector		m_barrelPos;	// Length of the freakin barrel
 	float		m_spriteScale;	// Scale of any sprites we shoot
-	int			m_iszSpriteSmoke;
-	int			m_iszSpriteFlash;
+	string_t	m_iszSpriteSmoke;
+	string_t	m_iszSpriteFlash;
 	TANKBULLET	m_bulletType;	// Bullet type
 	int			m_iBulletDamage; // 0 means use Bullet type's default damage
 	
 	Vector		m_sightOrigin;	// Last sight of target
 	int			m_spread;		// firing spread
-	int			m_iszMaster;	// Master entity (game_team_master or multisource)
+	string_t	m_iszMaster;	// Master entity (game_team_master or multisource)
 };
 
 TYPEDESCRIPTION	CFuncTank::m_SaveData[] =

dlls/game.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef GAME_H
 #define GAME_H
 

dlls/gamerules.h

@@ -15,7 +15,9 @@
 //=========================================================
 // GameRules
 //=========================================================
-
+#pragma once
+#ifndef GAMERULES_H
+#define GAMERULES_H
 //#include "weapons.h"
 //#include "items.h"
 class CBasePlayerItem;
@@ -361,3 +363,4 @@ protected:
 };
 
 extern DLL_GLOBAL CGameRules *g_pGameRules;
+#endif // GAMERULES_H

dlls/hgrunt.cpp

@@ -959,6 +959,7 @@ void CHGrunt::HandleAnimEvent( MonsterEvent_t *pEvent )
 			}
 
 		}
+			break;
 		default:
 			CSquadMonster::HandleAnimEvent( pEvent );
 			break;

dlls/hornet.h

@@ -15,7 +15,9 @@
 //=========================================================
 // Hornets
 //=========================================================
-
+#pragma once
+#ifndef HORNET_H
+#define HORNET_H
 //=========================================================
 // Hornet Defines
 //=========================================================
@@ -55,3 +57,4 @@ public:
 	int m_iHornetType;
 	float m_flFlySpeed;
 };
+#endif // HORNET_H

dlls/items.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef ITEMS_H
 #define ITEMS_H
 

dlls/lights.cpp

@@ -38,7 +38,7 @@ public:
 
 private:
 	int m_iStyle;
-	int m_iszPattern;
+	string_t m_iszPattern;
 };
 
 LINK_ENTITY_TO_CLASS( light, CLight )

dlls/monsters.h

@@ -12,6 +12,7 @@
 *   use or distribution of this code by or to any unlicensed person is illegal.
 *
 ****/
+#pragma once
 #ifndef MONSTERS_H
 #include "skill.h"
 #define MONSTERS_H

dlls/mortar.cpp

@@ -45,8 +45,8 @@ public:
 
 	void EXPORT FieldUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
 
-	int m_iszXController;
-	int m_iszYController;
+	string_t m_iszXController;
+	string_t m_iszYController;
 	float m_flSpread;
 	float m_flDelay;
 	int m_iCount;

dlls/nodes.h

@@ -15,6 +15,7 @@
 //=========================================================
 // nodes.h
 //=========================================================
+#pragma once
 #ifndef		NODES_H
 #define		NODES_H
 //=========================================================

dlls/physcallback.h

@@ -12,9 +12,9 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef PHYSCALLBACK_H
 #define PHYSCALLBACK_H
-#pragma once
 
 #include "physint.h"
 

dlls/plane.h

@@ -12,12 +12,12 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef PLANE_H
-#define PLANE_H
-
 //=========================================================
 // Plane
 //=========================================================
+#ifndef PLANE_H
+#define PLANE_H
+
 class CPlane
 {
 public:

dlls/plats.cpp

@@ -1619,9 +1619,9 @@ public:
 
 	CFuncTrackTrain	*m_train;
 
-	int m_trackTopName;
-	int m_trackBottomName;
-	int m_trainName;
+	string_t m_trackTopName;
+	string_t m_trackBottomName;
+	string_t m_trainName;
 	TRAIN_CODE m_code;
 	int m_targetState;
 	int m_use;

dlls/player.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef PLAYER_H
 #define PLAYER_H
 

dlls/saverestore.h

@@ -13,6 +13,7 @@
 *
 ****/
 // Implementation in UTIL.CPP
+#pragma once
 #ifndef SAVERESTORE_H
 #define SAVERESTORE_H
 

dlls/schedule.h

@@ -15,7 +15,7 @@
 //=========================================================
 // Scheduling 
 //=========================================================
-
+#pragma once
 #ifndef	SCHEDULE_H
 #define	SCHEDULE_H
 

dlls/scripted.cpp

@@ -907,15 +907,15 @@ public:
 	BOOL StartSentence( CBaseMonster *pTarget );
 
 private:
-	int m_iszSentence;		// string index for idle animation
-	int m_iszEntity;	// entity that is wanted for this sentence
+	string_t m_iszSentence;		// string index for idle animation
+	string_t m_iszEntity;	// entity that is wanted for this sentence
 	float m_flRadius;		// range to search
 	float m_flDuration;	// How long the sentence lasts
 	float m_flRepeat;	// repeat rate
 	float m_flAttenuation;
 	float m_flVolume;
 	BOOL m_active;
-	int m_iszListener;	// name of entity to look at while talking
+	string_t m_iszListener; // name of entity to look at while talking
 };
 
 #define SF_SENTENCE_ONCE	0x0001

dlls/scripted.h

@@ -12,6 +12,7 @@
 *   use or distribution of this code by or to any unlicensed person is illegal.
 *
 ****/
+#pragma once
 #ifndef SCRIPTED_H
 #define SCRIPTED_H
 
@@ -77,9 +78,9 @@ public:
 	void	AllowInterrupt( BOOL fAllow );
 	int		IgnoreConditions( void );
 
-	int	m_iszIdle;		// string index for idle animation
-	int	m_iszPlay;		// string index for scripted animation
-	int m_iszEntity;	// entity that is wanted for this script
+	string_t m_iszIdle;		// string index for idle animation
+	string_t m_iszPlay;		// string index for scripted animation
+	string_t m_iszEntity;	// entity that is wanted for this script
 	int m_fMoveTo;
 	int m_iFinishSchedule;
 	float m_flRadius;		// range to search

dlls/scriptevent.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef SCRIPTEVENT_H
 #define SCRIPTEVENT_H
 
@@ -26,4 +27,4 @@
 #define SCRIPT_EVENT_SOUND_VOICE	1008		// Play named wave file (on CHAN_VOICE)
 #define	SCRIPT_EVENT_SENTENCE_RND1	1009		// Play sentence group 25% of the time
 #define SCRIPT_EVENT_NOT_DEAD		1010		// Bring back to life (for life/death sequences)
-#endif //SCRIPTEVENT_H
+#endif // SCRIPTEVENT_H

dlls/skill.h

@@ -15,13 +15,16 @@
 //=========================================================
 // skill.h - skill level concerns
 //=========================================================
+#pragma once
+#ifndef SKILL_H
+#define SKILL_H
 
 struct skilldata_t
 {
 	int iSkillLevel; // game skill level
 
 	// Monster Health & Damage
-	float	agruntHealth;
+	float agruntHealth;
 	float agruntDmgPunch;
 
 	float apacheHealth;
@@ -143,3 +146,4 @@ extern DLL_GLOBAL int		g_iSkillLevel;
 #define SKILL_EASY		1
 #define SKILL_MEDIUM	2
 #define SKILL_HARD		3
+#endif // SKILL_H

dlls/soundent.h

@@ -17,6 +17,9 @@
 // spawns, and handles the world's active and free sound
 // lists.
 //=========================================================
+#pragma once
+#ifndef SOUNDENT_H
+#define SOUNDENT_H
 
 #define	MAX_WORLD_SOUNDS	64 // maximum number of sounds handled by the world at one time.
 
@@ -91,3 +94,4 @@ public:
 private:
 	CSound		m_SoundPool[ MAX_WORLD_SOUNDS ];
 };
+#endif // SOUNDENT_H

dlls/spectator.h

@@ -13,6 +13,9 @@
 *
 ****/
 // Spectator.h
+#pragma once
+#ifndef SPECTATOR_H
+#define SPECTATOR_H
 
 class CBaseSpectator : public CBaseEntity 
 {
@@ -25,3 +28,4 @@ public:
 private:
 	void SpectatorImpulseCommand( void );
 };
+#endif // SPECTATOR_H

dlls/squad.h

@@ -4,10 +4,12 @@
 //
 // $NoKeywords: $
 //=============================================================================
-
 //=========================================================
 // squad.h
 //=========================================================
+#pragma once
+#ifndef SQUAD_H
+#define SQUAD_H
 
 // these are special group roles that are assigned to members when the group is formed.
 // the reason these are explicitly assigned and tasks like throwing grenades to flush out 
@@ -19,3 +21,4 @@
 #define		bits_SQUAD_FLANK_RIGHT		( 1 << 1 )
 #define		bits_SQUAD_ADVANCE		( 1 << 2 )
 #define		bits_SQUAD_FLUSH_ATTACK		( 1 << 3 )
+#endif // SQUAD_H

dlls/squadmonster.h

@@ -16,6 +16,9 @@
 // CSquadMonster - all the extra data for monsters that
 // form squads.
 //=========================================================
+#pragma once
+#ifndef SQUADMONSTER_H
+#define SQUADMONSTER_H
 
 #define	SF_SQUADMONSTER_LEADER	32
 
@@ -116,3 +119,4 @@ public:
 	MONSTERSTATE GetIdealState( void );
 	Schedule_t *GetScheduleOfType( int iType );
 };
+#endif // SQUADMONSTER_H

dlls/talkmonster.h

@@ -12,6 +12,7 @@
 *   use or distribution of this code by or to any unlicensed person is illegal.
 *
 ****/
+#pragma once
 #ifndef TALKMONSTER_H
 #define TALKMONSTER_H
 
@@ -162,8 +163,8 @@ public:
 	int			m_voicePitch;					// pitch of voice for this head
 	const char	*m_szGrp[TLK_CGROUPS];			// sentence group names
 	float		m_useTime;						// Don't allow +USE until this time
-	int			m_iszUse;						// Custom +USE sentence group (follow)
-	int			m_iszUnUse;						// Custom +USE sentence group (stop following)
+	string_t			m_iszUse;						// Custom +USE sentence group (follow)
+	string_t			m_iszUnUse;						// Custom +USE sentence group (stop following)
 
 	float		m_flLastSaidSmelled;// last time we talked about something that stinks
 	float		m_flStopTalkTime;// when in the future that I'll be done saying this sentence.

dlls/teamplay_gamerules.h

@@ -15,6 +15,9 @@
 //
 // teamplay_gamerules.h
 //
+#pragma once
+#ifndef TEAMPLAY_GAMERULES_H
+#define TEAMPLAY_GAMERULES_H
 
 #define MAX_TEAMNAME_LENGTH		16
 #define MAX_TEAMS			32
@@ -55,3 +58,4 @@ private:
 	BOOL m_teamLimit;				// This means the server set only some teams as valid
 	char m_szTeamList[TEAMPLAY_TEAMLISTLENGTH];
 };
+#endif // TEAMPLAY_GAMERULES_H