From: TimePath Date: Wed, 30 Dec 2015 11:34:37 +0000 (+1100) Subject: Add missing include guards X-Git-Tag: xonotic-v0.8.2~1355 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cecae3473b79a457a2bd385938eea2f7e0037dee;p=xonotic%2Fxonotic-data.pk3dir.git Add missing include guards --- diff --git a/qcsrc/client/hud/all.qh b/qcsrc/client/hud/all.qh index 4f8cee5c8..2e458e6dd 100644 --- a/qcsrc/client/hud/all.qh +++ b/qcsrc/client/hud/all.qh @@ -1,2 +1,4 @@ +#pragma once + #include "hud.qh" #include "hud_config.qh" diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh index fd477354f..0a3d90728 100644 --- a/qcsrc/common/items/item/powerup.qh +++ b/qcsrc/common/items/item/powerup.qh @@ -1,10 +1,10 @@ +#pragma once + #ifdef SVQC // For FL_POWERUP #include #endif -#ifndef POWERUP_H -#define POWERUP_H #include "pickup.qh" CLASS(Powerup, Pickup) #ifdef SVQC @@ -16,5 +16,3 @@ CLASS(Powerup, Pickup) ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup)) #endif ENDCLASS(Powerup) - -#endif diff --git a/qcsrc/common/minigames/minigame/all.qh b/qcsrc/common/minigames/minigame/all.qh index f552db98b..5567b2568 100644 --- a/qcsrc/common/minigames/minigame/all.qh +++ b/qcsrc/common/minigames/minigame/all.qh @@ -1,3 +1,5 @@ +#pragma once + #if defined(SVQC) #include "../sv_minigames.qh" #elif defined(CSQC) diff --git a/qcsrc/common/state.qh b/qcsrc/common/state.qh index 177935445..e2ba5f385 100644 --- a/qcsrc/common/state.qh +++ b/qcsrc/common/state.qh @@ -1,3 +1,5 @@ +#pragma once + /** * Purpose: common player state, usable on client and server * Client: singleton representing the viewed player diff --git a/qcsrc/common/triggers/func/door.qh b/qcsrc/common/triggers/func/door.qh index f7ed28c5b..84a9d6aa2 100644 --- a/qcsrc/common/triggers/func/door.qh +++ b/qcsrc/common/triggers/func/door.qh @@ -1,3 +1,5 @@ +#pragma once + // door constants const int DOOR_START_OPEN = 1; const int DOOR_DONT_LINK = 4; diff --git a/qcsrc/common/triggers/func/ladder.qh b/qcsrc/common/triggers/func/ladder.qh index 774e7cf40..26cbbda03 100644 --- a/qcsrc/common/triggers/func/ladder.qh +++ b/qcsrc/common/triggers/func/ladder.qh @@ -1,2 +1,4 @@ +#pragma once + .float ladder_time; .entity ladder_entity; diff --git a/qcsrc/common/triggers/func/train.qh b/qcsrc/common/triggers/func/train.qh index d42d8a8a0..8b6f7c02d 100644 --- a/qcsrc/common/triggers/func/train.qh +++ b/qcsrc/common/triggers/func/train.qh @@ -1,3 +1,5 @@ +#pragma once + #ifdef CSQC .float dmgtime; #endif diff --git a/qcsrc/common/triggers/trigger/keylock.qh b/qcsrc/common/triggers/trigger/keylock.qh index a59cb3f69..756d3b25a 100644 --- a/qcsrc/common/triggers/trigger/keylock.qh +++ b/qcsrc/common/triggers/trigger/keylock.qh @@ -1,3 +1,5 @@ +#pragma once + #ifdef CSQC bool item_keys_usekey(entity l, entity p) { diff --git a/qcsrc/common/triggers/trigger/multi.qh b/qcsrc/common/triggers/trigger/multi.qh index 32a3c3131..1a67dfd35 100644 --- a/qcsrc/common/triggers/trigger/multi.qh +++ b/qcsrc/common/triggers/trigger/multi.qh @@ -1,3 +1,5 @@ +#pragma once + #ifdef SVQC void multi_trigger(); void multi_reset(entity this); diff --git a/qcsrc/menu/gamesettings.qh b/qcsrc/menu/gamesettings.qh index 0db9f77f2..868ac0fe3 100644 --- a/qcsrc/menu/gamesettings.qh +++ b/qcsrc/menu/gamesettings.qh @@ -1,6 +1,6 @@ +#pragma once + #ifdef MENUQC -#ifndef GAMESETTINGS_H -#define GAMESETTINGS_H #include "xonotic/tab.qc" @@ -12,4 +12,3 @@ REGISTER_REGISTRY(Settings) REGISTER(Settings, MENU, id, m_id, NEW(Lazy, LAZY(id))) #endif -#endif