Do not reorganize variables in classes. Add missing #pragma once directives and more #include guards.

cl_dll/GameStudioModelRenderer.h

@@ -5,11 +5,9 @@
 // $NoKeywords: $
 //=============================================================================
 
+#pragma once
 #if !defined( GAMESTUDIOMODELRENDERER_H )
 #define GAMESTUDIOMODELRENDERER_H
-#if defined( _WIN32 )
-#pragma once
-#endif
 
 /*
 ====================
@@ -23,4 +21,4 @@ public:
 	CGameStudioModelRenderer( void );
 };
 
-#endif // GAMESTUDIOMODELRENDERER_H
+#endif // GAMESTUDIOMODELRENDERER_H

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
 
 /*
 ====================
@@ -52,4 +50,4 @@ private:
 	bool m_bLocal;
 };
 
-#endif // GAMESTUDIOMODELRENDERER_H
+#endif // GAMESTUDIOMODELRENDERER_H

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,7 @@
 //
 // ammohistory.h
 //
+#pragma once
 #ifndef AMMOHISTORY_H
 #define 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,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef HEALTH_H
 #define 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: $
 //=============================================================================
 
+#pragma once
 #ifndef HUD_SPECTATOR_H
 #define HUD_SPECTATOR_H
-#pragma once
 
 #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,7 @@
 //
 //  parsemsg.h
 //
+#pragma once
 #ifndef PARSEMSG_H
 #define 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"
@@ -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
 
@@ -57,4 +57,4 @@ struct beam_s
 	struct particle_s	*particles;
 };
 
-#endif//BEAMDEF_H
+#endif//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
 
@@ -102,4 +102,4 @@ struct cl_entity_s
 	colorVec		cvFloorColor;
 };
 
-#endif//CL_ENTITY_H
+#endif//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
 
@@ -410,4 +410,4 @@ typedef struct
 	mspriteframedesc_t	frames[1];
 } msprite_t;
 
-#endif//COM_MODEL_H
+#endif//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
 
@@ -22,4 +23,4 @@ typedef struct con_nprint_s
 	float	color[3];		// RGB colors ( 0.0 -> 1.0 scale )
 } con_nprint_t;
 
-#endif//CON_NPRINT_H
+#endif//CON_NPRINT_H

common/const.h

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

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
 
@@ -24,4 +24,4 @@ typedef struct demo_api_s
 	void	(*WriteBuffer)( int size, unsigned char *buffer );
 } demo_api_t;
 
-#endif//DEMO_API_H
+#endif//DEMO_API_H

common/dlight.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef DLIGHT_H
 #define DLIGHT_H
 
@@ -28,4 +28,4 @@ typedef struct dlight_s
 	qboolean		dark;	// subtracts light instead of adding
 } dlight_t;
 
-#endif//DLIGHT_H
+#endif//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
 
@@ -183,4 +184,4 @@ typedef struct local_state_s
 	weapon_data_t	weapondata[64];
 } local_state_t;
 
-#endif//ENTITY_STATE_H
+#endif//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
 
@@ -22,4 +22,4 @@
 #define ET_BEAM		3
 #define ET_FRAGMENTED	4	// BMODEL or SPRITE that was split across BSP nodes
 
-#endif//ENTITY_TYPES_H
+#endif//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
 
@@ -51,4 +51,4 @@ typedef struct event_api_s
 	struct msurface_s *( *EV_TraceSurface )( int ground, float *vstart, float *vend );
 } event_api_t;
 
-#endif//EVENT_API_H
+#endif//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
 
@@ -44,4 +45,4 @@ typedef struct event_args_s
 	int		bparam2;
 } event_args_t;
 
-#endif//EVENT_ARGS_H
+#endif//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
 
@@ -42,4 +42,4 @@
 // Only issue event client side ( from shared code )
 #define FEV_CLIENT		(1<<6)
 
-#endif//EVENT_FLAGS_H
+#endif//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
 
@@ -46,4 +46,4 @@ typedef struct
 	int		gamemode;
 } GAMEINFO;
 
-#endif//GAMEINFO_H
+#endif//GAMEINFO_H

common/hltv.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef HLTV_H
 #define HLTV_H
 
@@ -56,4 +56,4 @@
 #define MAX_DIRECTOR_CMD_PARAMETERS	4
 #define MAX_DIRECTOR_CMD_STRING	128
 
-#endif//HLTV_H
+#endif//HLTV_H

common/ivoicetweak.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef IVOICETWEAK_H
 #define IVOICETWEAK_H
 
@@ -37,4 +37,4 @@ typedef struct IVoiceTweak_s
 	int	(*GetSpeakingVolume)( void );
 } IVoiceTweak;
 
-#endif//IVOICETWEAK_H
+#endif//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
 
@@ -26,4 +26,4 @@ typedef struct
 	float		time;		// local time is gurantee what new style begins from the start, not mid or end of the sequence
 } lightstyle_t;
 
-#endif//LIGHTSTYLE_H
+#endif//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
 
@@ -34,4 +34,4 @@ typedef struct netadr_s
 	unsigned short	port;
 } netadr_t;
 
-#endif//NETADR_H
+#endif//NETADR_H

common/particledef.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef PARTICLEDEF_H
 #define PARTICLEDEF_H
 
@@ -51,4 +51,4 @@ typedef struct particle_s
 	unsigned char	context;
 } particle_t;
 
-#endif//PARTICLEDEF_H
+#endif//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
 
@@ -38,4 +38,4 @@ struct pmtrace_s
 	int	hitgroup;
 };
 
-#endif//PM_TRACE_H
+#endif//PM_TRACE_H

common/qfont.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef QFONT_H
 #define QFONT_H
 
@@ -35,4 +35,4 @@ typedef struct qfont_s
 	byte	data[4];
 } qfont_t;
 
-#endif//QFONT_H
+#endif//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
 
@@ -192,4 +192,4 @@ struct efx_api_s
 	void		(*R_FireCustomDecal)( int textureIndex, int entity, int modelIndex, float *position, int flags, float scale );
 };
 
-#endif//R_EFX_H
+#endif//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
 
@@ -151,4 +150,4 @@ typedef struct sv_blending_interface_s
 					const edict_t *pEdict );
 } sv_blending_interface_t;
 
-#endif//R_STUDIOINT_H
+#endif//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
 
@@ -87,4 +87,4 @@ typedef struct ref_overview_s
 	float		flZoom;
 } ref_overview_t;
 
-#endif//REF_PARAMS_H
+#endif//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
 
@@ -258,4 +258,4 @@ typedef struct render_interface_s
 	void		(*Mod_ProcessUserData)( struct model_s *mod, qboolean create, const byte *buffer );
 } render_interface_t;
 
-#endif//RENDER_API_H
+#endif//RENDER_API_H

common/screenfade.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef SCREENFADE_H
 #define SCREENFADE_H
 
@@ -26,4 +26,4 @@ typedef struct screenfade_s
 	int	fadeFlags;			// Fading flags
 } screenfade_t;
 
-#endif//SCREENFADE_H
+#endif//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
 
@@ -24,4 +24,4 @@ typedef struct mstudioevent_s
 	char		options[64];
 } mstudioevent_t;
 
-#endif//STUDIO_EVENT_H
+#endif//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
 
@@ -36,4 +36,4 @@ typedef struct usercmd_s
 	vec3_t		impact_position;
 } usercmd_t;
 
-#endif//USERCMD_H
+#endif//USERCMD_H

common/wadfile.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef WADFILE_H
 #define WADFILE_H
 
@@ -76,4 +76,4 @@ typedef struct mip_s
 	unsigned int	offsets[4];	// four mip maps stored
 } mip_t;
 
-#endif//WADFILE_H
+#endif//WADFILE_H

common/weaponinfo.h

@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-
+#pragma once
 #ifndef WEAPONINFO_H
 #define WEAPONINFO_H
 
@@ -47,4 +47,4 @@ typedef struct weapon_data_s
 	float		fuser4;
 } weapon_data_t;
 
-#endif//WEAPONINFO_H
+#endif//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
 
@@ -21,4 +21,4 @@ typedef struct wrect_s
 	int	left, right, top, bottom;
 } wrect_t;
 
-#endif//WRECT_H
+#endif//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/cbase.h

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

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

@@ -379,10 +379,9 @@ public:
 
 	void BeamUpdateVars( void );
 
+	int	m_active;
 	string_t	m_iszStartEntity;
 	string_t	m_iszEndEntity;
-	string_t	m_iszSpriteName;
-	int	m_active;
 	float	m_life;
 	int	m_boltWidth;
 	int	m_noiseAmplitude;
@@ -390,6 +389,7 @@ public:
 	int	m_speed;
 	float	m_restrike;
 	int	m_spriteTexture;
+	string_t	m_iszSpriteName;
 	int	m_frameStart;
 
 	float	m_radius;

dlls/effects.h

@@ -12,6 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
+#pragma once
 #ifndef EFFECTS_H
 #define 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
 

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
 
@@ -82,9 +83,9 @@ public:
 
 	Materials m_Material;
 	Explosions m_Explosion;
-	string_t m_iszGibModel;
-	string_t m_iszSpawnObject;
 	int m_idShard;
 	float m_angle;
+	string_t m_iszGibModel;
+	string_t m_iszSpawnObject;
 };
 #endif	// FUNC_BREAK_H

dlls/func_tank.cpp

@@ -97,9 +97,6 @@ public:
 
 protected:
 	CBasePlayer* m_pController;
-	string_t	m_iszSpriteSmoke;
-	string_t	m_iszSpriteFlash;
-	string_t	m_iszMaster;	// Master entity (game_team_master or multisource)
 	float		m_flNextAttack;
 	Vector		m_vecControllerUsePos;
 	
@@ -123,11 +120,14 @@ protected:
 
 	Vector		m_barrelPos;	// Length of the freakin barrel
 	float		m_spriteScale;	// Scale of any sprites we shoot
+	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
+	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,6 +15,7 @@
 //=========================================================
 // GameRules
 //=========================================================
+#pragma once
 #ifndef GAMERULES_H
 #define GAMERULES_H
 //#include "weapons.h"

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

@@ -37,8 +37,8 @@ public:
 	static TYPEDESCRIPTION m_SaveData[];
 
 private:
-	string_t m_iszPattern;
 	int m_iStyle;
+	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/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/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

@@ -909,13 +909,13 @@ public:
 private:
 	string_t m_iszSentence;		// string index for idle animation
 	string_t m_iszEntity;	// entity that is wanted for this sentence
-	string_t m_iszListener; // name of entity to look at while talking
 	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;
+	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
 

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,6 +15,7 @@
 //=========================================================
 // skill.h - skill level concerns
 //=========================================================
+#pragma once
 #ifndef SKILL_H
 #define SKILL_H
 
@@ -23,7 +24,7 @@ struct skilldata_t
 	int iSkillLevel; // game skill level
 
 	// Monster Health & Damage
-	float	agruntHealth;
+	float agruntHealth;
 	float agruntDmgPunch;
 
 	float apacheHealth;

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,7 @@
 *
 ****/
 // Spectator.h
