diff --git a/cl_dll/ammo.h b/cl_dll/ammo.h index 465d697cc..cb3287d6b 100644 --- a/cl_dll/ammo.h +++ b/cl_dll/ammo.h @@ -13,8 +13,7 @@ * ****/ -#ifndef __AMMO_H__ -#define __AMMO_H__ +#pragma once #define MAX_WEAPON_NAME 128 @@ -57,6 +56,3 @@ struct WEAPON }; typedef int AMMO; - - -#endif \ No newline at end of file diff --git a/cl_dll/camera.h b/cl_dll/camera.h index 13b97e2c1..8933de0e8 100644 --- a/cl_dll/camera.h +++ b/cl_dll/camera.h @@ -8,8 +8,7 @@ // Camera.h -- defines and such for a 3rd person camera // NOTE: must include quakedef.h first -#ifndef _CAMERA_H_ -#define _CAMERA_H_ +#pragma once // pitch, yaw, dist extern Vector cam_ofs; @@ -20,5 +19,3 @@ void CAM_Init(); void CAM_ClearStates(); void CAM_StartMouseMove(); void CAM_EndMouseMove(); - -#endif // _CAMERA_H_ diff --git a/cl_dll/cdll_int.cpp b/cl_dll/cdll_int.cpp index 9566d142e..1c1d8ae88 100644 --- a/cl_dll/cdll_int.cpp +++ b/cl_dll/cdll_int.cpp @@ -21,7 +21,6 @@ #include "hud.h" #include "cl_util.h" #include "netadr.h" -#undef INTERFACE_H #include "../public/interface.h" //#include "vgui_schememanager.h" diff --git a/cl_dll/global_consts.h b/cl_dll/global_consts.h index 96be61e79..e07b0d402 100644 --- a/cl_dll/global_consts.h +++ b/cl_dll/global_consts.h @@ -4,13 +4,8 @@ // // $NoKeywords: $ //============================================================================= -#ifndef GLOBALCONSTS_H -#define GLOBALCONSTS_H -#ifdef _WIN32 -#pragma once -#endif - +#pragma once enum { @@ -26,5 +21,3 @@ enum #define MAX_SERVERNAME_LENGTH 64 #define MAX_TEAMNAME_SIZE 32 - -#endif // GLOBALCONSTS_H \ No newline at end of file diff --git a/cl_dll/hud_spectator.h b/cl_dll/hud_spectator.h index e06aaee9f..6f2946fee 100644 --- a/cl_dll/hud_spectator.h +++ b/cl_dll/hud_spectator.h @@ -5,8 +5,6 @@ // $NoKeywords: $ //============================================================================= -#ifndef SPECTATOR_H -#define SPECTATOR_H #pragma once #include "cl_entity.h" @@ -152,5 +150,3 @@ class CHudSpectator : public CHudBase cameraWayPoint_t m_CamPath[MAX_CAM_WAYPOINTS]; }; - -#endif // SPECTATOR_H diff --git a/cl_dll/interpolation.h b/cl_dll/interpolation.h index 5f474dae3..e99a096b7 100644 --- a/cl_dll/interpolation.h +++ b/cl_dll/interpolation.h @@ -13,12 +13,7 @@ ** ******************************************************************************/ -#ifndef INTERPOLATION_H -#define INTERPOLATION_H -#ifdef _WIN32 #pragma once -#endif - // interpolation class class CInterpolation @@ -52,5 +47,3 @@ class CInterpolation bool m_SmoothStart; bool m_SmoothEnd; }; - -#endif // INTERPOLATION_H \ No newline at end of file diff --git a/cl_dll/tri.h b/cl_dll/tri.h index 3977cd1e4..796bf1464 100644 --- a/cl_dll/tri.h +++ b/cl_dll/tri.h @@ -1,13 +1,5 @@ -#ifndef TRI_H -#define TRI_H +#pragma once #include "particleman.h" extern IParticleMan *g_pParticleMan; - - - - - - -#endif //TRI_H \ No newline at end of file diff --git a/cl_dll/vgui_ScorePanel.h b/cl_dll/vgui_ScorePanel.h index 5d776a9f4..194e6dea0 100644 --- a/cl_dll/vgui_ScorePanel.h +++ b/cl_dll/vgui_ScorePanel.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef SCOREPANEL_H -#define SCOREPANEL_H +#pragma once #include #include @@ -306,5 +305,3 @@ class ScorePanel : public Panel, public vgui::CDefaultInputSignal friend class CLabelHeader; }; - -#endif diff --git a/cl_dll/vgui_SpectatorPanel.h b/cl_dll/vgui_SpectatorPanel.h index 53518571f..7c8808146 100644 --- a/cl_dll/vgui_SpectatorPanel.h +++ b/cl_dll/vgui_SpectatorPanel.h @@ -2,8 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#ifndef SPECTATORPANEL_H -#define SPECTATORPANEL_H +#pragma once #include #include @@ -107,6 +106,3 @@ class CSpectatorHandler_Command : public ActionSignal m_pFather->ActionSignal(m_cmd); } }; - - -#endif // !defined SPECTATORPANEL_H diff --git a/cl_dll/vgui_TeamFortressViewport.h b/cl_dll/vgui_TeamFortressViewport.h index a11aec110..44c9c23f9 100644 --- a/cl_dll/vgui_TeamFortressViewport.h +++ b/cl_dll/vgui_TeamFortressViewport.h @@ -1,6 +1,5 @@ -#ifndef TEAMFORTRESSVIEWPORT_H -#define TEAMFORTRESSVIEWPORT_H +#pragma once #include #include @@ -1807,5 +1806,3 @@ class CHealthPanel : public DragNDropPanel FillRGBA(x, iYPos + 5, HealthWidth / 10, gHUD.m_iFontHeight, 255, 160, 0, a); } }; - -#endif diff --git a/cl_dll/vgui_int.h b/cl_dll/vgui_int.h index 598744226..56cde267d 100644 --- a/cl_dll/vgui_int.h +++ b/cl_dll/vgui_int.h @@ -5,14 +5,10 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_INT_H -#define VGUI_INT_H +#pragma once void VGui_Startup(); void VGui_Shutdown(); //Only safe to call from inside subclass of Panel::paintBackground void VGui_ViewportPaintBackground(int extents[4]); - - -#endif \ No newline at end of file diff --git a/cl_dll/voice_status.h b/cl_dll/voice_status.h index 8edf58c71..f3164c141 100644 --- a/cl_dll/voice_status.h +++ b/cl_dll/voice_status.h @@ -5,11 +5,8 @@ // $NoKeywords: $ //============================================================================= -#ifndef VOICE_STATUS_H -#define VOICE_STATUS_H #pragma once - #include "VGUI_Label.h" #include "VGUI_LineBorder.h" #include "VGUI_ImagePanel.h" @@ -223,6 +220,3 @@ class CVoiceStatus : public CHudBase, public vgui::CDefaultInputSignal // Get the (global) voice manager. CVoiceStatus* GetClientVoiceMgr(); - - -#endif // VOICE_STATUS_H diff --git a/common/Platform.h b/common/Platform.h index 049f94a6c..13a2bb2fa 100644 --- a/common/Platform.h +++ b/common/Platform.h @@ -13,8 +13,7 @@ * ****/ -#ifndef PLATFORM_H -#define PLATFORM_H +#pragma once /** * @file @@ -136,5 +135,3 @@ typedef int BOOL; #define V_max(a,b) (((a) > (b)) ? (a) : (b)) #define clamp( val, min, max ) ( ((val) > (max)) ? (max) : ( ((val) < (min)) ? (min) : (val) ) ) - -#endif //PLATFORM_H diff --git a/common/Sequence.h b/common/Sequence.h index 8df553dfe..9a99b9bb0 100644 --- a/common/Sequence.h +++ b/common/Sequence.h @@ -3,8 +3,8 @@ // S c r i p t e d S e q u e n c e s // //--------------------------------------------------------------------------- -#ifndef _INCLUDE_SEQUENCE_H_ -#define _INCLUDE_SEQUENCE_H_ + +#pragma once #ifndef _DEF_BYTE_ @@ -197,5 +197,3 @@ sequenceEntry_s* SequenceGet( const char* fileName, const char* entryName ); void Sequence_ParseFile( const char* fileName, qboolean isGlobal ); void Sequence_OnLevelLoad( const char* mapName ); sentenceEntry_s* SequencePickSentence( const char *groupName, int pickMethod, int *picked ); - -#endif // _INCLUDE_SEQUENCE_H_ diff --git a/common/const.h b/common/const.h index caa247987..88e377c94 100644 --- a/common/const.h +++ b/common/const.h @@ -12,8 +12,9 @@ * without written permission from Valve LLC. * ****/ -#ifndef CONST_H -#define CONST_H + +#pragma once + // // Constants shared by the engine and dlls // This header file included by engine files and DLL files. @@ -761,6 +762,3 @@ typedef struct edict_t *ent; // entity the surface is on int hitgroup; // 0 == generic, non zero is specific body part } trace_t; - -#endif - diff --git a/common/crc.h b/common/crc.h index 2c00544a1..c9a0a65f5 100644 --- a/common/crc.h +++ b/common/crc.h @@ -13,11 +13,8 @@ * ****/ /* crc.h */ -#ifndef CRC_H -#define CRC_H -#ifdef _WIN32 + #pragma once -#endif #include "archtypes.h" // DAL @@ -55,5 +52,3 @@ char *MD5_Print(unsigned char hash[16]); int MD5_Hash_CachedFile(unsigned char digest[16], unsigned char *pCache, int nFileSize, int bSeed, unsigned int seed[4]); int CRC_MapFile(CRC32_t *crcvalue, char *pszFileName); - -#endif diff --git a/common/cvardef.h b/common/cvardef.h index 204eb1d79..94cd181e9 100644 --- a/common/cvardef.h +++ b/common/cvardef.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef CVARDEF_H -#define CVARDEF_H + +#pragma once #define FCVAR_ARCHIVE (1<<0) // set to cause it to be saved to vars.rc #define FCVAR_USERINFO (1<<1) // changes the client's info string @@ -37,4 +37,3 @@ typedef struct cvar_s float value; struct cvar_s *next; } cvar_t; -#endif diff --git a/common/enums.h b/common/enums.h index 159019166..52465eca8 100644 --- a/common/enums.h +++ b/common/enums.h @@ -13,8 +13,7 @@ * ****/ -#ifndef ENUMS_H -#define ENUMS_H +#pragma once typedef enum netsrc_s { @@ -22,6 +21,3 @@ typedef enum netsrc_s NS_SERVER, NS_MULTICAST // xxxMO } netsrc_t; - -#endif - diff --git a/common/hltv.h b/common/hltv.h index ab7184c69..8a12a49d3 100644 --- a/common/hltv.h +++ b/common/hltv.h @@ -1,8 +1,7 @@ // hltv.h // all shared consts between server, clients and proxy -#ifndef HLTV_H -#define HLTV_H +#pragma once #define TYPE_CLIENT 0 // client is a normal HL client (default) #define TYPE_PROXY 1 // client is another proxy @@ -50,5 +49,3 @@ #define DRC_FLAG_STARTPATH 1 // end with speed 0.0 #define DRC_FLAG_SLOWSTART 2 // start with speed 0.0 #define DRC_FLAG_SLOWEND 4 // end with speed 0.0 - -#endif // HLTV_H diff --git a/common/in_buttons.h b/common/in_buttons.h index 4196a2d65..e225e4a5c 100644 --- a/common/in_buttons.h +++ b/common/in_buttons.h @@ -12,11 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef IN_BUTTONS_H -#define IN_BUTTONS_H -#ifdef _WIN32 + #pragma once -#endif #define IN_ATTACK (1 << 0) #define IN_JUMP (1 << 1) @@ -34,5 +31,3 @@ #define IN_RELOAD (1 << 13) #define IN_ALT1 (1 << 14) #define IN_SCORE (1 << 15) // Used by client.dll for when scoreboard is held down - -#endif // IN_BUTTONS_H diff --git a/common/interface.h b/common/interface.h index 0ff9877d4..82593d23a 100644 --- a/common/interface.h +++ b/common/interface.h @@ -20,8 +20,7 @@ // for legacy code). In this case, you need to make a new version name for your new interface, and make a wrapper interface and // expose it for the old interface. -#ifndef INTERFACE_H -#define INTERFACE_H +#pragma once // All interfaces derive from this. class IBaseInterface @@ -118,8 +117,3 @@ extern void Sys_FreeModule(HINTERFACEMODULE hModule); // Use these to get the factory function from either a loaded module or the current module. extern CreateInterfaceFn Sys_GetFactory( HINTERFACEMODULE hModule ); extern CreateInterfaceFn Sys_GetFactoryThis( void ); - -#endif - - - diff --git a/common/ivoicetweak.h b/common/ivoicetweak.h index d5e6b3eef..ebf4b86ed 100644 --- a/common/ivoicetweak.h +++ b/common/ivoicetweak.h @@ -5,11 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef IVOICETWEAK_H -#define IVOICETWEAK_H -#ifdef _WIN32 #pragma once -#endif // These provide access to the voice controls. typedef enum @@ -33,6 +29,3 @@ typedef struct IVoiceTweak_s int (*GetSpeakingVolume)(); } IVoiceTweak; - - -#endif // IVOICETWEAK_H diff --git a/common/netadr.h b/common/netadr.h index 304073cf5..c8911028c 100644 --- a/common/netadr.h +++ b/common/netadr.h @@ -13,11 +13,8 @@ * ****/ // netadr.h -#ifndef NETADR_H -#define NETADR_H -#ifdef _WIN32 + #pragma once -#endif typedef enum { @@ -36,5 +33,3 @@ typedef struct netadr_s unsigned char ipx[10]; unsigned short port; } netadr_t; - -#endif // NETADR_H diff --git a/common/parsemsg.h b/common/parsemsg.h index be4f5ed14..e0954af78 100644 --- a/common/parsemsg.h +++ b/common/parsemsg.h @@ -18,8 +18,7 @@ // in this dll. (and C++ifying it) // -#ifndef PARSEMSG_H -#define PARSEMSG_H +#pragma once #define ASSERT( x ) //-------------------------------------------------------------------------------------------------------------- @@ -59,8 +58,3 @@ class BufferWriter }; //-------------------------------------------------------------------------------------------------------------- - -#endif // PARSEMSG_H - - - diff --git a/common/usercmd.h b/common/usercmd.h index ad22ad94b..89bfc686c 100644 --- a/common/usercmd.h +++ b/common/usercmd.h @@ -12,11 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef USERCMD_H -#define USERCMD_H -#ifdef _WIN32 + #pragma once -#endif typedef struct usercmd_s { @@ -37,5 +34,3 @@ typedef struct usercmd_s int impact_index; Vector impact_position; } usercmd_t; - -#endif // USERCMD_H diff --git a/dlls/activity.h b/dlls/activity.h index fffbd4cda..5a663f2a1 100644 --- a/dlls/activity.h +++ b/dlls/activity.h @@ -13,9 +13,7 @@ * ****/ -#ifndef ACTIVITY_H -#define ACTIVITY_H - +#pragma once typedef enum { ACT_RESET = 0, // Set m_Activity to this invalid value to force a reset to m_IdealActivity @@ -104,6 +102,3 @@ typedef struct { } activity_map_t; extern activity_map_t activity_map[]; - - -#endif //ACTIVITY_H diff --git a/dlls/animation.h b/dlls/animation.h index 28bc76dc1..e9a28c83d 100644 --- a/dlls/animation.h +++ b/dlls/animation.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef ANIMATION_H -#define ANIMATION_H + +#pragma once #define ACTIVITY_NOT_AVAILABLE -1 @@ -40,6 +40,3 @@ int ExtractBbox( void *pmodel, int sequence, float *mins, float *maxs ); // From /engine/studio.h #define STUDIO_LOOPING 0x0001 - - -#endif //ANIMATION_H diff --git a/dlls/basemonster.h b/dlls/basemonster.h index 0a7f910f3..f7c846b3f 100644 --- a/dlls/basemonster.h +++ b/dlls/basemonster.h @@ -13,8 +13,7 @@ * ****/ -#ifndef BASEMONSTER_H -#define BASEMONSTER_H +#pragma once // // generic Monster @@ -335,7 +334,3 @@ class CBaseMonster : public CBaseToggle CBaseEntity* DropItem ( const char *pszItemName, const Vector &vecPos, const Vector &vecAng );// drop an item. }; - - - -#endif // BASEMONSTER_H diff --git a/dlls/cdll_dll.h b/dlls/cdll_dll.h index 71b64bbc2..692a63500 100644 --- a/dlls/cdll_dll.h +++ b/dlls/cdll_dll.h @@ -17,8 +17,7 @@ // this file is included by both the game-dll and the client-dll, -#ifndef CDLL_DLL_H -#define CDLL_DLL_H +#pragma once #define MAX_WEAPONS 32 // ??? @@ -153,5 +152,3 @@ constexpr Vector VEC_DUCK_HULL_MAX(16, 16, 18); constexpr Vector VEC_DUCK_VIEW(0, 0, 12); constexpr Vector VEC_DEAD_VIEW(0, 0, -8); - -#endif diff --git a/dlls/client.h b/dlls/client.h index 9792b27e7..c924ae771 100644 --- a/dlls/client.h +++ b/dlls/client.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef CLIENT_H -#define CLIENT_H + +#pragma once extern void respawn( entvars_t* pev, BOOL fCopyCorpse ); extern BOOL ClientConnect( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ); @@ -61,5 +61,3 @@ extern void CreateInstancedBaselines (); extern int InconsistentFile( const edict_t *player, const char *filename, char *disconnect_message ); extern int AllowLagCompensation(); - -#endif // CLIENT_H diff --git a/dlls/decals.h b/dlls/decals.h index c8c2b72c2..e1ae89ad1 100644 --- a/dlls/decals.h +++ b/dlls/decals.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef DECALS_H -#define DECALS_H + +#pragma once // // Dynamic Decals @@ -71,5 +71,3 @@ typedef struct } DLL_DECALLIST; extern DLL_DECALLIST gDecals[]; - -#endif // DECALS_H diff --git a/dlls/defaultai.h b/dlls/defaultai.h index 32657ab38..c0ced6ed3 100644 --- a/dlls/defaultai.h +++ b/dlls/defaultai.h @@ -12,8 +12,8 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#ifndef DEFAULTAI_H -#define DEFAULTAI_H + +#pragma once //========================================================= // Failed @@ -94,5 +94,3 @@ extern Schedule_t slError[]; extern Schedule_t slWalkToScript[]; extern Schedule_t slRunToScript[]; extern Schedule_t slWaitScript[]; - -#endif // DEFAULTAI_H diff --git a/dlls/doors.h b/dlls/doors.h index c9752c17a..fc3cdb394 100644 --- a/dlls/doors.h +++ b/dlls/doors.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef DOORS_H -#define DOORS_H + +#pragma once // doors #define SF_DOOR_ROTATE_Y 0 @@ -27,7 +27,3 @@ #define SF_DOOR_USE_ONLY 256 // door must be opened by player's use button. #define SF_DOOR_NOMONSTERS 512 // Monster can't open #define SF_DOOR_SILENT 0x80000000 - - - -#endif //DOORS_H diff --git a/dlls/effects.h b/dlls/effects.h index a6acbe621..a7187d43c 100644 --- a/dlls/effects.h +++ b/dlls/effects.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef EFFECTS_H -#define EFFECTS_H + +#pragma once #define SF_BEAM_STARTON 0x0001 #define SF_BEAM_TOGGLE 0x0002 @@ -205,5 +205,3 @@ class CLaser : public CBeam int m_iszSpriteName; Vector m_firePosition; }; - -#endif //EFFECTS_H diff --git a/dlls/enginecallback.h b/dlls/enginecallback.h index 842fe34c2..ae65e2aaf 100644 --- a/dlls/enginecallback.h +++ b/dlls/enginecallback.h @@ -12,8 +12,7 @@ * without written permission from Valve LLC. * ****/ -#ifndef ENGINECALLBACK_H -#define ENGINECALLBACK_H + #pragma once #include "event_flags.h" @@ -154,5 +153,3 @@ inline void *GET_PRIVATE( edict_t *pent ) #define ENGINE_FORCE_UNMODIFIED ( *g_engfuncs.pfnForceUnmodified ) #define PLAYER_CNX_STATS ( *g_engfuncs.pfnGetPlayerStats ) - -#endif //ENGINECALLBACK_H diff --git a/dlls/explode.h b/dlls/explode.h index f179a13f4..52c283be9 100644 --- a/dlls/explode.h +++ b/dlls/explode.h @@ -12,9 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef EXPLODE_H -#define EXPLODE_H +#pragma once #define SF_ENVEXPLOSION_NODAMAGE ( 1 << 0 ) // when set, ENV_EXPLOSION will not actually inflict damage #define SF_ENVEXPLOSION_REPEATABLE ( 1 << 1 ) // can this entity be refired? @@ -28,5 +27,3 @@ extern DLL_GLOBAL short g_sModelIndexSmoke; extern void ExplosionCreate( const Vector ¢er, const Vector &angles, edict_t *pOwner, int magnitude, BOOL doDamage ); - -#endif //EXPLODE_H diff --git a/dlls/extdll.h b/dlls/extdll.h index 1c7dd967d..e986b2604 100644 --- a/dlls/extdll.h +++ b/dlls/extdll.h @@ -12,9 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef EXTDLL_H -#define EXTDLL_H +#pragma once // // Global header file for extension DLLs @@ -39,5 +38,3 @@ typedef unsigned int string_t; // from engine's pr_comp.h; // Shared header between the client DLL and the game DLLs #include "cdll_dll.h" - -#endif //EXTDLL_H diff --git a/dlls/flyingmonster.h b/dlls/flyingmonster.h index cb8faa711..c4fc82772 100644 --- a/dlls/flyingmonster.h +++ b/dlls/flyingmonster.h @@ -14,8 +14,7 @@ ****/ // Base class for flying monsters. This overrides the movement test & execution code from CBaseMonster -#ifndef FLYINGMONSTER_H -#define FLYINGMONSTER_H +#pragma once class CFlyingMonster : public CBaseMonster { @@ -48,7 +47,3 @@ class CFlyingMonster : public CBaseMonster const char *m_pFlapSound; float m_flLastZYawTime; }; - - -#endif //FLYINGMONSTER_H - diff --git a/dlls/func_break.h b/dlls/func_break.h index 7b51601e2..d7cd11520 100644 --- a/dlls/func_break.h +++ b/dlls/func_break.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef FUNC_BREAK_H -#define FUNC_BREAK_H + +#pragma once typedef enum { expRandom, expDirected} Explosions; typedef enum { matGlass = 0, matWood, matMetal, matFlesh, matCinderBlock, matCeilingTile, matComputer, matUnbreakableGlass, matRocks, matNone, matLastMaterial } Materials; @@ -70,5 +70,3 @@ class CBreakable : public CBaseDelay int m_iszGibModel; int m_iszSpawnObject; }; - -#endif // FUNC_BREAK_H diff --git a/dlls/game.h b/dlls/game.h index 5455a73ec..a67d3f74d 100644 --- a/dlls/game.h +++ b/dlls/game.h @@ -13,8 +13,7 @@ * ****/ -#ifndef GAME_H -#define GAME_H +#pragma once extern void GameDLLInit( void ); @@ -42,5 +41,3 @@ extern cvar_t *g_psv_gravity; extern cvar_t *g_psv_aim; extern cvar_t *g_footsteps; extern cvar_t* g_psv_cheats; - -#endif // GAME_H diff --git a/dlls/items.h b/dlls/items.h index 1cde93edf..162e731a0 100644 --- a/dlls/items.h +++ b/dlls/items.h @@ -12,9 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef ITEMS_H -#define ITEMS_H +#pragma once class CItem : public CBaseEntity { @@ -25,5 +24,3 @@ class CItem : public CBaseEntity void EXPORT Materialize(); virtual BOOL MyTouch( CBasePlayer *pPlayer ) { return FALSE; } }; - -#endif // ITEMS_H diff --git a/dlls/maprules.h b/dlls/maprules.h index 6ce8dfdad..671cc5d69 100644 --- a/dlls/maprules.h +++ b/dlls/maprules.h @@ -13,10 +13,4 @@ * ****/ -#ifndef MAPRULES_H -#define MAPRULES_H - - - -#endif // MAPRULES_H - +#pragma once diff --git a/dlls/monsterevent.h b/dlls/monsterevent.h index 0193b6940..fc6afc8fa 100644 --- a/dlls/monsterevent.h +++ b/dlls/monsterevent.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef MONSTEREVENT_H -#define MONSTEREVENT_H + +#pragma once typedef struct { @@ -30,5 +30,3 @@ typedef struct #define MONSTER_EVENT_BODYDROP_HEAVY 2002 #define MONSTER_EVENT_SWISHSOUND 2010 - -#endif // MONSTEREVENT_H diff --git a/dlls/monsters.h b/dlls/monsters.h index bc93eb164..f3460ca3a 100644 --- a/dlls/monsters.h +++ b/dlls/monsters.h @@ -12,9 +12,10 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#ifndef MONSTERS_H + +#pragma once + #include "skill.h" -#define MONSTERS_H /* @@ -177,7 +178,3 @@ class CGib : public CBaseEntity return baseClass::ScheduleFromName(pName);\ return pSchedule;\ } - - - -#endif //MONSTERS_H diff --git a/dlls/plane.h b/dlls/plane.h index e40691afe..b30deab20 100644 --- a/dlls/plane.h +++ b/dlls/plane.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef PLANE_H -#define PLANE_H + +#pragma once //========================================================= // Plane @@ -39,5 +39,3 @@ class CPlane float m_flDist; BOOL m_fInitialized; }; - -#endif // PLANE_H diff --git a/dlls/player.h b/dlls/player.h index b0f073c3a..b74708837 100644 --- a/dlls/player.h +++ b/dlls/player.h @@ -12,9 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef PLAYER_H -#define PLAYER_H +#pragma once #include "pm_materials.h" @@ -339,5 +338,3 @@ class CBasePlayer : public CBaseMonster extern BOOL gInitHUD; - -#endif // PLAYER_H diff --git a/dlls/saverestore.h b/dlls/saverestore.h index 44e78be8e..799242136 100644 --- a/dlls/saverestore.h +++ b/dlls/saverestore.h @@ -13,8 +13,8 @@ * ****/ // Implementation in UTIL.CPP -#ifndef SAVERESTORE_H -#define SAVERESTORE_H + +#pragma once class CBaseEntity; @@ -165,5 +165,3 @@ class CGlobalState }; extern CGlobalState gGlobalState; - -#endif //SAVERESTORE_H diff --git a/dlls/schedule.h b/dlls/schedule.h index 0c094412a..c64d09416 100644 --- a/dlls/schedule.h +++ b/dlls/schedule.h @@ -16,8 +16,7 @@ // Scheduling //========================================================= -#ifndef SCHEDULE_H -#define SCHEDULE_H +#pragma once #define TASKSTATUS_NEW 0 // Just started #define TASKSTATUS_RUNNING 1 // Running task & movement @@ -286,5 +285,3 @@ struct WayPoint_t #define bits_COND_ALL_SPECIAL (bits_COND_SPECIAL1 | bits_COND_SPECIAL2) #define bits_COND_CAN_ATTACK (bits_COND_CAN_RANGE_ATTACK1 | bits_COND_CAN_MELEE_ATTACK1 | bits_COND_CAN_RANGE_ATTACK2 | bits_COND_CAN_MELEE_ATTACK2) - -#endif // SCHEDULE_H diff --git a/dlls/scripted.h b/dlls/scripted.h index 4a715d16d..30ba84d48 100644 --- a/dlls/scripted.h +++ b/dlls/scripted.h @@ -12,8 +12,8 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#ifndef SCRIPTED_H -#define SCRIPTED_H + +#pragma once #include "scriptevent.h" @@ -100,6 +100,3 @@ class CCineAI : public CCineMonster BOOL FCanOverrideState () override; void FixScriptMonsterSchedule( CBaseMonster *pMonster ) override; }; - - -#endif //SCRIPTED_H diff --git a/dlls/scriptevent.h b/dlls/scriptevent.h index 73bd28a48..1a6a0f8d2 100644 --- a/dlls/scriptevent.h +++ b/dlls/scriptevent.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef SCRIPTEVENT_H -#define SCRIPTEVENT_H + +#pragma once #define SCRIPT_EVENT_DEAD 1000 // character is now dead #define SCRIPT_EVENT_NOINTERRUPT 1001 // does not allow interrupt @@ -26,4 +26,3 @@ #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 diff --git a/dlls/talkmonster.h b/dlls/talkmonster.h index 39031520c..51495ac85 100644 --- a/dlls/talkmonster.h +++ b/dlls/talkmonster.h @@ -12,8 +12,8 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#ifndef TALKMONSTER_H -#define TALKMONSTER_H + +#pragma once #include "monsters.h" @@ -176,6 +176,3 @@ class CTalkMonster : public CBaseMonster #define bits_COND_CLIENT_PUSH ( bits_COND_SPECIAL1 ) // Don't see a client right now. #define bits_COND_CLIENT_UNSEEN ( bits_COND_SPECIAL2 ) - - -#endif //TALKMONSTER_H diff --git a/dlls/trains.h b/dlls/trains.h index 843cecd74..e64428fae 100644 --- a/dlls/trains.h +++ b/dlls/trains.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef TRAINS_H -#define TRAINS_H + +#pragma once // Tracktrain spawn flags #define SF_TRACKTRAIN_NOPITCH 0x0001 @@ -123,5 +123,3 @@ class CFuncTrackTrain : public CBaseEntity private: unsigned short m_usAdjustPitch; }; - -#endif diff --git a/dlls/vector.h b/dlls/vector.h index ea0c9c3a1..27d9f5c86 100644 --- a/dlls/vector.h +++ b/dlls/vector.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef VECTOR_H -#define VECTOR_H + +#pragma once //========================================================= // 2DVector - used for many pathfinding and many other @@ -129,7 +129,3 @@ class Vector // same data-layout as engine's vec3_t, inline Vector operator*(float fl, const Vector& v) { return v * fl; } inline float DotProduct(const Vector& a, const Vector& b) { return(a.x*b.x+a.y*b.y+a.z*b.z); } 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 ); } - - - -#endif diff --git a/dlls/weapons.h b/dlls/weapons.h index f31172760..2ca48dbd0 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef WEAPONS_H -#define WEAPONS_H + +#pragma once #include "effects.h" @@ -1213,6 +1213,3 @@ class CSqueak : public CBasePlayerWeapon private: unsigned short m_usSnarkFire; }; - - -#endif // WEAPONS_H diff --git a/engine/APIProxy.h b/engine/APIProxy.h index e1a41ca2b..7661c034f 100644 --- a/engine/APIProxy.h +++ b/engine/APIProxy.h @@ -1,5 +1,4 @@ -#ifndef __APIPROXY__ -#define __APIPROXY__ +#pragma once #include "archtypes.h" // DAL #include "netadr.h" @@ -401,5 +400,3 @@ typedef struct cl_enginefuncs_s pfnEngSrc_pfnVguiWrap2_GetMouseDelta_t pfnVguiWrap2_GetMouseDelta; pfnEngSrc_pfnFilteredClientCmd_t pfnFilteredClientCmd; } cl_enginefunc_t; - -#endif // __APIPROXY__ diff --git a/engine/cdll_int.h b/engine/cdll_int.h index 14e3385e2..3d6151470 100644 --- a/engine/cdll_int.h +++ b/engine/cdll_int.h @@ -19,8 +19,7 @@ // JOHN: client dll interface declarations // -#ifndef CDLL_INT_H -#define CDLL_INT_H +#pragma once #include "const.h" #include "steam/steamtypes.h" @@ -93,6 +92,3 @@ typedef struct hud_player_info_s //#include "server.h" // server_static_t define for apiproxy #include "APIProxy.h" - -#endif // CDLL_INT_H - \ No newline at end of file diff --git a/engine/custom.h b/engine/custom.h index a9f963cda..54166e60f 100644 --- a/engine/custom.h +++ b/engine/custom.h @@ -14,11 +14,7 @@ ****/ // Customization.h -#ifndef CUSTOM_H -#define CUSTOM_H -#ifdef _WIN32 #pragma once -#endif #include "const.h" @@ -99,5 +95,3 @@ void COM_ClearCustomizationList( struct customization_s *pHead, qboolean bClean qboolean COM_CreateCustomization( struct customization_s *pListHead, struct resource_s *pResource, int playernumber, int flags, struct customization_s **pCustomization, int *nLumps ); int COM_SizeofResourceList ( struct resource_s *pList, struct resourceinfo_s *ri ); - -#endif // CUSTOM_H diff --git a/engine/customentity.h b/engine/customentity.h index 0895bee6c..61712130c 100644 --- a/engine/customentity.h +++ b/engine/customentity.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef CUSTOMENTITY_H -#define CUSTOMENTITY_H + +#pragma once // Custom Entities @@ -34,5 +34,3 @@ enum #define BEAM_FSOLID 0x20 #define BEAM_FSHADEIN 0x40 #define BEAM_FSHADEOUT 0x80 - -#endif //CUSTOMENTITY_H diff --git a/engine/eiface.h b/engine/eiface.h index b81a9bcaf..be0e0ae72 100644 --- a/engine/eiface.h +++ b/engine/eiface.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef EIFACE_H -#define EIFACE_H + +#pragma once #include "archtypes.h" // DAL @@ -523,5 +523,3 @@ extern NEW_DLL_FUNCTIONS gNewDLLFunctions; typedef int (*APIFUNCTION)( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion ); typedef int (*APIFUNCTION2)( DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion ); - -#endif //EIFACE_H diff --git a/engine/progdefs.h b/engine/progdefs.h index 775329be7..13ec0638f 100644 --- a/engine/progdefs.h +++ b/engine/progdefs.h @@ -12,11 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef PROGDEFS_H -#define PROGDEFS_H -#ifdef _WIN32 + #pragma once -#endif typedef struct { @@ -219,6 +216,3 @@ typedef struct entvars_s edict_t *euser3; edict_t *euser4; } entvars_t; - - -#endif // PROGDEFS_H diff --git a/engine/progs.h b/engine/progs.h index fe4796e65..a844f2184 100644 --- a/engine/progs.h +++ b/engine/progs.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef PROGS_H -#define PROGS_H + +#pragma once #include "progdefs.h" @@ -78,5 +78,3 @@ edict_t *EDICT_NUM(int n); int NUM_FOR_EDICT(const edict_t *e); #define PROG_TO_EDICT(e) ((edict_t *)((byte *)sv.edicts + e)) - -#endif // PROGS_H diff --git a/engine/shake.h b/engine/shake.h index 9844284c1..31d6ca7f4 100644 --- a/engine/shake.h +++ b/engine/shake.h @@ -12,8 +12,8 @@ * without written permission from Valve LLC. * ****/ -#ifndef SHAKE_H -#define SHAKE_H + +#pragma once // Screen / View effects @@ -49,6 +49,3 @@ typedef struct short fadeFlags; // flags byte r, g, b, a; // fade to color ( max alpha ) } ScreenFade; - -#endif // SHAKE_H - diff --git a/engine/studio.h b/engine/studio.h index 9bad4ba23..5554020b4 100644 --- a/engine/studio.h +++ b/engine/studio.h @@ -13,11 +13,7 @@ * ****/ - - - -#ifndef _STUDIO_H_ -#define _STUDIO_H_ +#pragma once /* ============================================================================== @@ -364,5 +360,3 @@ typedef struct #define RAD_TO_STUDIO (32768.0/M_PI) #define STUDIO_TO_RAD (M_PI/32768.0) - -#endif diff --git a/game_shared/bitvec.h b/game_shared/bitvec.h index 09fdece68..98624e149 100644 --- a/game_shared/bitvec.h +++ b/game_shared/bitvec.h @@ -5,12 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef BITVEC_H -#define BITVEC_H -#ifdef _WIN32 #pragma once -#endif - #include "archtypes.h" // DAL #include @@ -175,7 +170,3 @@ inline void CBitVec::SetDWord(int i, uint32 val) assert(i >= 0 && i < NUM_DWORDS); m_DWords[i] = val; } - - -#endif // BITVEC_H - diff --git a/game_shared/vgui_checkbutton2.h b/game_shared/vgui_checkbutton2.h index 1a2702e65..1ece11ca4 100644 --- a/game_shared/vgui_checkbutton2.h +++ b/game_shared/vgui_checkbutton2.h @@ -5,18 +5,12 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_CHECKBUTTON2_H -#define VGUI_CHECKBUTTON2_H -#ifdef _WIN32 #pragma once -#endif - #include "VGUI_Label.h" #include "VGUI_ImagePanel.h" #include "vgui_defaultinputsignal.h" - namespace vgui { @@ -96,6 +90,3 @@ class CCheckButton2 : public Panel, public CDefaultInputSignal } - - -#endif // VGUI_CHECKBUTTON2_H diff --git a/game_shared/vgui_defaultinputsignal.h b/game_shared/vgui_defaultinputsignal.h index e933060eb..d7a50261d 100644 --- a/game_shared/vgui_defaultinputsignal.h +++ b/game_shared/vgui_defaultinputsignal.h @@ -5,16 +5,10 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_DEFAULTINPUTSIGNAL_H -#define VGUI_DEFAULTINPUTSIGNAL_H -#ifdef _WIN32 #pragma once -#endif - #include "VGUI_InputSignal.h" - namespace vgui { // This class derives from vgui::InputSignal and implements empty defaults for all of its functions. @@ -34,6 +28,3 @@ namespace vgui virtual void keyFocusTicked(Panel* panel) {} }; } - - -#endif // VGUI_DEFAULTINPUTSIGNAL_H diff --git a/game_shared/vgui_grid.h b/game_shared/vgui_grid.h index ba83ffe16..476640987 100644 --- a/game_shared/vgui_grid.h +++ b/game_shared/vgui_grid.h @@ -5,16 +5,10 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_GRID_H -#define VGUI_GRID_H -#ifdef _WIN32 #pragma once -#endif - #include "VGUI_Panel.h" - namespace vgui { @@ -117,6 +111,3 @@ class CGrid : public Panel }; }; - - -#endif // VGUI_GRID_H diff --git a/game_shared/vgui_helpers.h b/game_shared/vgui_helpers.h index 6dae8bb21..3bcb5638f 100644 --- a/game_shared/vgui_helpers.h +++ b/game_shared/vgui_helpers.h @@ -5,12 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_HELPERS_H -#define VGUI_HELPERS_H -#ifdef _WIN32 #pragma once -#endif - #include "VGUI_Panel.h" #include "VGUI_Label.h" @@ -25,7 +20,3 @@ inline int PanelHeight(vgui::Panel *pPanel) {int x,y,w,h; pPanel->getBounds(x,y, // Places child at the requested position inside pParent. iAlignment is from Label::Alignment. void AlignPanel(vgui::Panel *pChild, vgui::Panel *pParent, int alignment); - - -#endif // VGUI_HELPERS_H - diff --git a/game_shared/vgui_listbox.h b/game_shared/vgui_listbox.h index 9e9b7242f..78449d7e3 100644 --- a/game_shared/vgui_listbox.h +++ b/game_shared/vgui_listbox.h @@ -5,12 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VOICE_LISTBOX_H -#define VOICE_LISTBOX_H -#ifdef _WIN32 #pragma once -#endif - #include "VGUI_Panel.h" #include "VGUI_IntChangeSignal.h" @@ -18,7 +13,6 @@ #include "vgui_slider2.h" #include "vgui_scrollbar2.h" - namespace vgui { @@ -110,6 +104,3 @@ class CListBox : public Panel }; } - - -#endif // VOICE_LISTBOX_H diff --git a/game_shared/vgui_loadtga.h b/game_shared/vgui_loadtga.h index 3a4e2eb1c..e058b580f 100644 --- a/game_shared/vgui_loadtga.h +++ b/game_shared/vgui_loadtga.h @@ -5,18 +5,9 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_LOADTGA_H -#define VGUI_LOADTGA_H -#ifdef _WIN32 #pragma once -#endif - #include "VGUI_BitmapTGA.h" - vgui::BitmapTGA* vgui_LoadTGA(char const *pFilename); vgui::BitmapTGA* vgui_LoadTGANoInvertAlpha(char const *pFilename); - - -#endif // VGUI_LOADTGA_H diff --git a/game_shared/vgui_scrollbar2.h b/game_shared/vgui_scrollbar2.h index 0f2d95c01..61a5245f9 100644 --- a/game_shared/vgui_scrollbar2.h +++ b/game_shared/vgui_scrollbar2.h @@ -5,11 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SCROLLBAR2_H -#define VGUI_SCROLLBAR2_H -#ifdef _WIN32 #pragma once -#endif #include #include @@ -58,5 +54,3 @@ class VGUIAPI ScrollBar2 : public Panel }; } - -#endif // VGUI_SCROLLBAR2_H diff --git a/game_shared/vgui_slider2.h b/game_shared/vgui_slider2.h index 4af7b02fc..c868a5a67 100644 --- a/game_shared/vgui_slider2.h +++ b/game_shared/vgui_slider2.h @@ -5,11 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SLIDER2_H -#define VGUI_SLIDER2_H -#ifdef _WIN32 #pragma once -#endif #include #include @@ -63,5 +59,3 @@ class VGUIAPI Slider2 : public Panel }; } - -#endif // VGUI_SLIDER2_H diff --git a/game_shared/voice_banmgr.h b/game_shared/voice_banmgr.h index 610ad6cfc..b89ae1f1a 100644 --- a/game_shared/voice_banmgr.h +++ b/game_shared/voice_banmgr.h @@ -5,12 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VOICE_BANMGR_H -#define VOICE_BANMGR_H -#ifdef _WIN32 #pragma once -#endif - // This class manages the (persistent) list of squelched players. class CVoiceBanMgr @@ -52,6 +47,3 @@ class CVoiceBanMgr BannedPlayer m_PlayerHash[256]; }; - - -#endif // VOICE_BANMGR_H diff --git a/game_shared/voice_common.h b/game_shared/voice_common.h index 5517d8eed..df8d7be15 100644 --- a/game_shared/voice_common.h +++ b/game_shared/voice_common.h @@ -5,20 +5,9 @@ // $NoKeywords: $ //============================================================================= -#ifndef VOICE_COMMON_H -#define VOICE_COMMON_H -#ifdef _WIN32 -#pragma once -#endif - - #include "bitvec.h" - #define VOICE_MAX_PLAYERS 32 // (todo: this should just be set to MAX_CLIENTS). #define VOICE_MAX_PLAYERS_DW ((VOICE_MAX_PLAYERS / 32) + !!(VOICE_MAX_PLAYERS & 31)) typedef CBitVec CPlayerBitVec; - - -#endif // VOICE_COMMON_H diff --git a/game_shared/voice_gamemgr.h b/game_shared/voice_gamemgr.h index 906444d1e..2185efbfa 100644 --- a/game_shared/voice_gamemgr.h +++ b/game_shared/voice_gamemgr.h @@ -5,13 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VOICE_GAMEMGR_H -#define VOICE_GAMEMGR_H - -#ifdef _WIN32 #pragma once -#endif - #include "voice_common.h" @@ -77,6 +71,3 @@ class CVoiceGameMgr int m_nMaxPlayers; double m_UpdateInterval; // How long since the last update. }; - - -#endif // VOICE_GAMEMGR_H diff --git a/game_shared/voice_status.h b/game_shared/voice_status.h index de6ac0aa7..4bc9b6b38 100644 --- a/game_shared/voice_status.h +++ b/game_shared/voice_status.h @@ -5,15 +5,11 @@ // $NoKeywords: $ //============================================================================= -#ifndef VOICE_STATUS_H -#define VOICE_STATUS_H #pragma once #include "voice_common.h" #include "voice_banmgr.h" - - // This is provided by each mod to access data that may not be the same across mods. class IVoiceStatusHelper { @@ -197,9 +193,3 @@ CVoiceStatus* GetClientVoice(); // Get the (global) voice manager. IVoiceHud* GetClientVoiceHud(); - - - - - -#endif // VOICE_STATUS_H \ No newline at end of file diff --git a/pm_shared/pm_debug.h b/pm_shared/pm_debug.h index db7d663dc..22441e32d 100644 --- a/pm_shared/pm_debug.h +++ b/pm_shared/pm_debug.h @@ -12,13 +12,10 @@ * without written permission from Valve LLC. * ****/ -#ifndef PM_DEBUG_H -#define PM_DEBUG_H + #pragma once void PM_ViewEntity(); void PM_DrawBBox(Vector mins, Vector maxs, Vector origin, int pcolor, float life); void PM_ParticleLine(Vector start, Vector end, int pcolor, float life, float vert); void PM_ShowClipBox(); - -#endif // PMOVEDBG_H diff --git a/public/archtypes.h b/public/archtypes.h index 2434a8ab4..878217d4a 100644 --- a/public/archtypes.h +++ b/public/archtypes.h @@ -2,8 +2,8 @@ // Word size dependent definitions // DAL 1/03 // -#ifndef ARCHTYPES_H -#define ARCHTYPES_H + +#pragma once #include "steam/steamtypes.h" @@ -17,5 +17,3 @@ #define _S_IWRITE S_IWRITE typedef long unsigned int ulong; #endif - -#endif // ARCHTYPES_H diff --git a/public/cl_dll/IGameClientExports.h b/public/cl_dll/IGameClientExports.h index d45d53ac4..e9c65aca2 100644 --- a/public/cl_dll/IGameClientExports.h +++ b/public/cl_dll/IGameClientExports.h @@ -5,11 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef IGAMECLIENTEXPORTS_H -#define IGAMECLIENTEXPORTS_H -#ifdef _WIN32 #pragma once -#endif #include "interface.h" @@ -29,6 +25,3 @@ class IGameClientExports : public IBaseInterface }; #define GAMECLIENTEXPORTS_INTERFACE_VERSION "GameClientExports001" - - -#endif // IGAMECLIENTEXPORTS_H diff --git a/public/interface.h b/public/interface.h index 0f4a5ad98..d0b9a4bda 100644 --- a/public/interface.h +++ b/public/interface.h @@ -18,8 +18,7 @@ //#include "tier1/interface.h" //#else -#ifndef INTERFACE_H -#define INTERFACE_H +#pragma once #if !defined ( _WIN32 ) @@ -142,8 +141,4 @@ extern void Sys_UnloadModule( CSysModule *pModule ); extern CreateInterfaceFn Sys_GetFactory( CSysModule *pModule ); - -#endif //#endif // MSVC 6.0 - - diff --git a/public/keydefs.h b/public/keydefs.h index 590367b45..f07adfec2 100644 --- a/public/keydefs.h +++ b/public/keydefs.h @@ -1,9 +1,6 @@ // keydefs.h -#ifndef KEYDEFS_H -#define KEYDEFS_H -#ifdef _WIN32 + #pragma once -#endif // // these are the key numbers that should be passed to Key_Event @@ -120,5 +117,3 @@ #define K_MOUSE3 243 #define K_MOUSE4 244 #define K_MOUSE5 245 - -#endif // KEYDEFS_H \ No newline at end of file diff --git a/public/particleman.h b/public/particleman.h index 0f9b70242..c55e2cec2 100644 --- a/public/particleman.h +++ b/public/particleman.h @@ -1,5 +1,4 @@ -#ifndef PARTICLEMAN_H -#define PARTICLEMAN_H +#pragma once #include "interface.h" #include "pman_triangleffect.h" @@ -96,6 +95,3 @@ class CBaseParticle : public CCoreTriangleEffect } #endif }; - - -#endif //PARTICLEMAN_H diff --git a/public/pman_particlemem.h b/public/pman_particlemem.h index 6ccb97128..09d0f68e8 100644 --- a/public/pman_particlemem.h +++ b/public/pman_particlemem.h @@ -1,9 +1,4 @@ -#ifndef PARTICLEMEM_H__ -#define PARTICLEMEM_H__ - -#ifdef _WIN32 #pragma once -#endif #include @@ -192,6 +187,3 @@ class CMiniMem visibleparticles_t *m_pVisibleParticles; }; - - -#endif//PARTICLEMEM_H__ \ No newline at end of file diff --git a/public/pman_triangleffect.h b/public/pman_triangleffect.h index 72c2e1542..35a47b987 100644 --- a/public/pman_triangleffect.h +++ b/public/pman_triangleffect.h @@ -1,9 +1,4 @@ -#ifndef TRIANGLEEFFECT_H__ -#define TRIANGLEEFFECT_H__ - -#ifdef _WIN32 #pragma once -#endif #define TRI_COLLIDEWORLD 0x00000020 #define TRI_COLLIDEALL 0x00001000 // will collide with world and slideboxes @@ -204,6 +199,3 @@ class CCoreTriangleEffect return(true); } }; - - -#endif//TRIANGLEEFFECT_H__ diff --git a/public/steam/steamtypes.h b/public/steam/steamtypes.h index 16066165e..665b2a1ee 100644 --- a/public/steam/steamtypes.h +++ b/public/steam/steamtypes.h @@ -4,11 +4,7 @@ // //============================================================================= -#ifndef STEAMTYPES_H -#define STEAMTYPES_H -#ifdef _WIN32 #pragma once -#endif // Steam-specific types. Defined here so this header file can be included in other code bases. #if defined( __GNUC__ ) && !defined(POSIX) @@ -173,5 +169,3 @@ const PartnerId_t k_uPartnerIdInvalid = 0; #else #define k_uPartnerIdInvalid 0x0; #endif - -#endif // STEAMTYPES_H diff --git a/utils/vgui/include/VGUI.h b/utils/vgui/include/VGUI.h index 0dff607a9..836d4f57d 100644 --- a/utils/vgui/include/VGUI.h +++ b/utils/vgui/include/VGUI.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_H -#define VGUI_H +#pragma once //If you are going to add stuff to the vgui core... // @@ -103,6 +102,3 @@ VGUIAPI int vgui_dprintf(const char* format,...); VGUIAPI int vgui_dprintf2(const char* format,...); } - -#endif - diff --git a/utils/vgui/include/VGUI_ActionSignal.h b/utils/vgui/include/VGUI_ActionSignal.h index 372ad2b9e..c9b7dadea 100644 --- a/utils/vgui/include/VGUI_ActionSignal.h +++ b/utils/vgui/include/VGUI_ActionSignal.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_ACTIONSIGNAL_H -#define VGUI_ACTIONSIGNAL_H +#pragma once #include @@ -78,7 +77,3 @@ class VGUIAPI ActionSignal }; } - -#endif - - diff --git a/utils/vgui/include/VGUI_App.h b/utils/vgui/include/VGUI_App.h index b655f9288..663ed788e 100644 --- a/utils/vgui/include/VGUI_App.h +++ b/utils/vgui/include/VGUI_App.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_APP_H -#define VGUI_APP_H +#pragma once #include #include @@ -123,8 +122,3 @@ class VGUIAPI App friend class SurfaceBase; }; } - -#endif - - - diff --git a/utils/vgui/include/VGUI_Bitmap.h b/utils/vgui/include/VGUI_Bitmap.h index 7d23e3959..05b378de0 100644 --- a/utils/vgui/include/VGUI_Bitmap.h +++ b/utils/vgui/include/VGUI_Bitmap.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_BITMAP_H -#define VGUI_BITMAP_H +#pragma once #include #include @@ -33,5 +32,3 @@ class VGUIAPI Bitmap : public Image }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_BitmapTGA.h b/utils/vgui/include/VGUI_BitmapTGA.h index c0def7107..e0944010f 100644 --- a/utils/vgui/include/VGUI_BitmapTGA.h +++ b/utils/vgui/include/VGUI_BitmapTGA.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_BITMAPTGA_H -#define VGUI_BITMAPTGA_H +#pragma once #include @@ -25,5 +24,3 @@ class VGUIAPI BitmapTGA : public Bitmap }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Border.h b/utils/vgui/include/VGUI_Border.h index 6ad137e64..d004dee16 100644 --- a/utils/vgui/include/VGUI_Border.h +++ b/utils/vgui/include/VGUI_Border.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_BORDER_H -#define VGUI_BORDER_H +#pragma once #include #include @@ -41,5 +40,3 @@ friend class BorderPair; }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_BorderLayout.h b/utils/vgui/include/VGUI_BorderLayout.h index 564d58ac6..8ee09b49d 100644 --- a/utils/vgui/include/VGUI_BorderLayout.h +++ b/utils/vgui/include/VGUI_BorderLayout.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_BORDERLAYOUT_H -#define VGUI_BORDERLAYOUT_H +#pragma once #include #include @@ -37,10 +36,3 @@ class VGUIAPI BorderLayout : public Layout }; } - -#endif - - - - - diff --git a/utils/vgui/include/VGUI_BuildGroup.h b/utils/vgui/include/VGUI_BuildGroup.h index 678e5c50b..796a200c1 100644 --- a/utils/vgui/include/VGUI_BuildGroup.h +++ b/utils/vgui/include/VGUI_BuildGroup.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_BUILDGROUP_H -#define VGUI_BUILDGROUP_H +#pragma once #include #include @@ -64,5 +63,3 @@ class VGUIAPI BuildGroup }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Button.h b/utils/vgui/include/VGUI_Button.h index dbd4e07aa..aec3b2682 100644 --- a/utils/vgui/include/VGUI_Button.h +++ b/utils/vgui/include/VGUI_Button.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_BUTTON_H -#define VGUI_BUTTON_H +#pragma once #include #include @@ -57,5 +56,3 @@ class VGUIAPI Button : public Label }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Color.h b/utils/vgui/include/VGUI_Color.h index e69d5e0f3..0f932c674 100644 --- a/utils/vgui/include/VGUI_Color.h +++ b/utils/vgui/include/VGUI_Color.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_COLOR_H -#define VGUI_COLOR_H +#pragma once #include #include @@ -39,6 +38,3 @@ class VGUIAPI Color }; } - - -#endif diff --git a/utils/vgui/include/VGUI_Cursor.h b/utils/vgui/include/VGUI_Cursor.h index 0e57646b8..ac0a6037d 100644 --- a/utils/vgui/include/VGUI_Cursor.h +++ b/utils/vgui/include/VGUI_Cursor.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_CURSOR_H -#define VGUI_CURSOR_H +#pragma once #include @@ -53,5 +52,3 @@ class VGUIAPI Cursor }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Dar.h b/utils/vgui/include/VGUI_Dar.h index 6f8eb513b..f8723da05 100644 --- a/utils/vgui/include/VGUI_Dar.h +++ b/utils/vgui/include/VGUI_Dar.h @@ -5,15 +5,12 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_DAR_H -#define VGUI_DAR_H +#pragma once #include #include #include - - namespace vgui { @@ -189,6 +186,3 @@ template class VGUIAPI Dar; #endif } - - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_DesktopIcon.h b/utils/vgui/include/VGUI_DesktopIcon.h index 18aaa835c..87235bdfa 100644 --- a/utils/vgui/include/VGUI_DesktopIcon.h +++ b/utils/vgui/include/VGUI_DesktopIcon.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_DESKTOPICON_H -#define VGUI_DESKTOPICON_H +#pragma once #include #include @@ -37,5 +36,3 @@ class VGUIAPI DesktopIcon : public Panel }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_FileInputStream.h b/utils/vgui/include/VGUI_FileInputStream.h index 0df38202b..1d6a0b5cb 100644 --- a/utils/vgui/include/VGUI_FileInputStream.h +++ b/utils/vgui/include/VGUI_FileInputStream.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_FILEINPUTSTREAM_H -#define VGUI_FILEINPUTSTREAM_H +#pragma once //TODO : figure out how to get stdio out of here, I think std namespace is broken for FILE for forward declaring does not work in vc6 @@ -34,5 +33,3 @@ class VGUIAPI FileInputStream : public InputStream }; } - -#endif diff --git a/utils/vgui/include/VGUI_Font.h b/utils/vgui/include/VGUI_Font.h index 73eb4e25a..6736b8c81 100644 --- a/utils/vgui/include/VGUI_Font.h +++ b/utils/vgui/include/VGUI_Font.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_FONT_H -#define VGUI_FONT_H +#pragma once #include @@ -47,5 +46,3 @@ class VGUIAPI Font void Font_Reset(); } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Frame.h b/utils/vgui/include/VGUI_Frame.h index d839f7cc2..722bc04b9 100644 --- a/utils/vgui/include/VGUI_Frame.h +++ b/utils/vgui/include/VGUI_Frame.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_FRAME_H -#define VGUI_FRAME_H +#pragma once #include #include @@ -69,5 +68,3 @@ class VGUIAPI Frame : public Panel }; } - -#endif diff --git a/utils/vgui/include/VGUI_HeaderPanel.h b/utils/vgui/include/VGUI_HeaderPanel.h index 0f584fc10..7b72332bf 100644 --- a/utils/vgui/include/VGUI_HeaderPanel.h +++ b/utils/vgui/include/VGUI_HeaderPanel.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_HEADERPANEL_H -#define VGUI_HEADERPANEL_H +#pragma once #include #include @@ -60,6 +59,3 @@ class VGUIAPI HeaderPanel : public Panel }; } - -#endif - diff --git a/utils/vgui/include/VGUI_Image.h b/utils/vgui/include/VGUI_Image.h index 01cb0074a..ca5c879a5 100644 --- a/utils/vgui/include/VGUI_Image.h +++ b/utils/vgui/include/VGUI_Image.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_IMAGE_H -#define VGUI_IMAGE_H +#pragma once #include #include @@ -58,5 +57,3 @@ friend class Panel; virtual void doPaint(Panel* panel); }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_ImagePanel.h b/utils/vgui/include/VGUI_ImagePanel.h index cdbe31541..16c0d9232 100644 --- a/utils/vgui/include/VGUI_ImagePanel.h +++ b/utils/vgui/include/VGUI_ImagePanel.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_IMAGEPANEL_H -#define VGUI_IMAGEPANEL_H +#pragma once #include #include @@ -34,5 +33,3 @@ class VGUIAPI ImagePanel : public Panel }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_InputSignal.h b/utils/vgui/include/VGUI_InputSignal.h index 0ceb2563a..c50dc3fa0 100644 --- a/utils/vgui/include/VGUI_InputSignal.h +++ b/utils/vgui/include/VGUI_InputSignal.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_INPUTSIGNAL_H -#define VGUI_INPUTSIGNAL_H +#pragma once #include @@ -35,5 +34,3 @@ class VGUIAPI InputSignal }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_InputStream.h b/utils/vgui/include/VGUI_InputStream.h index 9c3395fb7..12e40e60f 100644 --- a/utils/vgui/include/VGUI_InputStream.h +++ b/utils/vgui/include/VGUI_InputStream.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_FILE_H -#define VGUI_FILE_H +#pragma once #include @@ -26,5 +25,3 @@ class VGUIAPI InputStream }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_IntChangeSignal.h b/utils/vgui/include/VGUI_IntChangeSignal.h index f44cff131..d66aaa264 100644 --- a/utils/vgui/include/VGUI_IntChangeSignal.h +++ b/utils/vgui/include/VGUI_IntChangeSignal.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_INTCHANGESIGNAL_H -#define VGUI_INTCHANGESIGNAL_H +#pragma once #include @@ -22,5 +21,3 @@ class VGUIAPI IntChangeSignal }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_KeyCode.h b/utils/vgui/include/VGUI_KeyCode.h index afd970553..f870d4b67 100644 --- a/utils/vgui/include/VGUI_KeyCode.h +++ b/utils/vgui/include/VGUI_KeyCode.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_KEYCODE_H -#define VGUI_KEYCODE_H +#pragma once #include @@ -120,7 +119,3 @@ enum VGUIAPI KeyCode KEY_LAST, }; } - - -#endif - diff --git a/utils/vgui/include/VGUI_Label.h b/utils/vgui/include/VGUI_Label.h index f1ae9cfa6..6a262c8ee 100644 --- a/utils/vgui/include/VGUI_Label.h +++ b/utils/vgui/include/VGUI_Label.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_LABEL_H -#define VGUI_LABEL_H +#pragma once #include #include @@ -77,5 +76,3 @@ class VGUIAPI Label : public Panel }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Layout.h b/utils/vgui/include/VGUI_Layout.h index 5a7507371..437ab3127 100644 --- a/utils/vgui/include/VGUI_Layout.h +++ b/utils/vgui/include/VGUI_Layout.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_LAYOUT_H -#define VGUI_LAYOUT_H +#pragma once #include @@ -27,5 +26,3 @@ class VGUIAPI Layout }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_LineBorder.h b/utils/vgui/include/VGUI_LineBorder.h index 4e102eac1..d183f36e8 100644 --- a/utils/vgui/include/VGUI_LineBorder.h +++ b/utils/vgui/include/VGUI_LineBorder.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_LINEBORDER_H -#define VGUI_LINEBORDER_H +#pragma once #include #include @@ -35,5 +34,3 @@ class VGUIAPI LineBorder : public Border }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_LoweredBorder.h b/utils/vgui/include/VGUI_LoweredBorder.h index 25a9d9db7..b12aaef7c 100644 --- a/utils/vgui/include/VGUI_LoweredBorder.h +++ b/utils/vgui/include/VGUI_LoweredBorder.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_LOWEREDBORDER_H -#define VGUI_LOWEREDBORDER_H +#pragma once #include #include @@ -25,5 +24,3 @@ class VGUIAPI LoweredBorder : public Border }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_MenuSeparator.h b/utils/vgui/include/VGUI_MenuSeparator.h index 42b3d1b5c..e96e8cf01 100644 --- a/utils/vgui/include/VGUI_MenuSeparator.h +++ b/utils/vgui/include/VGUI_MenuSeparator.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_MENUSEPARATOR_H -#define VGUI_MENUSEPARATOR_H +#pragma once #include #include @@ -23,5 +22,3 @@ class VGUIAPI MenuSeparator : public Label }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_MiniApp.h b/utils/vgui/include/VGUI_MiniApp.h index 39ce4fd9a..f71d1f987 100644 --- a/utils/vgui/include/VGUI_MiniApp.h +++ b/utils/vgui/include/VGUI_MiniApp.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_MINIAPP_H -#define VGUI_MINIAPP_H +#pragma once #include @@ -29,5 +28,3 @@ class VGUIAPI MiniApp }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_MouseCode.h b/utils/vgui/include/VGUI_MouseCode.h index b0811c75c..2ae5e2d4b 100644 --- a/utils/vgui/include/VGUI_MouseCode.h +++ b/utils/vgui/include/VGUI_MouseCode.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_MOUSECODE_H -#define VGUI_MOUSECODE_H +#pragma once #include @@ -20,5 +19,3 @@ enum VGUIAPI MouseCode MOUSE_LAST, }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Panel.h b/utils/vgui/include/VGUI_Panel.h index 16841aeb0..643018f0f 100644 --- a/utils/vgui/include/VGUI_Panel.h +++ b/utils/vgui/include/VGUI_Panel.h @@ -5,9 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_PANEL_H -#define VGUI_PANEL_H - +#pragma once /* @@ -224,5 +222,3 @@ friend class SurfaceBase; friend class Image; }; } - -#endif diff --git a/utils/vgui/include/VGUI_RepaintSignal.h b/utils/vgui/include/VGUI_RepaintSignal.h index ccef9cfda..589d6ee5b 100644 --- a/utils/vgui/include/VGUI_RepaintSignal.h +++ b/utils/vgui/include/VGUI_RepaintSignal.h @@ -5,10 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_REPAINTSIGNAL_H -#define VGUI_REPAINTSIGNAL_H - - +#pragma once namespace vgui { @@ -21,6 +18,3 @@ class RepaintSignal }; } - - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_Scheme.h b/utils/vgui/include/VGUI_Scheme.h index 86c8076c0..84e1c8aff 100644 --- a/utils/vgui/include/VGUI_Scheme.h +++ b/utils/vgui/include/VGUI_Scheme.h @@ -5,12 +5,10 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SCHEME_H -#define VGUI_SCHEME_H +#pragma once #include - namespace vgui { @@ -78,5 +76,3 @@ class VGUIAPI Scheme }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_ScrollBar.h b/utils/vgui/include/VGUI_ScrollBar.h index 45789e197..c47661bfd 100644 --- a/utils/vgui/include/VGUI_ScrollBar.h +++ b/utils/vgui/include/VGUI_ScrollBar.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SCROLLBAR_H -#define VGUI_SCROLLBAR_H +#pragma once #include #include @@ -52,5 +51,3 @@ class VGUIAPI ScrollBar : public Panel }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_ScrollPanel.h b/utils/vgui/include/VGUI_ScrollPanel.h index f12fc2b18..3b2b5b9e1 100644 --- a/utils/vgui/include/VGUI_ScrollPanel.h +++ b/utils/vgui/include/VGUI_ScrollPanel.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SCROLLPANEL_H -#define VGUI_SCROLLPANEL_H +#pragma once #include #include @@ -46,10 +45,3 @@ class VGUIAPI ScrollPanel : public Panel }; } - - - - - - -#endif diff --git a/utils/vgui/include/VGUI_Slider.h b/utils/vgui/include/VGUI_Slider.h index 176e90f74..b74fbff37 100644 --- a/utils/vgui/include/VGUI_Slider.h +++ b/utils/vgui/include/VGUI_Slider.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SLIDER_H -#define VGUI_SLIDER_H +#pragma once #include #include @@ -60,10 +59,3 @@ class VGUIAPI Slider : public Panel }; } - -#endif - - - - - diff --git a/utils/vgui/include/VGUI_StackLayout.h b/utils/vgui/include/VGUI_StackLayout.h index f5c2ab2f5..b2bd72e2c 100644 --- a/utils/vgui/include/VGUI_StackLayout.h +++ b/utils/vgui/include/VGUI_StackLayout.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_STACKLAYOUT_H -#define VGUI_STACKLAYOUT_H +#pragma once #include #include @@ -26,5 +25,3 @@ class VGUIAPI StackLayout : public Layout }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_String.h b/utils/vgui/include/VGUI_String.h index b359984f3..9ed52c6b6 100644 --- a/utils/vgui/include/VGUI_String.h +++ b/utils/vgui/include/VGUI_String.h @@ -5,12 +5,10 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_STRING_H -#define VGUI_STRING_H +#pragma once #include - namespace vgui { @@ -55,7 +53,3 @@ friend class String; } - - -#endif - diff --git a/utils/vgui/include/VGUI_Surface.h b/utils/vgui/include/VGUI_Surface.h index b10ba6ab1..72e7f47c1 100644 --- a/utils/vgui/include/VGUI_Surface.h +++ b/utils/vgui/include/VGUI_Surface.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SURFACE_H -#define VGUI_SURFACE_H +#pragma once #include #include @@ -63,6 +62,3 @@ class VGUIAPI Surface : public SurfaceBase }; } - -#endif - diff --git a/utils/vgui/include/VGUI_SurfaceBase.h b/utils/vgui/include/VGUI_SurfaceBase.h index ee51a95f7..ff995676c 100644 --- a/utils/vgui/include/VGUI_SurfaceBase.h +++ b/utils/vgui/include/VGUI_SurfaceBase.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_SURFACEBASE_H -#define VGUI_SURFACEBASE_H +#pragma once #include #include @@ -77,6 +76,3 @@ friend class Panel; }; } - -#endif - diff --git a/utils/vgui/include/VGUI_TablePanel.h b/utils/vgui/include/VGUI_TablePanel.h index 0c5eac2ac..852da90dd 100644 --- a/utils/vgui/include/VGUI_TablePanel.h +++ b/utils/vgui/include/VGUI_TablePanel.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_TABLEPANEL_H -#define VGUI_TABLEPANEL_H +#pragma once #include #include @@ -67,5 +66,3 @@ friend class FooVGuiTablePanelHandler; }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_TextEntry.h b/utils/vgui/include/VGUI_TextEntry.h index 09b13aa7a..37115cd42 100644 --- a/utils/vgui/include/VGUI_TextEntry.h +++ b/utils/vgui/include/VGUI_TextEntry.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_TEXTENTRY_H -#define VGUI_TEXTENTRY_H +#pragma once #include #include @@ -76,5 +75,3 @@ class VGUIAPI TextEntry : public Panel , public InputSignal }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_TextGrid.h b/utils/vgui/include/VGUI_TextGrid.h index c2bde17d3..79f5a9ff9 100644 --- a/utils/vgui/include/VGUI_TextGrid.h +++ b/utils/vgui/include/VGUI_TextGrid.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_TEXTGRID_H -#define VGUI_TEXTGRID_H +#pragma once #include #include @@ -38,5 +37,3 @@ class VGUIAPI TextGrid : public Panel }; } - -#endif \ No newline at end of file diff --git a/utils/vgui/include/VGUI_TextImage.h b/utils/vgui/include/VGUI_TextImage.h index c17c69906..2053536c8 100644 --- a/utils/vgui/include/VGUI_TextImage.h +++ b/utils/vgui/include/VGUI_TextImage.h @@ -5,14 +5,12 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_TEXTIMAGE_H -#define VGUI_TEXTIMAGE_H +#pragma once #include #include #include - //TODO: need to add wrapping flag instead of being arbitrary about when wrapping and auto-resizing actually happens // This is probably why you are having problems if you had text in a constructor and then changed the font @@ -51,8 +49,3 @@ class VGUIAPI TextImage : public Image }; } - -#endif - - - diff --git a/utils/vgui/include/VGUI_TextPanel.h b/utils/vgui/include/VGUI_TextPanel.h index 858fb2548..ca26832d2 100644 --- a/utils/vgui/include/VGUI_TextPanel.h +++ b/utils/vgui/include/VGUI_TextPanel.h @@ -5,8 +5,7 @@ // $NoKeywords: $ //============================================================================= -#ifndef VGUI_TEXTPANEL_H -#define VGUI_TEXTPANEL_H +#pragma once #include #include @@ -39,8 +38,3 @@ class VGUIAPI TextPanel : public Panel }; } - -#endif - - -