From 774e0652786c1b8ac03c991de03db23532dfb41b Mon Sep 17 00:00:00 2001 From: Sh1ft0x0EF Date: Sat, 18 Feb 2017 18:58:37 +0400 Subject: [PATCH] Use pragma once for headers (368B - Same as #368 but using pragma only) --- rehlds/engine/APIProxy.h | 8 ++------ rehlds/engine/cdll_int.h | 5 ++--- rehlds/engine/client.h | 8 +------- rehlds/engine/cmd.h | 3 ++- rehlds/engine/cmodel.h | 8 +------- rehlds/engine/com_custom.h | 9 +-------- rehlds/engine/common.h | 6 ++++-- rehlds/engine/consistency.h | 8 +------- rehlds/engine/custom_int.h | 5 ++++- rehlds/engine/cvar.h | 9 +-------- rehlds/engine/decal.h | 8 +------- rehlds/engine/delta.h | 3 ++- rehlds/engine/delta_packet.h | 8 +------- rehlds/engine/ed_strpool.h | 2 +- rehlds/engine/event.h | 8 +------- rehlds/engine/filesystem_.h | 8 +------- rehlds/engine/filesystem_internal.h | 9 +-------- rehlds/engine/filter.h | 8 +------- rehlds/engine/hashpak.h | 8 +------- rehlds/engine/host.h | 8 +------- rehlds/engine/host_cmd.h | 8 +------- rehlds/engine/iengine.h | 8 +------- rehlds/engine/igame.h | 2 +- rehlds/engine/info.h | 10 ++-------- rehlds/engine/inst_baseline.h | 8 +------- rehlds/engine/ipratelimit.h | 8 +------- rehlds/engine/ipratelimitWrapper.h | 7 ++----- rehlds/engine/keys.h | 2 +- rehlds/engine/l_studio.h | 9 +-------- rehlds/engine/mathlib_e.h | 11 ++--------- rehlds/engine/mem.h | 9 +-------- rehlds/engine/model_rehlds.h | 3 ++- rehlds/engine/modinfo.h | 8 +------- rehlds/engine/net.h | 9 +-------- rehlds/engine/net_chan.h | 11 +---------- rehlds/engine/net_ws.h | 8 +------- rehlds/engine/pmove.h | 8 +------- rehlds/engine/pmovetst.h | 11 +---------- rehlds/engine/pr_cmds.h | 10 ++-------- rehlds/engine/pr_dlls.h | 8 +------- rehlds/engine/pr_edict.h | 9 +-------- rehlds/engine/server.h | 9 ++------- rehlds/engine/server_static.h | 8 +------- rehlds/engine/sound.h | 8 +------- rehlds/engine/sse_mathfun.h | 2 +- rehlds/engine/studio_rehlds.h | 4 +++- rehlds/engine/sv_log.h | 8 +------- rehlds/engine/sv_move.h | 8 +------- rehlds/engine/sv_phys.h | 8 +------- rehlds/engine/sv_pmove.h | 8 +------- rehlds/engine/sv_remoteaccess.h | 3 ++- rehlds/engine/sv_steam3.h | 8 +------- rehlds/engine/sv_upld.h | 9 +-------- rehlds/engine/sv_user.h | 8 +------- rehlds/engine/sys_dll.h | 3 ++- rehlds/engine/sys_dll2.h | 8 +------- rehlds/engine/sys_engine.h | 3 +-- rehlds/engine/sys_linuxwnd.h | 2 +- rehlds/engine/textures.h | 8 +------- rehlds/engine/tmessage.h | 8 +------- rehlds/engine/traceinit.h | 8 +------- rehlds/engine/unicode_strtools.h | 8 +------- rehlds/engine/userid.h | 3 +-- rehlds/engine/usermsg.h | 8 +------- rehlds/engine/vid_null.h | 2 +- rehlds/engine/wad.h | 8 +------- rehlds/engine/world.h | 8 +------- rehlds/engine/zone.h | 8 +------- 68 files changed, 88 insertions(+), 394 deletions(-) diff --git a/rehlds/engine/APIProxy.h b/rehlds/engine/APIProxy.h index 15c4c26..9869906 100644 --- a/rehlds/engine/APIProxy.h +++ b/rehlds/engine/APIProxy.h @@ -1,5 +1,4 @@ -#ifndef __APIPROXY__ -#define __APIPROXY__ +#pragma once #include "netadr.h" #include "Sequence.h" @@ -933,7 +932,4 @@ typedef struct validator_s #define k_nChecksumCompensator 0x36a8f09c // Don't change this value: it's hardcorded in cdll_int.cpp, -#define k_nModuleVersionCur 0x43210004 - - -#endif // __APIPROXY__ +#define k_nModuleVersionCur 0x43210004 \ No newline at end of file diff --git a/rehlds/engine/cdll_int.h b/rehlds/engine/cdll_int.h index ac37e79..967ae40 100644 --- a/rehlds/engine/cdll_int.h +++ b/rehlds/engine/cdll_int.h @@ -18,7 +18,7 @@ // 4-23-98 // JOHN: client dll interface declarations // -#pragma once +#pragma once #ifdef __cplusplus extern "C" { @@ -461,5 +461,4 @@ extern void NullDst(void); #ifdef __cplusplus } -#endif - +#endif \ No newline at end of file diff --git a/rehlds/engine/client.h b/rehlds/engine/client.h index 2c7ea63..8fe0088 100644 --- a/rehlds/engine/client.h +++ b/rehlds/engine/client.h @@ -26,11 +26,7 @@ * */ -#ifndef CLIENT_H -#define CLIENT_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "common.h" @@ -350,6 +346,4 @@ void ProcessTutorMessageDecayBuffer(int *buffer, int bufferLength); int GetTimesTutorMessageShown(int id); void RegisterTutorMessageShown(int mid); void ResetTutorMessageDecayData(void); -void SetCareerAudioState(int state); - -#endif // CLIENT_H +void SetCareerAudioState(int state); \ No newline at end of file diff --git a/rehlds/engine/cmd.h b/rehlds/engine/cmd.h index c685544..34bfcde 100644 --- a/rehlds/engine/cmd.h +++ b/rehlds/engine/cmd.h @@ -25,6 +25,7 @@ * version. * */ + #pragma once #include "maintypes.h" @@ -121,4 +122,4 @@ qboolean Cmd_ForwardToServerInternal(sizebuf_t *pBuf); void Cmd_ForwardToServer(void); qboolean Cmd_ForwardToServerUnreliable(void); NOXREF int Cmd_CheckParm(const char *parm); -void Cmd_CmdList_f(void); +void Cmd_CmdList_f(void); \ No newline at end of file diff --git a/rehlds/engine/cmodel.h b/rehlds/engine/cmodel.h index a81852f..0da7b28 100644 --- a/rehlds/engine/cmodel.h +++ b/rehlds/engine/cmodel.h @@ -26,11 +26,7 @@ * */ -#ifndef CMODEL_H -#define CMODEL_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "model.h" @@ -62,6 +58,4 @@ unsigned char *CM_LeafPVS(int leafnum); unsigned char *CM_LeafPAS(int leafnum); void CM_FreePAS(void); void CM_CalcPAS(model_t *pModel); -qboolean CM_HeadnodeVisible(mnode_t *node, unsigned char *visbits, int *first_visible_leafnum); - -#endif // CMODEL_H +qboolean CM_HeadnodeVisible(mnode_t *node, unsigned char *visbits, int *first_visible_leafnum); \ No newline at end of file diff --git a/rehlds/engine/com_custom.h b/rehlds/engine/com_custom.h index 6bbb4db..b7f424d 100644 --- a/rehlds/engine/com_custom.h +++ b/rehlds/engine/com_custom.h @@ -26,18 +26,11 @@ * */ -#ifndef COM_CUSTOM_H -#define COM_CUSTOM_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "custom.h" - void COM_ClearCustomizationList(customization_t *pHead, qboolean bCleanDecals); qboolean COM_CreateCustomization(customization_t *pListHead, resource_t *pResource, int playernumber, int flags, customization_t **pCustomization, int *nLumps); -int COM_SizeofResourceList(resource_t *pList, resourceinfo_t *ri); - -#endif // COM_CUSTOM_H +int COM_SizeofResourceList(resource_t *pList, resourceinfo_t *ri); \ No newline at end of file diff --git a/rehlds/engine/common.h b/rehlds/engine/common.h index 6c30045..5b95e1a 100644 --- a/rehlds/engine/common.h +++ b/rehlds/engine/common.h @@ -1,4 +1,3 @@ -#pragma once /* * * This program is free software; you can redistribute it and/or modify it @@ -26,6 +25,9 @@ * version. * */ + +#pragma once + #include "common_rehlds.h" #include "bspfile.h" #include "FileSystem.h" @@ -346,4 +348,4 @@ void COM_Munge2(unsigned char *data, int len, int seq); void COM_UnMunge2(unsigned char *data, int len, int seq); void COM_Munge3(unsigned char *data, int len, int seq); NOXREF void COM_UnMunge3(unsigned char *data, int len, int seq); -unsigned int COM_GetApproxWavePlayLength(const char *filepath); +unsigned int COM_GetApproxWavePlayLength(const char *filepath); \ No newline at end of file diff --git a/rehlds/engine/consistency.h b/rehlds/engine/consistency.h index 2854563..de776b4 100644 --- a/rehlds/engine/consistency.h +++ b/rehlds/engine/consistency.h @@ -26,11 +26,7 @@ * */ -#ifndef CONSISTENCY_H -#define CONSISTENCY_H -#ifdef _WIN32 #pragma once -#endif #define MAX_CONSISTENCY_LIST 512 @@ -43,6 +39,4 @@ typedef struct consistency_s int check_type; float mins[3]; float maxs[3]; -} consistency_t; - -#endif // CONSISTENCY_H +} consistency_t; \ No newline at end of file diff --git a/rehlds/engine/custom_int.h b/rehlds/engine/custom_int.h index 44fa5d3..9d8d648 100644 --- a/rehlds/engine/custom_int.h +++ b/rehlds/engine/custom_int.h @@ -12,10 +12,13 @@ * without written permission from Valve LLC. * ****/ + // Customization.h + #pragma once + #include "custom.h" void COM_ClearCustomizationList( struct customization_s *pHead, qboolean bCleanDecals); 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 ); +int COM_SizeofResourceList ( struct resource_s *pList, struct resourceinfo_s *ri ); \ No newline at end of file diff --git a/rehlds/engine/cvar.h b/rehlds/engine/cvar.h index 3e97800..16cd283 100644 --- a/rehlds/engine/cvar.h +++ b/rehlds/engine/cvar.h @@ -26,17 +26,12 @@ * */ -#ifndef CVAR_H -#define CVAR_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "cvardef.h" #include "FileSystem.h" - #define MAX_CVAR_VALUE 1024 #ifdef HOOK_ENGINE @@ -66,6 +61,4 @@ void Cmd_CvarListPrintCvar(cvar_t *var, FileHandle_t f); void Cmd_CvarList_f(void); NOXREF int Cvar_CountServerVariables(void); void Cvar_UnlinkExternals(void); -void Cvar_CmdInit(void); - -#endif // CVAR_H +void Cvar_CmdInit(void); \ No newline at end of file diff --git a/rehlds/engine/decal.h b/rehlds/engine/decal.h index c91bafc..292fcec 100644 --- a/rehlds/engine/decal.h +++ b/rehlds/engine/decal.h @@ -26,11 +26,7 @@ * */ -#ifndef DECAL_H -#define DECAL_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "model.h" @@ -98,6 +94,4 @@ NOXREF qboolean Draw_CacheReload(cachewad_t *wad, int i, lumpinfo_t *pLump, cach qboolean Draw_ValidateCustomLogo(cachewad_t *wad, unsigned char *data, lumpinfo_t *lump); qboolean Draw_CacheLoadFromCustom(char *clean, cachewad_t *wad, void *raw, int rawsize, cachepic_t *pic); NOXREF int Draw_CacheIndex(cachewad_t *wad, char *path); -NOXREF int Draw_CacheFindIndex(cachewad_t *wad, char *path); - -#endif // DECAL_H +NOXREF int Draw_CacheFindIndex(cachewad_t *wad, char *path); \ No newline at end of file diff --git a/rehlds/engine/delta.h b/rehlds/engine/delta.h index 953530e..0712a4f 100644 --- a/rehlds/engine/delta.h +++ b/rehlds/engine/delta.h @@ -25,6 +25,7 @@ * version. * */ + #pragma once #include "maintypes.h" @@ -162,4 +163,4 @@ void DELTA_ClearStats_f(void); void DELTA_PrintStats(const char *name, delta_t *p); void DELTA_DumpStats_f(void); void DELTA_Init(void); -void DELTA_Shutdown(void); +void DELTA_Shutdown(void); \ No newline at end of file diff --git a/rehlds/engine/delta_packet.h b/rehlds/engine/delta_packet.h index 48e4dfd..68bfef5 100644 --- a/rehlds/engine/delta_packet.h +++ b/rehlds/engine/delta_packet.h @@ -26,11 +26,7 @@ * */ -#ifndef DELTA_PACKET_H -#define DELTA_PACKET_H -#ifdef _WIN32 #pragma once -#endif #include "entity_state.h" @@ -39,6 +35,4 @@ typedef struct packet_entities_s int num_entities; unsigned char flags[32]; entity_state_t *entities; -} packet_entities_t; - -#endif // DELTA_PACKET_H +} packet_entities_t; \ No newline at end of file diff --git a/rehlds/engine/ed_strpool.h b/rehlds/engine/ed_strpool.h index 969f834..7ebc675 100644 --- a/rehlds/engine/ed_strpool.h +++ b/rehlds/engine/ed_strpool.h @@ -5,4 +5,4 @@ extern char* Ed_StrPool_Alloc(const char* str); extern void Ed_StrPool_Reset(); -extern void Ed_StrPool_Init(); +extern void Ed_StrPool_Init(); \ No newline at end of file diff --git a/rehlds/engine/event.h b/rehlds/engine/event.h index 0f72237..7f684ad 100644 --- a/rehlds/engine/event.h +++ b/rehlds/engine/event.h @@ -26,11 +26,7 @@ * */ -#ifndef EVENT_H -#define EVENT_H -#ifdef _WIN32 #pragma once -#endif typedef struct event_s { @@ -38,6 +34,4 @@ typedef struct event_s const char *filename; int filesize; const char *pszScript; -} event_t; - -#endif // EVENT_H +} event_t; \ No newline at end of file diff --git a/rehlds/engine/filesystem_.h b/rehlds/engine/filesystem_.h index d548bda..fae8635 100644 --- a/rehlds/engine/filesystem_.h +++ b/rehlds/engine/filesystem_.h @@ -26,11 +26,7 @@ * */ -#ifndef FILESYSTEM__H -#define FILESYSTEM__H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "iregistry.h" @@ -66,6 +62,4 @@ void CheckLiblistForFallbackDir(const char *pGameDir, bool bLanguage, const char int FileSystem_SetGameDirectory(const char *pDefaultDir, const char *pGameDir); int FileSystem_AddFallbackGameDir(const char *pGameDir); int FileSystem_Init(char *basedir, void *voidfilesystemFactory); -void FileSystem_Shutdown(void); - -#endif // FILESYSTEM__H +void FileSystem_Shutdown(void); \ No newline at end of file diff --git a/rehlds/engine/filesystem_internal.h b/rehlds/engine/filesystem_internal.h index f74bf0b..4e8b0de 100644 --- a/rehlds/engine/filesystem_internal.h +++ b/rehlds/engine/filesystem_internal.h @@ -26,11 +26,7 @@ * */ -#ifndef _FILESYSTEM_INTERNAL_H -#define _FILESYSTEM_INTERNAL_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "FileSystem.h" @@ -87,7 +83,4 @@ void *FS_GetReadBuffer(FileHandle_t file, int *outBufSize); void FS_ReleaseReadBuffer(FileHandle_t file, void *buffer); void FS_Unlink(const char *filename); void FS_Rename(const char *originalName, const char *newName); -void *FS_LoadLibrary(const char *dllName); - -#endif // _FILESYSTEM_INTERNAL_H - +void *FS_LoadLibrary(const char *dllName); \ No newline at end of file diff --git a/rehlds/engine/filter.h b/rehlds/engine/filter.h index 326825d..5dd4f5f 100644 --- a/rehlds/engine/filter.h +++ b/rehlds/engine/filter.h @@ -26,11 +26,7 @@ * */ -#ifndef FILTER_H -#define FILTER_H -#ifdef _WIN32 #pragma once -#endif #include "userid.h" @@ -61,6 +57,4 @@ typedef struct userfilter_s USERID_t userid; float banEndTime; float banTime; -} userfilter_t; - -#endif // FILTER_H +} userfilter_t; \ No newline at end of file diff --git a/rehlds/engine/hashpak.h b/rehlds/engine/hashpak.h index 1aa7d6d..37c7111 100644 --- a/rehlds/engine/hashpak.h +++ b/rehlds/engine/hashpak.h @@ -26,11 +26,7 @@ * */ -#ifndef HASHPAK_H -#define HASHPAK_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "custom.h" @@ -100,6 +96,4 @@ void HPAK_Init(void); NOXREF char *HPAK_GetItem(int item); void HPAK_CheckSize(char *pakname); void HPAK_ValidatePak(char *fullpakname); -void HPAK_CheckIntegrity(char *pakname); - -#endif // HASHPAK_H +void HPAK_CheckIntegrity(char *pakname); \ No newline at end of file diff --git a/rehlds/engine/host.h b/rehlds/engine/host.h index 9081532..729ebf4 100644 --- a/rehlds/engine/host.h +++ b/rehlds/engine/host.h @@ -26,11 +26,7 @@ * */ -#ifndef HOST_H -#define HOST_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "filesystem_internal.h" @@ -149,6 +145,4 @@ qboolean Host_IsSinglePlayerGame(void); qboolean Host_IsServerActive(void); void Host_Version(void); int Host_Init(quakeparms_t *parms); -void Host_Shutdown(void); - -#endif // HOST_H +void Host_Shutdown(void); \ No newline at end of file diff --git a/rehlds/engine/host_cmd.h b/rehlds/engine/host_cmd.h index c877307..f017051 100644 --- a/rehlds/engine/host_cmd.h +++ b/rehlds/engine/host_cmd.h @@ -26,11 +26,7 @@ * */ -#ifndef HOST_CMD_H -#define HOST_CMD_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "eiface.h" @@ -211,6 +207,4 @@ void Host_VoiceRecordStop_f(void); void Host_Crash_f(void); void Host_InitCommands(void); void SV_CheckBlendingInterface(void); -void SV_CheckSaveGameCommentInterface(void); - -#endif // HOST_CMD_H +void SV_CheckSaveGameCommentInterface(void); \ No newline at end of file diff --git a/rehlds/engine/iengine.h b/rehlds/engine/iengine.h index 2867770..0318794 100644 --- a/rehlds/engine/iengine.h +++ b/rehlds/engine/iengine.h @@ -26,11 +26,7 @@ * */ -#ifndef IENGINE_H -#define IENGINE_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -68,6 +64,4 @@ public: virtual void SetQuitting(int quittype) = 0; }; -extern IEngine *eng; - -#endif // IENGINE_H +extern IEngine *eng; \ No newline at end of file diff --git a/rehlds/engine/igame.h b/rehlds/engine/igame.h index a415fd7..d45c121 100644 --- a/rehlds/engine/igame.h +++ b/rehlds/engine/igame.h @@ -49,4 +49,4 @@ public: virtual void PlayAVIAndWait(const char *aviFile) = 0; virtual void SetCursorVisible(bool bState) = 0; -}; +}; \ No newline at end of file diff --git a/rehlds/engine/info.h b/rehlds/engine/info.h index e2d39db..44ce10a 100644 --- a/rehlds/engine/info.h +++ b/rehlds/engine/info.h @@ -26,17 +26,13 @@ * */ -#ifndef INFO__H -#define INFO__H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" - // Max key/value length (with a NULL char) #define MAX_KV_LEN 127 + // Key + value + 2 x slash + NULL #define MAX_INFO_STRING 256 @@ -59,6 +55,4 @@ void Info_Print(const char *s); qboolean Info_IsValid(const char *s); #ifdef REHLDS_FIXES void Info_CollectFields(char *destInfo, const char *srcInfo, const char *collectedKeysOfFields); -#endif - -#endif // INFO__H +#endif \ No newline at end of file diff --git a/rehlds/engine/inst_baseline.h b/rehlds/engine/inst_baseline.h index 3f4ea66..9541577 100644 --- a/rehlds/engine/inst_baseline.h +++ b/rehlds/engine/inst_baseline.h @@ -26,11 +26,7 @@ * */ -#ifndef INST_BASELINE_H -#define INST_BASELINE_H -#ifdef _WIN32 #pragma once -#endif #include "entity_state.h" @@ -41,6 +37,4 @@ typedef struct extra_baselines_s int number; int classname[NUM_BASELINES]; entity_state_t baseline[NUM_BASELINES]; -} extra_baselines_t; - -#endif // INST_BASELINE_H +} extra_baselines_t; \ No newline at end of file diff --git a/rehlds/engine/ipratelimit.h b/rehlds/engine/ipratelimit.h index 7267337..72f9e8e 100644 --- a/rehlds/engine/ipratelimit.h +++ b/rehlds/engine/ipratelimit.h @@ -26,11 +26,7 @@ * */ -#ifndef IPRATELIMIT_H -#define IPRATELIMIT_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "net.h" @@ -69,6 +65,4 @@ private: bool LessIP(const struct iprate_s &, const struct iprate_s &); }; -//extern bool (__fastcall *pCIPRateLimit__CheckIP)(CIPRateLimit *obj, int none, netadr_t adr); - -#endif // IPRATELIMIT_H +//extern bool (__fastcall *pCIPRateLimit__CheckIP)(CIPRateLimit *obj, int none, netadr_t adr); \ No newline at end of file diff --git a/rehlds/engine/ipratelimitWrapper.h b/rehlds/engine/ipratelimitWrapper.h index 065d6d2..aa1451a 100644 --- a/rehlds/engine/ipratelimitWrapper.h +++ b/rehlds/engine/ipratelimitWrapper.h @@ -25,6 +25,7 @@ * version. * */ + #pragma once #include "maintypes.h" @@ -39,8 +40,4 @@ extern int(*pCheckIP)(netadr_t adr); extern class CIPRateLimit rateChecker; - -int CheckIP(netadr_t adr); - - - +int CheckIP(netadr_t adr); \ No newline at end of file diff --git a/rehlds/engine/keys.h b/rehlds/engine/keys.h index 0c53a2d..ef199b4 100644 --- a/rehlds/engine/keys.h +++ b/rehlds/engine/keys.h @@ -4,4 +4,4 @@ typedef enum { key_game = 0, key_message = 1, key_menu = 2, -} keydest_t; +} keydest_t; \ No newline at end of file diff --git a/rehlds/engine/l_studio.h b/rehlds/engine/l_studio.h index cdf35a1..660a15d 100644 --- a/rehlds/engine/l_studio.h +++ b/rehlds/engine/l_studio.h @@ -26,11 +26,7 @@ * */ -#ifndef L_STUDIO_H -#define L_STUDIO_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "studio_rehlds.h" @@ -47,7 +43,4 @@ //extern int giTextureSize; - -void Mod_LoadStudioModel(model_t * mod, void * buffer); - -#endif // L_STUDIO_H +void Mod_LoadStudioModel(model_t * mod, void * buffer); \ No newline at end of file diff --git a/rehlds/engine/mathlib_e.h b/rehlds/engine/mathlib_e.h index 87978e5..ce89bf4 100644 --- a/rehlds/engine/mathlib_e.h +++ b/rehlds/engine/mathlib_e.h @@ -26,11 +26,7 @@ * */ -#ifndef MATHLIB_E_H -#define MATHLIB_E_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "model.h" @@ -40,7 +36,7 @@ // left / right #define YAW 1 // fall over -#define ROLL 2 +#define ROLL 2 #define RAD2DEG(x) ((float)(x) * (float)(180.f / M_PI)) #define DEG2RAD(x) ((float)(x) * (float)(M_PI / 180.f)) @@ -49,7 +45,6 @@ #define vec3_origin (*pvec3_origin) #endif // HOOK_ENGINE - extern vec3_t vec3_origin; static const int nanmask = 0x7F800000; @@ -145,6 +140,4 @@ NOBODY void R_ConcatRotations(float *in1, float *in2, float *out); void R_ConcatTransforms(float in1[3][4], float in2[3][4], float out[3][4]); NOBODY void FloorDivMod(double numer, double denom, int *quotient, int *rem); NOBODY int GreatestCommonDivisor(int i1, int i2); -NOBODY fixed16_t Invert24To16(fixed16_t val); - -#endif // MATHLIB_E_H +NOBODY fixed16_t Invert24To16(fixed16_t val); \ No newline at end of file diff --git a/rehlds/engine/mem.h b/rehlds/engine/mem.h index 65b40a9..537c369 100644 --- a/rehlds/engine/mem.h +++ b/rehlds/engine/mem.h @@ -26,18 +26,11 @@ * */ -#ifndef MEM__H -#define MEM__H -#ifdef _WIN32 #pragma once -#endif - void *Mem_Malloc(size_t size); void *Mem_ZeroMalloc(size_t size); void *Mem_Realloc(void *memblock, size_t size); void *Mem_Calloc(int num, size_t size); char *Mem_Strdup(const char *strSource); -void Mem_Free(void *p); - -#endif // MEM__H +void Mem_Free(void *p); \ No newline at end of file diff --git a/rehlds/engine/model_rehlds.h b/rehlds/engine/model_rehlds.h index 57e17c5..698ca27 100644 --- a/rehlds/engine/model_rehlds.h +++ b/rehlds/engine/model_rehlds.h @@ -25,6 +25,7 @@ * version. * */ + #pragma once /* @@ -115,4 +116,4 @@ NOXREF void Mod_UnloadSpriteTextures(model_t *pModel); void Mod_Print(void); NOXREF void Mod_ChangeGame(void); model_t *Mod_Handle(int modelindex); -modtype_t Mod_GetType(int modelindex); +modtype_t Mod_GetType(int modelindex); \ No newline at end of file diff --git a/rehlds/engine/modinfo.h b/rehlds/engine/modinfo.h index 78da996..b45d297 100644 --- a/rehlds/engine/modinfo.h +++ b/rehlds/engine/modinfo.h @@ -26,11 +26,7 @@ * */ -#ifndef MODINFO_H -#define MODINFO_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -55,6 +51,4 @@ typedef struct modinfo_s MOD_GAMEPLAY_TYPE_E type; int num_edicts; qboolean clientcrccheck; -} modinfo_t; - -#endif // MODINFO_H +} modinfo_t; \ No newline at end of file diff --git a/rehlds/engine/net.h b/rehlds/engine/net.h index 3b5d14d..e700189 100644 --- a/rehlds/engine/net.h +++ b/rehlds/engine/net.h @@ -26,18 +26,13 @@ * */ -#ifndef GS_NET_H -#define GS_NET_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "common.h" #include "enums.h" #include "netadr.h" - #define PROTOCOL_VERSION 48 // MAX_CHALLENGES is made large to prevent a denial @@ -402,6 +397,4 @@ typedef struct netchan_s #define Con_NetPrintf Con_DPrintf #else // REHLDS_FIXES #define Con_NetPrintf Con_Printf -#endif // REHLDS_FIXES - -#endif // GS_NET_H +#endif // REHLDS_FIXES \ No newline at end of file diff --git a/rehlds/engine/net_chan.h b/rehlds/engine/net_chan.h index 74911ea..4dad5ce 100644 --- a/rehlds/engine/net_chan.h +++ b/rehlds/engine/net_chan.h @@ -26,17 +26,12 @@ * */ -#ifndef NET_CHAN_H -#define NET_CHAN_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "cvar.h" #include "net.h" - #ifdef HOOK_ENGINE #define gDownloadFile (*pgDownloadFile) @@ -63,8 +58,6 @@ extern cvar_t net_chokeloopback; extern cvar_t sv_filetransfercompression; extern cvar_t sv_filetransfermaxsize; - - void Netchan_UnlinkFragment(fragbuf_t *buf, fragbuf_t **list); void Netchan_OutOfBand(netsrc_t sock, netadr_t adr, int length, byte *data); void Netchan_OutOfBandPrint(netsrc_t sock, netadr_t adr, char *format, ...); @@ -99,6 +92,4 @@ qboolean Netchan_IncomingReady(netchan_t *chan); NOXREF void Netchan_UpdateProgress(netchan_t *chan); void Netchan_Init(void); NOXREF qboolean Netchan_CompressPacket(sizebuf_t *chan); -NOXREF qboolean Netchan_DecompressPacket(sizebuf_t *chan); - -#endif // NET_CHAN_H +NOXREF qboolean Netchan_DecompressPacket(sizebuf_t *chan); \ No newline at end of file diff --git a/rehlds/engine/net_ws.h b/rehlds/engine/net_ws.h index 0ed75df..dffeae0 100644 --- a/rehlds/engine/net_ws.h +++ b/rehlds/engine/net_ws.h @@ -26,11 +26,7 @@ * */ -#ifndef NET_WS_H -#define NET_WS_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "enums.h" @@ -268,6 +264,4 @@ void NET_Init(void); void NET_ClearLagData(qboolean bClient, qboolean bServer); void NET_Shutdown(void); qboolean NET_JoinGroup(netsrc_t sock, netadr_t& addr); -qboolean NET_LeaveGroup(netsrc_t sock, netadr_t& addr); - -#endif // NET_WS_H +qboolean NET_LeaveGroup(netsrc_t sock, netadr_t& addr); \ No newline at end of file diff --git a/rehlds/engine/pmove.h b/rehlds/engine/pmove.h index 84b5c7f..afe03b7 100644 --- a/rehlds/engine/pmove.h +++ b/rehlds/engine/pmove.h @@ -26,11 +26,7 @@ * */ -#ifndef PMOVE_H -#define PMOVE_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "cvar.h" @@ -60,6 +56,4 @@ extern movevars_t movevars; qboolean PM_AddToTouched(pmtrace_t tr, vec_t *impactvelocity); void PM_StuckTouch(int hitent, pmtrace_t *ptraceresult); -void PM_Init(playermove_t *ppm); - -#endif // PMOVE_H +void PM_Init(playermove_t *ppm); \ No newline at end of file diff --git a/rehlds/engine/pmovetst.h b/rehlds/engine/pmovetst.h index e48df8e..c4da8af 100644 --- a/rehlds/engine/pmovetst.h +++ b/rehlds/engine/pmovetst.h @@ -26,18 +26,13 @@ * */ -#ifndef PMOVETST_H -#define PMOVETST_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "pm_defs.h" #include "model.h" #include "world.h" - #ifdef HOOK_ENGINE #define g_contentsresult (*pg_contentsresult) #define box_hull_0 (*pbox_hull_0) @@ -50,8 +45,6 @@ extern hull_t box_hull_0; extern box_clipnodes_t box_clipnodes_0; extern box_planes_t box_planes_0; - - float PM_TraceModel(physent_t *pEnt, vec_t *start, vec_t *end, trace_t *trace); void PM_GetModelBounds(struct model_s *mod, vec_t *mins, vec_t *maxs); int PM_GetModelType(struct model_s *mod); @@ -72,6 +65,4 @@ pmtrace_t PM_PlayerTrace(vec_t *start, vec_t *end, int traceFlags, int ignore_pe pmtrace_t PM_PlayerTraceEx(vec_t *start, vec_t *end, int traceFlags, int(*pfnIgnore)(physent_t *)); struct pmtrace_s *PM_TraceLine(float *start, float *end, int flags, int usehull, int ignore_pe); struct pmtrace_s *PM_TraceLineEx(float *start, float *end, int flags, int usehull, int(*pfnIgnore)(physent_t *)); -qboolean PM_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, const vec_t *p1, const vec_t *p2, pmtrace_t *trace); - -#endif // PMOVETST_H +qboolean PM_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, const vec_t *p1, const vec_t *p2, pmtrace_t *trace); \ No newline at end of file diff --git a/rehlds/engine/pr_cmds.h b/rehlds/engine/pr_cmds.h index 620561f..062e153 100644 --- a/rehlds/engine/pr_cmds.h +++ b/rehlds/engine/pr_cmds.h @@ -26,11 +26,7 @@ * */ -#ifndef PR_CMDS_H -#define PR_CMDS_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "const.h" @@ -39,9 +35,9 @@ #include "common.h" #include "server.h" - #define MAX_RANDOM_RANGE 0x7FFFFFFFUL +// TODO: Make enum with bits #define AMBIENT_SOUND_STATIC 0 // medium radius attenuation #define AMBIENT_SOUND_EVERYWHERE 1 #define AMBIENT_SOUND_SMALLRADIUS 2 @@ -214,6 +210,4 @@ NOXREF void QueryClientCvarValueCmd2(void); void QueryClientCvarValue(const edict_t *player, const char *cvarName); void QueryClientCvarValue2(const edict_t *player, const char *cvarName, int requestID); int hudCheckParm(char *parm, char **ppnext); -int EngCheckParm(const char *pchCmdLineToken, char **pchNextVal); - -#endif // PR_CMDS_H +int EngCheckParm(const char *pchCmdLineToken, char **pchNextVal); \ No newline at end of file diff --git a/rehlds/engine/pr_dlls.h b/rehlds/engine/pr_dlls.h index 2cc7b4d..184cf35 100644 --- a/rehlds/engine/pr_dlls.h +++ b/rehlds/engine/pr_dlls.h @@ -26,11 +26,7 @@ * */ -#ifndef PR_DLLS_H -#define PR_DLLS_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "eiface.h" @@ -50,6 +46,4 @@ typedef struct extensiondll_s typedef void(*ENTITYINIT)(struct entvars_s *); typedef void(*DISPATCHFUNCTION)(struct entvars_s *, void *); -typedef void(*FIELDIOFUNCTION)(SAVERESTOREDATA *, const char *, void *, TYPEDESCRIPTION *, int); - -#endif // PR_DLLS_H +typedef void(*FIELDIOFUNCTION)(SAVERESTOREDATA *, const char *, void *, TYPEDESCRIPTION *, int); \ No newline at end of file diff --git a/rehlds/engine/pr_edict.h b/rehlds/engine/pr_edict.h index e610394..de554ed 100644 --- a/rehlds/engine/pr_edict.h +++ b/rehlds/engine/pr_edict.h @@ -26,18 +26,13 @@ * */ -#ifndef PR_EDICT_H -#define PR_EDICT_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "cvar.h" #include "pm_defs.h" #include "progdefs.h" - void ED_ClearEdict(edict_t *e); edict_t *ED_Alloc(void); void ED_Free(edict_t *ed); @@ -70,6 +65,4 @@ void CVarSetString(const char *szVarName, const char *szValue); void CVarRegister(cvar_t *pCvar); int AllocEngineString(const char *szValue); void SaveSpawnParms(edict_t *pEdict); -void *GetModelPtr(edict_t *pEdict); - -#endif // PR_EDICT_H +void *GetModelPtr(edict_t *pEdict); \ No newline at end of file diff --git a/rehlds/engine/server.h b/rehlds/engine/server.h index e02c3e7..b0ebf80 100644 --- a/rehlds/engine/server.h +++ b/rehlds/engine/server.h @@ -26,11 +26,7 @@ * */ -#ifndef SERVER_H -#define SERVER_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -81,6 +77,7 @@ #define MSG_FL_ONE BIT(7) // Send to single client #define RESOURCE_INDEX_BITS 12 + #ifdef REHLDS_FIXES #define RESOURCE_MAX_COUNT (1 << RESOURCE_INDEX_BITS) #endif // REHLDS_FIXES @@ -803,6 +800,4 @@ char *SV_GetIDString_internal(USERID_t *id); char *SV_GetClientIDString(client_t *client); int GetGameAppID(void); qboolean IsGameSubscribed(const char *gameName); -NOXREF qboolean BIsValveGame(void); - -#endif // SERVER_H +NOXREF qboolean BIsValveGame(void); \ No newline at end of file diff --git a/rehlds/engine/server_static.h b/rehlds/engine/server_static.h index 6ff4663..1b608db 100644 --- a/rehlds/engine/server_static.h +++ b/rehlds/engine/server_static.h @@ -26,11 +26,7 @@ * */ -#ifndef SERVER_STATIC_H -#define SERVER_STATIC_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "netadr.h" @@ -74,6 +70,4 @@ typedef struct server_static_s double next_sampletime; server_stats_t stats; qboolean isSecure; -} server_static_t; - -#endif // SERVER_STATIC_H +} server_static_t; \ No newline at end of file diff --git a/rehlds/engine/sound.h b/rehlds/engine/sound.h index 3ec319e..c7edc24 100644 --- a/rehlds/engine/sound.h +++ b/rehlds/engine/sound.h @@ -26,11 +26,7 @@ * */ -#ifndef SOUND_H -#define SOUND_H -#ifdef _WIN32 #pragma once -#endif #include "quakedef.h" @@ -68,6 +64,4 @@ qboolean Voice_IsRecording(); void Voice_RegisterCvars(); void Voice_Deinit(); void Voice_Idle(float frametime); -qboolean Voice_RecordStop(); - -#endif // SOUND_H \ No newline at end of file +qboolean Voice_RecordStop(); \ No newline at end of file diff --git a/rehlds/engine/sse_mathfun.h b/rehlds/engine/sse_mathfun.h index 24fd11c..33c539f 100644 --- a/rehlds/engine/sse_mathfun.h +++ b/rehlds/engine/sse_mathfun.h @@ -117,4 +117,4 @@ extern v4sf log_ps(v4sf x); extern v4sf exp_ps(v4sf x); extern v4sf sin_ps(v4sf x); extern v4sf cos_ps(v4sf x); -extern void sincos_ps(v4sf x, v4sf *s, v4sf *c); +extern void sincos_ps(v4sf x, v4sf *s, v4sf *c); \ No newline at end of file diff --git a/rehlds/engine/studio_rehlds.h b/rehlds/engine/studio_rehlds.h index a52ee38..b224bb9 100644 --- a/rehlds/engine/studio_rehlds.h +++ b/rehlds/engine/studio_rehlds.h @@ -14,7 +14,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #pragma once + #include "studio.h" #include "model.h" #include "r_studioint.h" @@ -104,4 +106,4 @@ void R_StudioBoundBone(vec_t *mins, vec_t *maxs, int *bonecount, const vec_t *po void R_StudioAccumulateBoneVerts(vec_t *mins, vec_t *maxs, int *vertcount, vec_t *bone_mins, vec_t *bone_maxs, int *bonecount); int R_StudioComputeBounds(unsigned char *pBuffer, float *mins, float *maxs); int R_GetStudioBounds(const char *filename, float *mins, float *maxs); -void R_ResetSvBlending(void); +void R_ResetSvBlending(void); \ No newline at end of file diff --git a/rehlds/engine/sv_log.h b/rehlds/engine/sv_log.h index 1acd8b1..166a0ad 100644 --- a/rehlds/engine/sv_log.h +++ b/rehlds/engine/sv_log.h @@ -26,11 +26,7 @@ * */ -#ifndef SV_LOG_H -#define SV_LOG_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -53,6 +49,4 @@ void Log_Open(void); void SV_SetLogAddress_f(void); void SV_AddLogAddress_f(void); void SV_DelLogAddress_f(void); -void SV_ServerLog_f(void); - -#endif // SV_LOG_H +void SV_ServerLog_f(void); \ No newline at end of file diff --git a/rehlds/engine/sv_move.h b/rehlds/engine/sv_move.h index e510c35..c8493cf 100644 --- a/rehlds/engine/sv_move.h +++ b/rehlds/engine/sv_move.h @@ -26,11 +26,7 @@ * */ -#ifndef SV_MOVE_H -#define SV_MOVE_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "server.h" @@ -57,6 +53,4 @@ NOXREF void SV_NewChaseDir(edict_t *actor, edict_t *enemy, float dist); NOXREF qboolean SV_CloseEnough(edict_t *ent, edict_t *goal, float dist); NOXREF qboolean SV_ReachedGoal(edict_t *ent, vec_t *vecGoal, float flDist); void SV_NewChaseDir2(edict_t *actor, vec_t *vecGoal, float dist); -void SV_MoveToOrigin_I(edict_t *ent, const float *pflGoal, float dist, int iStrafe); - -#endif // SV_MOVE_H +void SV_MoveToOrigin_I(edict_t *ent, const float *pflGoal, float dist, int iStrafe); \ No newline at end of file diff --git a/rehlds/engine/sv_phys.h b/rehlds/engine/sv_phys.h index ee7f203..c80edd2 100644 --- a/rehlds/engine/sv_phys.h +++ b/rehlds/engine/sv_phys.h @@ -26,11 +26,7 @@ * */ -#ifndef SV_PHYS_H -#define SV_PHYS_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "model.h" @@ -83,6 +79,4 @@ void SV_Physics_Toss(edict_t *ent); void PF_WaterMove(edict_t *pSelf); void SV_Physics_Step(edict_t *ent); void SV_Physics(void); -trace_t SV_Trace_Toss(edict_t *ent, edict_t *ignore); - -#endif // SV_PHYS_H +trace_t SV_Trace_Toss(edict_t *ent, edict_t *ignore); \ No newline at end of file diff --git a/rehlds/engine/sv_pmove.h b/rehlds/engine/sv_pmove.h index be94e99..4a4a1c8 100644 --- a/rehlds/engine/sv_pmove.h +++ b/rehlds/engine/sv_pmove.h @@ -26,16 +26,10 @@ * */ -#ifndef SV_PMOVE_H -#define SV_PMOVE_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" void PM_SV_PlaybackEventFull(int flags, int clientindex, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2); void PM_SV_PlaySound(int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch); -const char *PM_SV_TraceTexture(int ground, vec_t *vstart, vec_t *vend); - -#endif // SV_PMOVE_H +const char *PM_SV_TraceTexture(int ground, vec_t *vstart, vec_t *vend); \ No newline at end of file diff --git a/rehlds/engine/sv_remoteaccess.h b/rehlds/engine/sv_remoteaccess.h index 1926742..091d4eb 100644 --- a/rehlds/engine/sv_remoteaccess.h +++ b/rehlds/engine/sv_remoteaccess.h @@ -25,6 +25,7 @@ * version. * */ + #pragma once #include "maintypes.h" @@ -71,4 +72,4 @@ public: extern class CServerRemoteAccess g_ServerRemoteAccess; -extern void NotifyDedicatedServerUI(const char *message); +extern void NotifyDedicatedServerUI(const char *message); \ No newline at end of file diff --git a/rehlds/engine/sv_steam3.h b/rehlds/engine/sv_steam3.h index dbd3e18..e955a1a 100644 --- a/rehlds/engine/sv_steam3.h +++ b/rehlds/engine/sv_steam3.h @@ -26,11 +26,7 @@ * */ -#ifndef SV_STEAM3_H -#define SV_STEAM3_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "common.h" @@ -166,6 +162,4 @@ const char *Steam_GetGSUniverse(); CSteam3Server *Steam3Server(); CSteam3Client *Steam3Client(); void Master_SetMaster_f(); -void Steam_HandleIncomingPacket(byte *data, int len, int fromip, uint16 port); - -#endif // SV_STEAM3_H +void Steam_HandleIncomingPacket(byte *data, int len, int fromip, uint16 port); \ No newline at end of file diff --git a/rehlds/engine/sv_upld.h b/rehlds/engine/sv_upld.h index 7436449..a982bb9 100644 --- a/rehlds/engine/sv_upld.h +++ b/rehlds/engine/sv_upld.h @@ -26,15 +26,10 @@ * */ -#ifndef SV_UPLD__H -#define SV_UPLD__H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" - qboolean SV_CheckFile(sizebuf_t *msg, char *filename); void SV_ClearResourceLists(client_t *cl); void SV_CreateCustomizationList(client_t *pHost); @@ -49,6 +44,4 @@ void SV_RequestMissingResourcesFromClients(void); qboolean SV_UploadComplete(client_t *cl); void SV_BatchUploadRequest(client_t *cl); qboolean SV_RequestMissingResources(void); - void SV_ParseResourceList(client_t *pSenderClient); - -#endif // SV_UPLD__H +void SV_ParseResourceList(client_t *pSenderClient); \ No newline at end of file diff --git a/rehlds/engine/sv_user.h b/rehlds/engine/sv_user.h index eee361f..1ba4e04 100644 --- a/rehlds/engine/sv_user.h +++ b/rehlds/engine/sv_user.h @@ -26,11 +26,7 @@ * */ -#ifndef SV_USER_H -#define SV_USER_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "server.h" @@ -150,6 +146,4 @@ void SV_ExecuteClientMessage(client_t *cl); qboolean SV_SetPlayer(int idnum); void SV_ShowServerinfo_f(void); void SV_SendEnts_f(void); -void SV_FullUpdate_f(void); - -#endif // SV_USER_H +void SV_FullUpdate_f(void); \ No newline at end of file diff --git a/rehlds/engine/sys_dll.h b/rehlds/engine/sys_dll.h index ca009ae..73040f3 100644 --- a/rehlds/engine/sys_dll.h +++ b/rehlds/engine/sys_dll.h @@ -25,6 +25,7 @@ * version. * */ + #pragma once #include "maintypes.h" @@ -198,4 +199,4 @@ void Con_Init(void); void Con_DebugLog(const char *file, const char *fmt, ...); void Con_Printf(const char *fmt, ...); void Con_SafePrintf(const char *fmt, ...); -void Con_DPrintf(const char *fmt, ...); +void Con_DPrintf(const char *fmt, ...); \ No newline at end of file diff --git a/rehlds/engine/sys_dll2.h b/rehlds/engine/sys_dll2.h index ff10e92..e5954df 100644 --- a/rehlds/engine/sys_dll2.h +++ b/rehlds/engine/sys_dll2.h @@ -26,11 +26,7 @@ * */ -#ifndef SYS_DLL2_H -#define SYS_DLL2_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "interface.h" @@ -119,6 +115,4 @@ void Sys_ShutdownGame(); void ClearIOStates(); // TODO: Needs rechecking -//NOXREF int BuildMapCycleListHints(char **hints); - -#endif // SYS_DLL2_H +//NOXREF int BuildMapCycleListHints(char **hints); \ No newline at end of file diff --git a/rehlds/engine/sys_engine.h b/rehlds/engine/sys_engine.h index eb1ea44..ab65604 100644 --- a/rehlds/engine/sys_engine.h +++ b/rehlds/engine/sys_engine.h @@ -28,7 +28,6 @@ #pragma once - #include "maintypes.h" #include "igame.h" #include "iengine.h" @@ -98,4 +97,4 @@ public: bool CheckDoneTrapping_noVirt(int& buttons, int& keys); int GetQuitting_noVirt(); void SetQuitting_noVirt(int quittype); -}; +}; \ No newline at end of file diff --git a/rehlds/engine/sys_linuxwnd.h b/rehlds/engine/sys_linuxwnd.h index 2b719b1..dd966f2 100644 --- a/rehlds/engine/sys_linuxwnd.h +++ b/rehlds/engine/sys_linuxwnd.h @@ -70,4 +70,4 @@ public: void PlayStartupVideos_noVirt(); void PlayAVIAndWait_noVirt(const char *aviFile); void SetCursorVisible_noVirt(bool bState); -}; +}; \ No newline at end of file diff --git a/rehlds/engine/textures.h b/rehlds/engine/textures.h index 0a50492..0308be6 100644 --- a/rehlds/engine/textures.h +++ b/rehlds/engine/textures.h @@ -26,11 +26,7 @@ * */ -#ifndef TEXTURES_H -#define TEXTURES_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "wad.h" @@ -79,6 +75,4 @@ qboolean TEX_InitFromWad(char *path); void TEX_CleanupWadInfo(void); int TEX_LoadLump(char *name, unsigned char *dest); int FindMiptex(char *name); -void TEX_AddAnimatingTextures(void); - -#endif // TEXTURES_H +void TEX_AddAnimatingTextures(void); \ No newline at end of file diff --git a/rehlds/engine/tmessage.h b/rehlds/engine/tmessage.h index 6d69cd8..b5cba54 100644 --- a/rehlds/engine/tmessage.h +++ b/rehlds/engine/tmessage.h @@ -26,11 +26,7 @@ * */ -#ifndef TMESSAGE_H -#define TMESSAGE_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -82,6 +78,4 @@ NOXREF int ParseDirective(const char *pText); NOXREF void TextMessageParse(unsigned char *pMemFile, int fileSize); NOXREF void TextMessageShutdown(void); NOXREF void TextMessageInit(void); -NOXREF client_textmessage_t *TextMessageGet(const char *pName); - -#endif // TMESSAGE_H +NOXREF client_textmessage_t *TextMessageGet(const char *pName); \ No newline at end of file diff --git a/rehlds/engine/traceinit.h b/rehlds/engine/traceinit.h index 2bdfc4c..9d1d439 100644 --- a/rehlds/engine/traceinit.h +++ b/rehlds/engine/traceinit.h @@ -26,11 +26,7 @@ * */ -#ifndef TRACEINIT_H -#define TRACEINIT_H -#ifdef _WIN32 #pragma once -#endif #include "utlvector.h" @@ -78,6 +74,4 @@ private: extern CInitTracker g_InitTracker; void TraceInit(const char *i, const char *s, int listnum); -void TraceShutdown(const char *s, int listnum); - -#endif // TRACEINIT_H +void TraceShutdown(const char *s, int listnum); \ No newline at end of file diff --git a/rehlds/engine/unicode_strtools.h b/rehlds/engine/unicode_strtools.h index cc51577..45aa5c9 100644 --- a/rehlds/engine/unicode_strtools.h +++ b/rehlds/engine/unicode_strtools.h @@ -26,11 +26,7 @@ * */ -#ifndef UNICODE_STR_TOOLS_H -#define UNICODE_STR_TOOLS_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -63,6 +59,4 @@ qboolean Q_UnicodeValidate(const char *pUTF8); char *Q_UnicodeAdvance(char *pUTF8, int nChars); qboolean Q_StripUnprintableAndSpace(char *pch);; qboolean V_UTF8ToUChar32(const char *pUTF8_, uchar32 *uValueOut); -int Q_UnicodeRepair(char *pUTF8); - -#endif // UNICODE_STR_TOOLS_H +int Q_UnicodeRepair(char *pUTF8); \ No newline at end of file diff --git a/rehlds/engine/userid.h b/rehlds/engine/userid.h index 884537c..0cc7a62 100644 --- a/rehlds/engine/userid.h +++ b/rehlds/engine/userid.h @@ -26,7 +26,6 @@ * */ - #pragma once -#include "userid_rehlds.h" +#include "userid_rehlds.h" \ No newline at end of file diff --git a/rehlds/engine/usermsg.h b/rehlds/engine/usermsg.h index bccc31a..49beb48 100644 --- a/rehlds/engine/usermsg.h +++ b/rehlds/engine/usermsg.h @@ -26,11 +26,7 @@ * */ -#ifndef USERMSG_H -#define USERMSG_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "quakedef.h" @@ -42,6 +38,4 @@ typedef struct _UserMsg char szName[16]; struct _UserMsg *next; pfnUserMsgHook pfn; -} UserMsg; - -#endif // USERMSG_H +} UserMsg; \ No newline at end of file diff --git a/rehlds/engine/vid_null.h b/rehlds/engine/vid_null.h index 5b17592..4629d30 100644 --- a/rehlds/engine/vid_null.h +++ b/rehlds/engine/vid_null.h @@ -59,4 +59,4 @@ void R_MarkLeaves(void); void R_InitTextures(void); void StartLoadingProgressBar(const char *loadingType, int numProgressPoints); void ContinueLoadingProgressBar(const char *loadingType, int progressPoint, float progressFraction); -void SetLoadingProgressBarStatusText(const char *statusText); +void SetLoadingProgressBarStatusText(const char *statusText); \ No newline at end of file diff --git a/rehlds/engine/wad.h b/rehlds/engine/wad.h index 9b86c78..624e17f 100644 --- a/rehlds/engine/wad.h +++ b/rehlds/engine/wad.h @@ -26,11 +26,7 @@ * */ -#ifndef WAD_H -#define WAD_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -86,6 +82,4 @@ lumpinfo_t *W_GetLumpinfo(int wad, char *name, qboolean doerror); void *W_GetLumpName(int wad, char *name); NOXREF void *W_GetLumpNum(int wad, int num); void W_Shutdown(void); -void SwapPic(qpic_t *pic); - -#endif // WAD_H +void SwapPic(qpic_t *pic); \ No newline at end of file diff --git a/rehlds/engine/world.h b/rehlds/engine/world.h index 8d67ac2..fa06094 100644 --- a/rehlds/engine/world.h +++ b/rehlds/engine/world.h @@ -26,11 +26,7 @@ * */ -#ifndef WORLD_H -#define WORLD_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" #include "model.h" @@ -117,6 +113,4 @@ trace_t SV_Move(const vec_t *start, const vec_t *mins, const vec_t *maxs, const #ifdef REHLDS_OPT_PEDANTIC trace_t SV_Move_Point(const vec_t *start, const vec_t *end, int type, edict_t *passedict); -#endif // REHLDS_OPT_PEDANTIC - -#endif // WORLD_H +#endif // REHLDS_OPT_PEDANTIC \ No newline at end of file diff --git a/rehlds/engine/zone.h b/rehlds/engine/zone.h index 1c8695b..506402c 100644 --- a/rehlds/engine/zone.h +++ b/rehlds/engine/zone.h @@ -26,11 +26,7 @@ * */ -#ifndef ZONE_H -#define ZONE_H -#ifdef _WIN32 #pragma once -#endif #include "maintypes.h" @@ -105,6 +101,4 @@ void *Cache_Check(cache_user_t *c); void *Cache_Alloc(cache_user_t *c, int size, char *name); void Memory_Init(void *buf, int size); NOXREF NOBODY void Cache_Print_Models_And_Totals(void); -NOXREF NOBODY void Cache_Print_Sounds_And_Totals(void); - -#endif // ZONE_H +NOXREF NOBODY void Cache_Print_Sounds_And_Totals(void); \ No newline at end of file