From: TimePath Date: Sun, 7 Aug 2016 11:02:23 +0000 (+1000) Subject: #pragma once X-Git-Tag: xonotic-v0.8.2~741 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8e9c14803c6ee158f8183701f8e9c8601da9983;p=xonotic%2Fxonotic-data.pk3dir.git #pragma once --- diff --git a/qcsrc/common/anim.qh b/qcsrc/common/anim.qh index acf6735f3..84d59720d 100644 --- a/qcsrc/common/anim.qh +++ b/qcsrc/common/anim.qh @@ -1,5 +1,4 @@ -#ifndef ANIM_H -#define ANIM_H +#pragma once // begin engine fields @@ -46,5 +45,3 @@ void anim_set(entity e, vector anim, bool looping, bool override, bool restart); #define setanim(...) anim_set(__VA_ARGS__) void anim_update(entity e); #define updateanim(...) anim_update(__VA_ARGS__) - -#endif diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh index 39ca54ff2..ebdba4e5d 100644 --- a/qcsrc/common/animdecide.qh +++ b/qcsrc/common/animdecide.qh @@ -1,5 +1,4 @@ -#ifndef ANIMDECIDE_H -#define ANIMDECIDE_H +#pragma once // must be called at least once to initialize, or when modelindex is changed void animdecide_load_if_needed(entity e); @@ -145,4 +144,3 @@ const int ANIMACTION_PAIN2 = 3; // pain const int ANIMACTION_SHOOT = 4; // shoot const int ANIMACTION_TAUNT = 5; // taunt const int ANIMACTION_MELEE = 6; // melee -#endif diff --git a/qcsrc/common/campaign_common.qh b/qcsrc/common/campaign_common.qh index 3f494a463..3bdc8725c 100644 --- a/qcsrc/common/campaign_common.qh +++ b/qcsrc/common/campaign_common.qh @@ -1,5 +1,4 @@ -#ifndef CAMPAIGN_COMMON_H -#define CAMPAIGN_COMMON_H +#pragma once #ifndef CAMPAIGN_MAX_ENTRIES #define CAMPAIGN_MAX_ENTRIES 64 @@ -31,4 +30,3 @@ void CampaignFile_Unload(); // Sets up the campaign for the n-th array item (meaning: campaign_offset+nth // level) using localcmd() void CampaignSetup(float n); -#endif diff --git a/qcsrc/common/command/all.qh b/qcsrc/common/command/all.qh index 129090d3a..15285b92e 100644 --- a/qcsrc/common/command/all.qh +++ b/qcsrc/common/command/all.qh @@ -1,5 +1,4 @@ -#ifndef COMMON_COMMANDS_ALL_H -#define COMMON_COMMANDS_ALL_H +#pragma once #include "command.qh" REGISTRY(GENERIC_COMMANDS, BITS(7)) @@ -22,5 +21,3 @@ STATIC_INIT(GENERIC_COMMANDS_aliases) { #include "generic.qh" #include "markup.qh" #include "rpn.qh" - -#endif diff --git a/qcsrc/common/command/command.qh b/qcsrc/common/command/command.qh index 72eaa18da..0b3741a06 100644 --- a/qcsrc/common/command/command.qh +++ b/qcsrc/common/command/command.qh @@ -1,5 +1,4 @@ -#ifndef COMMAND_H -#define COMMAND_H +#pragma once const int CMD_REQUEST_COMMAND = 1; const int CMD_REQUEST_USAGE = 2; @@ -12,5 +11,3 @@ CLASS(Command, Object) TC(Command, this); } ENDCLASS(Command) - -#endif diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh index f8139aaf4..b39c79901 100644 --- a/qcsrc/common/command/generic.qh +++ b/qcsrc/common/command/generic.qh @@ -1,5 +1,4 @@ -#ifndef COMMAND_GENERIC_H -#define COMMAND_GENERIC_H +#pragma once #include @@ -39,4 +38,3 @@ void Curl_URI_Get_Callback(int id, float status, string data); int curl_uri_get_pos; float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1]; string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1]; -#endif diff --git a/qcsrc/common/command/markup.qh b/qcsrc/common/command/markup.qh index bccc78d0b..7a1b3876a 100644 --- a/qcsrc/common/command/markup.qh +++ b/qcsrc/common/command/markup.qh @@ -1,5 +1,4 @@ -#ifndef COMMAND_MARKUP_H -#define COMMAND_MARKUP_H +#pragma once // ========================================================== // Declarations for markup command code, reworked by Samual @@ -12,4 +11,3 @@ string markup_from[NUM_MARKUPS]; string markup_to[NUM_MARKUPS]; string GenericCommand_markup(string s2); -#endif diff --git a/qcsrc/common/command/rpn.qh b/qcsrc/common/command/rpn.qh index 3c5a8019b..ba028e248 100644 --- a/qcsrc/common/command/rpn.qh +++ b/qcsrc/common/command/rpn.qh @@ -1,5 +1,4 @@ -#ifndef COMMAND_RPN_H -#define COMMAND_RPN_H +#pragma once // ========================================================= // Declarations for RPN command code, written by divVerent @@ -13,5 +12,3 @@ int rpn_sp; string rpn_stack[MAX_RPN_STACK]; void GenericCommand_rpn(float request, float argc, string command); - -#endif diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index e6e559693..6c7755603 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -1,5 +1,4 @@ -#ifndef CONSTANTS_H -#define CONSTANTS_H +#pragma once REGISTER_NET_TEMP(TE_CSQC_PICTURE) REGISTER_NET_TEMP(TE_CSQC_RACE) @@ -326,4 +325,3 @@ const int SPAWN_PRIO_GOOD_DISTANCE = 10; const int GTV_FORBIDDEN = 0; // Cannot be voted const int GTV_AVAILABLE = 1; // Can be voted const int GTV_CUSTOM = 2; // Custom entry -#endif diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh index 39cec4322..9c8dd4291 100644 --- a/qcsrc/common/csqcmodel_settings.qh +++ b/qcsrc/common/csqcmodel_settings.qh @@ -1,5 +1,4 @@ -#ifndef CSQCMODEL_SETTINGS_H -#define CSQCMODEL_SETTINGS_H +#pragma once // define this if svqc code wants to use .frame2 and .lerpfrac //#define CSQCMODEL_HAVE_TWO_FRAMES @@ -94,4 +93,3 @@ #endif #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE -#endif diff --git a/qcsrc/common/deathtypes/all.qh b/qcsrc/common/deathtypes/all.qh index 903087947..0466c230a 100644 --- a/qcsrc/common/deathtypes/all.qh +++ b/qcsrc/common/deathtypes/all.qh @@ -1,5 +1,4 @@ -#ifndef DEATHTYPES_ALL_H -#define DEATHTYPES_ALL_H +#pragma once #include @@ -47,5 +46,3 @@ const int DT_FIRST = BIT(13); string Deathtype_Name(int deathtype); #include "all.inc" - -#endif diff --git a/qcsrc/common/effects/all.qh b/qcsrc/common/effects/all.qh index e0e9a3ca8..758161837 100644 --- a/qcsrc/common/effects/all.qh +++ b/qcsrc/common/effects/all.qh @@ -1,5 +1,4 @@ -#ifndef EFFECTS_ALL_H -#define EFFECTS_ALL_H +#pragma once #include "effect.qh" @@ -17,5 +16,3 @@ REGISTRY_CHECK(Effects) EFFECT(0, Null, string_null) #include "all.inc" - -#endif diff --git a/qcsrc/common/effects/effect.qh b/qcsrc/common/effects/effect.qh index e58d42ca7..7802f0a91 100644 --- a/qcsrc/common/effects/effect.qh +++ b/qcsrc/common/effects/effect.qh @@ -1,5 +1,4 @@ -#ifndef EFFECT_H -#define EFFECT_H +#pragma once #define particleeffectnum(e) \ _particleeffectnum(e.eent_eff_name) @@ -32,5 +31,3 @@ entity Create_Effect_Entity(string eff_name, bool eff_trail) this.eent_eff_trail = eff_trail; return this; } - -#endif diff --git a/qcsrc/common/effects/qc/all.qh b/qcsrc/common/effects/qc/all.qh index 5b9b36431..54cf6b6ff 100644 --- a/qcsrc/common/effects/qc/all.qh +++ b/qcsrc/common/effects/qc/all.qh @@ -1,4 +1,3 @@ -#ifndef EFFECTS_QC -#define EFFECTS_QC +#pragma once + #include "all.inc" -#endif diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh index 640d330f1..1df0b1a42 100644 --- a/qcsrc/common/effects/qc/globalsound.qh +++ b/qcsrc/common/effects/qc/globalsound.qh @@ -1,5 +1,4 @@ -#ifndef GLOBALSOUND_H -#define GLOBALSOUND_H +#pragma once #ifdef SVQC /** Use new sound handling. TODO: use when sounds play correctly on clients */ @@ -148,5 +147,3 @@ STATIC_INIT(allvoicesamples) FOREACH(PlayerSounds, it.instanceOfVoiceMessage, allvoicesamples = strcat(allvoicesamples, " ", it.m_playersoundstr)); allvoicesamples = strzone(substring(allvoicesamples, 1, -1)); } - -#endif diff --git a/qcsrc/common/effects/qc/rubble.qh b/qcsrc/common/effects/qc/rubble.qh index 1665e4cce..83a694121 100644 --- a/qcsrc/common/effects/qc/rubble.qh +++ b/qcsrc/common/effects/qc/rubble.qh @@ -1,5 +1,4 @@ -#ifndef RUBBLE_H -#define RUBBLE_H +#pragma once #ifdef CSQC @@ -46,5 +45,3 @@ entity RubbleNew(string cname) } #endif - -#endif diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh index 1c72b351f..fdaaab2d5 100644 --- a/qcsrc/common/ent_cs.qh +++ b/qcsrc/common/ent_cs.qh @@ -1,5 +1,4 @@ -#ifndef ENT_CS_H -#define ENT_CS_H +#pragma once REGISTER_NET_LINKED(ENT_CLIENT_ENTCS) REGISTER_NET_TEMP(CLIENT_ENTCS) @@ -141,5 +140,3 @@ REGISTER_NET_TEMP(CLIENT_ENTCS) } #endif - -#endif diff --git a/qcsrc/common/impulses/all.qh b/qcsrc/common/impulses/all.qh index 6780ac16d..45a8f1323 100644 --- a/qcsrc/common/impulses/all.qh +++ b/qcsrc/common/impulses/all.qh @@ -1,5 +1,4 @@ -#ifndef IMPULSES_ALL_H -#define IMPULSES_ALL_H +#pragma once REGISTRY(IMPULSES, 255) REGISTER_REGISTRY(IMPULSES) @@ -216,5 +215,3 @@ CHIMPULSE(SPEEDRUN, 141) CHIMPULSE(CLONE_STANDING, 142) CHIMPULSE(TELEPORT, 143) CHIMPULSE(R00T, 148) - -#endif diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh index 18cc5ae4f..ff54a3a29 100644 --- a/qcsrc/common/items/all.qh +++ b/qcsrc/common/items/all.qh @@ -1,5 +1,4 @@ -#ifndef ITEMS_ALL_H -#define ITEMS_ALL_H +#pragma once #include @@ -33,5 +32,3 @@ GENERIC_COMMAND(dumpitems, "Dump all items to the console") { #ifndef MENUQC string Item_Model(string item_mdl); #endif - -#endif diff --git a/qcsrc/common/items/inventory.qh b/qcsrc/common/items/inventory.qh index c7f602e65..4ca11c268 100644 --- a/qcsrc/common/items/inventory.qh +++ b/qcsrc/common/items/inventory.qh @@ -1,5 +1,4 @@ -#ifndef INVENTORY_H -#define INVENTORY_H +#pragma once #include "all.qh" #include "item/pickup.qh" @@ -74,5 +73,3 @@ void Inventory_new(entity e) void Inventory_delete(entity e) { delete(e.inventory.inventory); delete(e.inventory); } void Inventory_update(entity e) { e.inventory.SendFlags = 0xFFFFFF; } #endif - -#endif diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index 4ab7af4f2..ed33169fc 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -1,5 +1,4 @@ -#ifndef GAMEITEM_H -#define GAMEITEM_H +#pragma once const int IT_UNLIMITED_WEAPON_AMMO = BIT(0); // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup. const int IT_UNLIMITED_SUPERWEAPONS = BIT(1); // when this bit is set, superweapons don't expire. Checkpoints can give this powerup. @@ -58,5 +57,3 @@ CLASS(GameItem, Object) } void ITEM_HANDLE(Show, GameItem this) { this.show(this); } ENDCLASS(GameItem) - -#endif diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh index 84f20483e..ed2ada7cf 100644 --- a/qcsrc/common/items/item/ammo.qh +++ b/qcsrc/common/items/item/ammo.qh @@ -1,5 +1,5 @@ -#ifndef AMMO_H -#define AMMO_H +#pragma once + #include "pickup.qh" CLASS(Ammo, Pickup) #ifdef SVQC @@ -8,4 +8,3 @@ CLASS(Ammo, Pickup) ATTRIB(Ammo, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_ammo)) #endif ENDCLASS(Ammo) -#endif diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh index adb93e7c9..6e79a2200 100644 --- a/qcsrc/common/items/item/armor.qh +++ b/qcsrc/common/items/item/armor.qh @@ -1,5 +1,5 @@ -#ifndef ARMOR_H -#define ARMOR_H +#pragma once + #include "pickup.qh" CLASS(Armor, Pickup) #ifdef SVQC @@ -8,4 +8,3 @@ CLASS(Armor, Pickup) ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc) #endif ENDCLASS(Armor) -#endif diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh index f7bfb5c93..3a0249d51 100644 --- a/qcsrc/common/items/item/health.qh +++ b/qcsrc/common/items/item/health.qh @@ -1,5 +1,5 @@ -#ifndef HEALTH_H -#define HEALTH_H +#pragma once + #include "pickup.qh" CLASS(Health, Pickup) #ifdef SVQC @@ -8,4 +8,3 @@ CLASS(Health, Pickup) ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc) #endif ENDCLASS(Health) -#endif diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index 6d9149481..5949a71ed 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -1,5 +1,5 @@ -#ifndef PICKUP_H -#define PICKUP_H +#pragma once + #include #include CLASS(Pickup, GameItem) @@ -38,5 +38,3 @@ CLASS(Pickup, GameItem) bool ITEM_HANDLE(Pickup, Pickup this, entity item, entity player); #endif ENDCLASS(Pickup) - -#endif diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 5ab36f3ae..52ee1bd9c 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -1,5 +1,4 @@ -#ifndef MAPINFO_H -#define MAPINFO_H +#pragma once bool autocvar_developer_mapper; @@ -270,4 +269,3 @@ void MapInfo_Shutdown(); // call this in the shutdown handler #define MAPINFO_SETTEMP_ACL_USER cvar_string("g_mapinfo_settemp_acl") #define MAPINFO_SETTEMP_ACL_SYSTEM "-g_mapinfo_* -rcon_* -_* -g_ban* +*" -#endif diff --git a/qcsrc/common/minigames/cl_minigames.qh b/qcsrc/common/minigames/cl_minigames.qh index cc24d4bf0..602c79735 100644 --- a/qcsrc/common/minigames/cl_minigames.qh +++ b/qcsrc/common/minigames/cl_minigames.qh @@ -1,5 +1,4 @@ -#ifndef CL_MINIGAMES_H -#define CL_MINIGAMES_H +#pragma once // Get a square in the center of the avaliable area // \note macro to pass by reference pos and mySize @@ -128,5 +127,3 @@ REGISTRY_CHECK(Minigames) this.minigame_event = name##_client_event; \ } \ REGISTER_INIT(MINIGAME_##name) - -#endif diff --git a/qcsrc/common/minigames/cl_minigames_hud.qh b/qcsrc/common/minigames/cl_minigames_hud.qh index f170c590d..ef44ea025 100644 --- a/qcsrc/common/minigames/cl_minigames_hud.qh +++ b/qcsrc/common/minigames/cl_minigames_hud.qh @@ -1,7 +1,4 @@ -#ifndef CL_MINIGAMES_HUD_H -#define CL_MINIGAMES_HUD_H +#pragma once float HUD_Minigame_InputEvent(float bInputType, float nPrimary, float nSecondary); void HUD_Minigame_Mouse(); - -#endif diff --git a/qcsrc/common/minigames/minigames.qh b/qcsrc/common/minigames/minigames.qh index 7425149f3..284001a0a 100644 --- a/qcsrc/common/minigames/minigames.qh +++ b/qcsrc/common/minigames/minigames.qh @@ -1,5 +1,4 @@ -#ifndef MINIGAMES_H -#define MINIGAMES_H +#pragma once // previous node in a doubly linked list .entity list_prev; @@ -121,5 +120,3 @@ entity msle_spawn(entity minigame_session, string class_name); int msle_id(string class_name); string msle_classname(int id); - -#endif diff --git a/qcsrc/common/minigames/sv_minigames.qh b/qcsrc/common/minigames/sv_minigames.qh index de9e3f696..b5015a1f4 100644 --- a/qcsrc/common/minigames/sv_minigames.qh +++ b/qcsrc/common/minigames/sv_minigames.qh @@ -1,5 +1,4 @@ -#ifndef SV_MINIGAMES_H -#define SV_MINIGAMES_H +#pragma once /// Create a new minigame session /// \return minigame session entity @@ -59,5 +58,3 @@ REGISTRY_CHECK(Minigames) this.minigame_event = name##_server_event; \ } \ REGISTER_INIT(MINIGAME_##name) - -#endif diff --git a/qcsrc/common/models/all.qh b/qcsrc/common/models/all.qh index f3bfd64c7..ce9862941 100644 --- a/qcsrc/common/models/all.qh +++ b/qcsrc/common/models/all.qh @@ -1,5 +1,4 @@ -#ifndef MODELS_ALL_H -#define MODELS_ALL_H +#pragma once #include "model.qh" @@ -22,5 +21,3 @@ PRECACHE(Models) { MODEL(Null, "null"); #include "all.inc" - -#endif diff --git a/qcsrc/common/models/model.qh b/qcsrc/common/models/model.qh index 91fb278ae..f651b709e 100644 --- a/qcsrc/common/models/model.qh +++ b/qcsrc/common/models/model.qh @@ -1,5 +1,4 @@ -#ifndef MODEL_H -#define MODEL_H +#pragma once #define setmodel(e, m) _setmodel((e), (m).model_str()) @@ -23,5 +22,3 @@ CLASS(Model, Object) precache_model(s); } ENDCLASS(Model) - -#endif diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh index 1e23f3287..84f7a0d78 100644 --- a/qcsrc/common/monsters/all.qh +++ b/qcsrc/common/monsters/all.qh @@ -1,5 +1,4 @@ -#ifndef MONSTERS_ALL_H -#define MONSTERS_ALL_H +#pragma once #include "monster.qh" @@ -18,5 +17,3 @@ REGISTER_MONSTER(Null, NEW(Monster)); #include "monster/_mod.inc" - -#endif diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index 7b9638070..b345fa6fc 100644 --- a/qcsrc/common/monsters/monster.qh +++ b/qcsrc/common/monsters/monster.qh @@ -1,5 +1,4 @@ -#ifndef MONSTER_H -#define MONSTER_H +#pragma once #ifdef SVQC #include "sv_monsters.qh" @@ -74,5 +73,3 @@ CLASS(Monster, Object) METHOD(Monster, mr_anim, bool(Monster this, entity actor)) { TC(Monster, this); return false; } ENDCLASS(Monster) - -#endif diff --git a/qcsrc/common/monsters/spawn.qh b/qcsrc/common/monsters/spawn.qh index 2ebdcc54e..0aba5c19d 100644 --- a/qcsrc/common/monsters/spawn.qh +++ b/qcsrc/common/monsters/spawn.qh @@ -1,5 +1,3 @@ -#ifndef SPAWN_H -#define SPAWN_H +#pragma once entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag); -#endif diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh index ffade7b6a..56509cf66 100644 --- a/qcsrc/common/monsters/sv_monsters.qh +++ b/qcsrc/common/monsters/sv_monsters.qh @@ -1,5 +1,4 @@ -#ifndef SV_MONSTERS_H -#define SV_MONSTERS_H +#pragma once // stats networking .int stat_monsters_killed; @@ -113,5 +112,3 @@ ALLMONSTERSOUNDS #undef _MSOUND float GetMonsterSoundSampleField_notFound; - -#endif diff --git a/qcsrc/common/net_notice.qh b/qcsrc/common/net_notice.qh index b36f631fe..113420518 100644 --- a/qcsrc/common/net_notice.qh +++ b/qcsrc/common/net_notice.qh @@ -1,5 +1,4 @@ -#ifndef NET_NOTICE_H -#define NET_NOTICE_H +#pragma once #ifdef SVQC string autocvar_sv_join_notices; @@ -13,5 +12,3 @@ void sv_notice_join(entity _to); #ifdef CSQC void cl_notice_read(); #endif - -#endif diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 4ff276c78..f364225b3 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -1,5 +1,4 @@ -#ifndef NOTIFICATIONS_H -#define NOTIFICATIONS_H +#pragma once #include @@ -800,5 +799,3 @@ REGISTRY_END(Notifications) } #include "all.inc" - -#endif diff --git a/qcsrc/common/physics/movelib.qh b/qcsrc/common/physics/movelib.qh index 250c3ba2b..e0659a40c 100644 --- a/qcsrc/common/physics/movelib.qh +++ b/qcsrc/common/physics/movelib.qh @@ -1,5 +1,4 @@ -#ifndef MOVELIB_H -#define MOVELIB_H +#pragma once #ifdef SVQC .vector moveto; @@ -49,5 +48,3 @@ Yed need to set v_up and v_forward (generally by calling makevectors) before cal #endif void movelib_groundalign4point(entity this, float spring_length, float spring_up, float blendrate, float _max); - -#endif diff --git a/qcsrc/common/physics/movetypes/movetypes.qh b/qcsrc/common/physics/movetypes/movetypes.qh index 35a73d333..db5d29cef 100644 --- a/qcsrc/common/physics/movetypes/movetypes.qh +++ b/qcsrc/common/physics/movetypes/movetypes.qh @@ -1,5 +1,4 @@ -#ifndef MOVETYPES_H -#define MOVETYPES_H +#pragma once #define IS_ONGROUND(s) boolean((s).flags & FL_ONGROUND) #define SET_ONGROUND(s) ((s).flags |= FL_ONGROUND) @@ -90,5 +89,3 @@ const int MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE = BIT(2); #ifdef CSQC #define moveflags STAT(MOVEFLAGS) #endif - -#endif diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index ae1bd8785..9e7b799d0 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -1,5 +1,4 @@ -#ifndef COMMON_PHYSICS_H -#define COMMON_PHYSICS_H +#pragma once // Client/server mappings @@ -325,5 +324,3 @@ NET_HANDLE(setpause, bool) return true; } #endif - -#endif diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh index ec309c4f4..73496ba76 100644 --- a/qcsrc/common/playerstats.qh +++ b/qcsrc/common/playerstats.qh @@ -1,5 +1,4 @@ -#ifndef PLAYERSTATS_H -#define PLAYERSTATS_H +#pragma once #ifdef SVQC //float PS_PM_IN_DB = -1; // playerstats_prematch_in_db // db for info COLLECTED at the beginning of a match @@ -116,4 +115,3 @@ void PlayerStats_PlayerDetail(); void PlayerStats_PlayerDetail_CheckUpdate(); void PlayerStats_PlayerDetail_Handler(entity fh, entity p, float status); #endif -#endif diff --git a/qcsrc/common/sounds/all.qh b/qcsrc/common/sounds/all.qh index a7fe25f17..763aae67c 100644 --- a/qcsrc/common/sounds/all.qh +++ b/qcsrc/common/sounds/all.qh @@ -1,5 +1,4 @@ -#ifndef SOUNDS_ALL_H -#define SOUNDS_ALL_H +#pragma once #include "sound.qh" @@ -21,4 +20,3 @@ PRECACHE(Sounds) { SOUND(Null, "misc/null"); #include "all.inc" #include "all.qc" -#endif diff --git a/qcsrc/common/sounds/sound.qh b/qcsrc/common/sounds/sound.qh index 519f910b0..b2cca4fee 100644 --- a/qcsrc/common/sounds/sound.qh +++ b/qcsrc/common/sounds/sound.qh @@ -1,5 +1,4 @@ -#ifndef SOUND_H -#define SOUND_H +#pragma once // negative = SVQC autochannels // positive = one per entity @@ -130,5 +129,3 @@ CLASS(Sound, Object) precache_sound(s); } ENDCLASS(Sound) - -#endif diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index c7fc313a8..a24243bb6 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -1,5 +1,4 @@ -#ifndef STATS_H -#define STATS_H +#pragma once #ifdef SVQC #include @@ -323,6 +322,3 @@ REGISTER_STAT(GUNALIGN, int, this.cvar_cl_gunalign) #ifdef SVQC SPECTATE_COPYFIELD(_STAT(GUNALIGN)) #endif - - -#endif diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/t_items.qh index 1ed807c7c..1c65e806a 100644 --- a/qcsrc/common/t_items.qh +++ b/qcsrc/common/t_items.qh @@ -1,5 +1,4 @@ -#ifndef T_ITEMS_H -#define T_ITEMS_H +#pragma once const int AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel @@ -133,4 +132,3 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa float GiveItems(entity e, float beginarg, float endarg); #endif -#endif diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh index aeaf078dc..1f8a603dd 100644 --- a/qcsrc/common/teams.qh +++ b/qcsrc/common/teams.qh @@ -1,5 +1,4 @@ -#ifndef TEAMS_H -#define TEAMS_H +#pragma once #ifdef TEAMNUMBERS_THAT_ARENT_STUPID const int NUM_TEAM_1 = 1; // red @@ -177,5 +176,3 @@ float Team_TeamToNumber(float teamid) // safe team comparisons #define SAME_TEAM(a,b) (teamplay ? (a.team == b.team) : (a == b)) #define DIFF_TEAM(a,b) (teamplay ? (a.team != b.team) : (a != b)) - -#endif diff --git a/qcsrc/common/triggers/func/breakable.qh b/qcsrc/common/triggers/func/breakable.qh index 75cfb94c6..761a2c7a9 100644 --- a/qcsrc/common/triggers/func/breakable.qh +++ b/qcsrc/common/triggers/func/breakable.qh @@ -1,8 +1,5 @@ -#ifndef TRIGGERS_FUNC_BREAKABLE_H -#define TRIGGERS_FUNC_BREAKABLE_H +#pragma once #ifdef SVQC spawnfunc(func_breakable); #endif - -#endif diff --git a/qcsrc/common/triggers/func/include.qh b/qcsrc/common/triggers/func/include.qh index 628355cb7..4e8b94cd1 100644 --- a/qcsrc/common/triggers/func/include.qh +++ b/qcsrc/common/triggers/func/include.qh @@ -1,8 +1,5 @@ -#ifndef TRIGGERS_FUNC_INCLUDE_H -#define TRIGGERS_FUNC_INCLUDE_H +#pragma once #include "door.qh" #include "ladder.qh" #include "train.qh" - -#endif diff --git a/qcsrc/common/triggers/include.qh b/qcsrc/common/triggers/include.qh index 25688e3ec..f3f81738a 100644 --- a/qcsrc/common/triggers/include.qh +++ b/qcsrc/common/triggers/include.qh @@ -1,5 +1,4 @@ -#ifndef TRIGGERS_INCLUDE_H -#define TRIGGERS_INCLUDE_H +#pragma once // some required common stuff #ifdef CSQC @@ -18,5 +17,3 @@ // trigger #include "trigger/include.qh" - -#endif diff --git a/qcsrc/common/triggers/platforms.qh b/qcsrc/common/triggers/platforms.qh index f0727be3c..c40467494 100644 --- a/qcsrc/common/triggers/platforms.qh +++ b/qcsrc/common/triggers/platforms.qh @@ -1,5 +1,4 @@ -#ifndef PLATFORMS_H -#define PLATFORMS_H +#pragma once .float dmgtime2; @@ -12,5 +11,3 @@ void plat_crush(entity this, entity blocker); const float PLAT_LOW_TRIGGER = 1; .float dmg; - -#endif diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh index 096022c84..4f98d5ae1 100644 --- a/qcsrc/common/triggers/subs.qh +++ b/qcsrc/common/triggers/subs.qh @@ -1,5 +1,4 @@ -#ifndef SUBS_H -#define SUBS_H +#pragma once #define SUB_ANGLES(s) (s).angles #define SUB_VELOCITY velocity @@ -69,5 +68,3 @@ float STATE_DOWN = 3; .float max_health; // players maximum health is stored here #endif - -#endif diff --git a/qcsrc/common/triggers/target/include.qh b/qcsrc/common/triggers/target/include.qh index 4e44b9762..c0f7cad44 100644 --- a/qcsrc/common/triggers/target/include.qh +++ b/qcsrc/common/triggers/target/include.qh @@ -1,6 +1,3 @@ -#ifndef TRIGGERS_TARGET_INCLUDE_H -#define TRIGGERS_TARGET_INCLUDE_H +#pragma once #include "music.qh" - -#endif diff --git a/qcsrc/common/triggers/target/music.qh b/qcsrc/common/triggers/target/music.qh index a9232107e..80b3684a4 100644 --- a/qcsrc/common/triggers/target/music.qh +++ b/qcsrc/common/triggers/target/music.qh @@ -1,5 +1,4 @@ -#ifndef TARGET_MUSIC_H -#define TARGET_MUSIC_H +#pragma once .float lifetime; @@ -25,5 +24,3 @@ void Ent_TriggerMusic_Remove(entity this); #elif defined(SVQC) void target_music_kill(); #endif - -#endif diff --git a/qcsrc/common/triggers/teleporters.qh b/qcsrc/common/triggers/teleporters.qh index c0f45f263..513ed3e26 100644 --- a/qcsrc/common/triggers/teleporters.qh +++ b/qcsrc/common/triggers/teleporters.qh @@ -1,5 +1,4 @@ -#ifndef T_TELEPORTERS_H -#define T_TELEPORTERS_H +#pragma once .entity pusher; const float TELEPORT_FLAG_SOUND = 1; @@ -92,5 +91,3 @@ void WarpZone_PostTeleportPlayer_Callback(entity pl); if(head.isplayermodel) \ if(boxesoverlap(deathmin, deathmax, head.absmin, head.absmax)) #endif - -#endif diff --git a/qcsrc/common/triggers/trigger/impulse.qh b/qcsrc/common/triggers/trigger/impulse.qh index 67d6361fb..a6961f5d2 100644 --- a/qcsrc/common/triggers/trigger/impulse.qh +++ b/qcsrc/common/triggers/trigger/impulse.qh @@ -1,10 +1,7 @@ -#ifndef TRIGGER_IMPULSE_H -#define TRIGGER_IMPULSE_H +#pragma once // tZorks trigger impulse / gravity .float radius; .float falloff; .float strength; .float lastpushtime; - -#endif diff --git a/qcsrc/common/triggers/trigger/include.qh b/qcsrc/common/triggers/trigger/include.qh index 63cdb0190..8aa6b2b17 100644 --- a/qcsrc/common/triggers/trigger/include.qh +++ b/qcsrc/common/triggers/trigger/include.qh @@ -1,5 +1,4 @@ -#ifndef TRIGGERS_TRIGGER_INCLUDE_H -#define TRIGGERS_TRIGGER_INCLUDE_H +#pragma once #include "multi.qh" #include "jumppads.qh" @@ -8,5 +7,3 @@ #include "keylock.qh" #include "impulse.qh" #include "viewloc.qh" - -#endif diff --git a/qcsrc/common/triggers/trigger/jumppads.qh b/qcsrc/common/triggers/trigger/jumppads.qh index e03f14d33..76d244da5 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qh +++ b/qcsrc/common/triggers/trigger/jumppads.qh @@ -1,5 +1,4 @@ -#ifndef T_JUMPPADS_H -#define T_JUMPPADS_H +#pragma once const float PUSH_ONCE = 1; const float PUSH_SILENT = 2; @@ -59,4 +58,3 @@ spawnfunc(target_push); spawnfunc(info_notnull); spawnfunc(target_position); #endif -#endif diff --git a/qcsrc/common/triggers/trigger/secret.qh b/qcsrc/common/triggers/trigger/secret.qh index c2a155ce7..e483316a4 100644 --- a/qcsrc/common/triggers/trigger/secret.qh +++ b/qcsrc/common/triggers/trigger/secret.qh @@ -1,5 +1,4 @@ -#ifndef SECRET_H -#define SECRET_H +#pragma once #ifdef SVQC /** @@ -21,4 +20,3 @@ float secrets_found; */ void secrets_setstatus(entity this); #endif -#endif diff --git a/qcsrc/common/triggers/trigger/swamp.qh b/qcsrc/common/triggers/trigger/swamp.qh index 7ae50bac4..f4df98378 100644 --- a/qcsrc/common/triggers/trigger/swamp.qh +++ b/qcsrc/common/triggers/trigger/swamp.qh @@ -1,5 +1,4 @@ -#ifndef TRIGGER_SWAMP_H -#define TRIGGER_SWAMP_H +#pragma once .float swamp_interval; //Hurt players in swamp with this interval .float swamp_slowdown; //Players in swamp get slowd down by this mutch 0-1 is slowdown 1-~ is speedup (!?) @@ -7,5 +6,3 @@ .float in_swamp; // bool .entity swampslug; // Uses this to release from swamp ("untouch" fix) - -#endif diff --git a/qcsrc/common/triggers/trigger/viewloc.qh b/qcsrc/common/triggers/trigger/viewloc.qh index 881197a3b..167fc218f 100644 --- a/qcsrc/common/triggers/trigger/viewloc.qh +++ b/qcsrc/common/triggers/trigger/viewloc.qh @@ -1,5 +1,4 @@ -#ifndef T_VIEWLOC_H -#define T_VIEWLOC_H +#pragma once .entity viewloc; @@ -8,5 +7,3 @@ .entity enemy; .vector movedir; #endif - -#endif diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/triggers/triggers.qh index 82c0916c1..8a8eb566c 100644 --- a/qcsrc/common/triggers/triggers.qh +++ b/qcsrc/common/triggers/triggers.qh @@ -1,5 +1,4 @@ -#ifndef TRIGGERS_H -#define TRIGGERS_H +#pragma once const float SF_TRIGGER_INIT = 1; const float SF_TRIGGER_UPDATE = 2; @@ -50,5 +49,3 @@ const int ACTIVE_IDLE = 2; const int ACTIVE_BUSY = 2; const int ACTIVE_TOGGLE = 3; #endif - -#endif diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index a993b9218..476da2d18 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -1,5 +1,4 @@ -#ifndef TURRETS_ALL_H -#define TURRETS_ALL_H +#pragma once #include #include "config.qh" @@ -75,5 +74,3 @@ const int TUR_FIRST = 1; REGISTER_TURRET(Null, NEW(Turret)); #include "turret/_mod.inc" - -#endif diff --git a/qcsrc/common/turrets/config.qh b/qcsrc/common/turrets/config.qh index bb2a81b84..caa68a864 100644 --- a/qcsrc/common/turrets/config.qh +++ b/qcsrc/common/turrets/config.qh @@ -1,5 +1,4 @@ -#ifndef TURRETS_CONFIG_H -#define TURRETS_CONFIG_H +#pragma once #ifdef SVQC @@ -17,5 +16,3 @@ string tur_config_queue[MAX_TUR_CONFIG]; #endif - -#endif diff --git a/qcsrc/common/turrets/sv_turrets.qh b/qcsrc/common/turrets/sv_turrets.qh index 29d08c629..c5a3728d1 100644 --- a/qcsrc/common/turrets/sv_turrets.qh +++ b/qcsrc/common/turrets/sv_turrets.qh @@ -1,5 +1,4 @@ -#ifndef SV_TURRETS_H -#define SV_TURRETS_H +#pragma once entity turret_projectile(entity actor, Sound _snd, float _size, float _health, float _death, float _proj_type, float _cull, float _cli_anim); void turret_projectile_explode(entity this); @@ -119,5 +118,3 @@ vector tvt_tadv; // turret angle diff vector, updated by a successful call to tu float tvt_thadf; // turret head angle diff float, updated by a successful call to turret_validate_target float tvt_tadf; // turret angle diff float, updated by a successful call to turret_validate_target float tvt_dist; // turret distance, updated by a successful call to turret_validate_target - -#endif diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh index a66952833..dc84acc74 100644 --- a/qcsrc/common/turrets/turret.qh +++ b/qcsrc/common/turrets/turret.qh @@ -1,5 +1,4 @@ -#ifndef TURRET_H -#define TURRET_H +#pragma once #include @@ -176,5 +175,3 @@ const int TNSF_MOVE = 64; const int TNSF_ANIM = 128; const int TNSF_FULL_UPDATE = 16777215; - -#endif diff --git a/qcsrc/common/turrets/util.qh b/qcsrc/common/turrets/util.qh index d5c948d57..5f52695ba 100644 --- a/qcsrc/common/turrets/util.qh +++ b/qcsrc/common/turrets/util.qh @@ -1,5 +1,4 @@ -#ifndef TURRETS_UTIL_H -#define TURRETS_UTIL_H +#pragma once float shortangle_f(float ang1, float ang2); float anglemods(float v); @@ -8,5 +7,3 @@ vector shortangle_vxy(vector ang1, vector ang2); vector angleofs(entity from, entity to); vector angleofs3(vector from, vector from_a, entity to); void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax, float bforce, float f_dmg, float f_velfactor, float deathtype); - -#endif diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 6ec6036fd..81acde950 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -1,5 +1,4 @@ -#ifndef COMMON_UTIL_H -#define COMMON_UTIL_H +#pragma once #ifndef MENUQC @@ -296,4 +295,3 @@ vector bezier_quadratic_getderivative(vector a, vector p, vector b, float t); // Returns the correct difference between two always increasing numbers #define COMPARE_INCREASING(to,from) (to < from ? from + to + 2 : to - from) -#endif diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh index b58389d4a..158492f66 100644 --- a/qcsrc/common/vehicles/all.qh +++ b/qcsrc/common/vehicles/all.qh @@ -1,5 +1,4 @@ -#ifndef VEHICLES_ALL_H -#define VEHICLES_ALL_H +#pragma once #include "vehicle.qh" @@ -22,5 +21,3 @@ const int VEH_FIRST = 1; REGISTER_VEHICLE(Null, NEW(Vehicle)); #include "vehicle/_mod.inc" - -#endif diff --git a/qcsrc/common/vehicles/cl_vehicles.qh b/qcsrc/common/vehicles/cl_vehicles.qh index 5293030c1..327074b98 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qh +++ b/qcsrc/common/vehicles/cl_vehicles.qh @@ -1,5 +1,4 @@ -#ifndef CL_VEHICLES_H -#define CL_VEHICLES_H +#pragma once vector vehicleHud_Size; vector vehicleHud_Pos; @@ -8,5 +7,3 @@ void RaptorCBShellfragDraw(entity this); void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang); #define weapon2mode STAT(VEHICLESTAT_W2MODE) - -#endif diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh index e593922fc..158191f65 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qh +++ b/qcsrc/common/vehicles/sv_vehicles.qh @@ -1,5 +1,4 @@ -#ifndef VEHICLES_DEF_H -#define VEHICLES_DEF_H +#pragma once #ifdef SVQC #include @@ -110,4 +109,3 @@ bool vehicles_crushable(entity e); float vehicle_altitude(entity this, float amax); #endif -#endif diff --git a/qcsrc/common/vehicles/vehicle.qh b/qcsrc/common/vehicles/vehicle.qh index 7b1194e8e..1578e0a7d 100644 --- a/qcsrc/common/vehicles/vehicle.qh +++ b/qcsrc/common/vehicles/vehicle.qh @@ -1,5 +1,4 @@ -#ifndef VEHICLE_H -#define VEHICLE_H +#pragma once CLASS(Vehicle, Object) ATTRIB(Vehicle, vehicleid, int, 0) @@ -76,5 +75,3 @@ const int VHF_PLAYERSLOT = BIT(14); /// This ent is a player slot on a multi-pe // fields: .entity tur_head; - -#endif diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qh b/qcsrc/common/vehicles/vehicle/bumblebee.qh index b04303892..b675185d4 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee.qh +++ b/qcsrc/common/vehicles/vehicle/bumblebee.qh @@ -1,9 +1,6 @@ -#ifndef BUMBLEBEE_H -#define BUMBLEBEE_H +#pragma once #ifdef CSQC void CSQC_BUMBLE_GUN_HUD(); #endif - -#endif diff --git a/qcsrc/common/vehicles/vehicle/raptor.qh b/qcsrc/common/vehicles/vehicle/raptor.qh index f24939ba9..fd9a7de79 100644 --- a/qcsrc/common/vehicles/vehicle/raptor.qh +++ b/qcsrc/common/vehicles/vehicle/raptor.qh @@ -1,9 +1,6 @@ -#ifndef RAPTOR_H -#define RAPTOR_H +#pragma once const int RSM_FIRST = 1; const int RSM_BOMB = 1; const int RSM_FLARE = 2; const int RSM_LAST = 2; - -#endif diff --git a/qcsrc/common/viewloc.qh b/qcsrc/common/viewloc.qh index 4c4d05f92..7725d2d8f 100644 --- a/qcsrc/common/viewloc.qh +++ b/qcsrc/common/viewloc.qh @@ -1,5 +1,4 @@ -#ifndef VIEWLOC_H -#define VIEWLOC_H +#pragma once .entity viewloc; @@ -11,5 +10,3 @@ void viewloc_SetViewLocation(); void viewloc_SetTags(entity this); #endif - -#endif diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 24ea41c64..bff6e6db7 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -1,5 +1,4 @@ -#ifndef WEAPONS_ALL_H -#define WEAPONS_ALL_H +#pragma once #include #include @@ -360,5 +359,3 @@ ENUMCLASS_END(WFRAME) vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn); void CL_WeaponEntity_SetModel(entity this, string name, bool _anim); #endif - -#endif diff --git a/qcsrc/common/weapons/calculations.qh b/qcsrc/common/weapons/calculations.qh index 4feed9fc5..05eb9d9ba 100644 --- a/qcsrc/common/weapons/calculations.qh +++ b/qcsrc/common/weapons/calculations.qh @@ -1,6 +1,5 @@ -#ifndef CALCULATIONS_H -#define CALCULATIONS_H +#pragma once + vector damage_explosion_calcpush(vector explosion_f, vector target_v, float speedfactor); vector W_CalculateSpread(vector forward, float spread, float spreadfactor, float spreadstyle); int W_GetGunAlignment(entity player); -#endif diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh index d88e18194..753147307 100644 --- a/qcsrc/common/weapons/config.qh +++ b/qcsrc/common/weapons/config.qh @@ -1,5 +1,4 @@ -#ifndef WEAPONS_CONFIG_H -#define WEAPONS_CONFIG_H +#pragma once #ifdef SVQC // ========================== @@ -37,4 +36,3 @@ string wep_config_queue[MAX_WEP_CONFIG]; cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) } #endif -#endif diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index 8b844f13e..b2ede3c50 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -1,5 +1,5 @@ -#ifndef WEAPON_H -#define WEAPON_H +#pragma once + #include #include @@ -216,5 +216,3 @@ int GetAmmoStat(.int ammotype); string W_Sound(string w_snd); string W_Model(string w_mdl); - -#endif