+#pragma once
 #ifndef SPECTATOR_H
 #define SPECTATOR_H
 

dlls/squad.h

@@ -7,6 +7,7 @@
 //=========================================================
 // squad.h
 //=========================================================
+#pragma once
 #ifndef SQUAD_H
 #define SQUAD_H
 

dlls/squadmonster.h

@@ -16,6 +16,7 @@
 // CSquadMonster - all the extra data for monsters that
 // form squads.
 //=========================================================
+#pragma once
 #ifndef SQUADMONSTER_H
 #define 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
 

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

dlls/trains.h

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

dlls/triggers.cpp

@@ -267,11 +267,11 @@ public:
 
 	static TYPEDESCRIPTION m_SaveData[];
 
-	string_t m_iTargetName[MAX_MULTI_TARGETS];// list if indexes into global string array
-	float m_flTargetDelay[MAX_MULTI_TARGETS];// delay (in seconds) from time of manager fire to target fire
 	int m_cTargets; // the total number of targets in this manager's fire list.
 	int m_index;	// Current target
 	float m_startTime;// Time we started firing
+	string_t m_iTargetName[MAX_MULTI_TARGETS];// list if indexes into global string array
+	float m_flTargetDelay[MAX_MULTI_TARGETS];// delay (in seconds) from time of manager fire to target fire
 private:
 	inline BOOL IsClone( void ) { return ( pev->spawnflags & SF_MULTIMAN_CLONE ) ? TRUE : FALSE; }
 	inline BOOL ShouldClone( void )
@@ -1321,9 +1321,9 @@ public:
 
 	static TYPEDESCRIPTION m_SaveData[];
 
-	string_t m_changeTarget;
 	char m_szMapName[cchMapNameMost];		// trigger_changelevel only:  next map
 	char m_szLandmarkName[cchMapNameMost];		// trigger_changelevel only:  landmark on next map
+	string_t m_changeTarget;
 	float m_changeTargetDelay;
 };
 

dlls/util.h

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

dlls/vector.h

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

dlls/weapons.h

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