Include always.h in more headers

TheAssemblyArmada · Mar 18, 2024 · 3da8ad5 · 3da8ad5
1 parent 2658e67
commit 3da8ad5
Show file tree

Hide file tree

Showing 69 changed files with 83 additions and 2 deletions.
diff --git a/src/game/client/drawable/update/swayclientupdate.h b/src/game/client/drawable/update/swayclientupdate.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bittype.h"
 #include "clientupdatemodule.h"
 #include "namekeygenerator.h"

diff --git a/src/game/client/fxlist.h b/src/game/client/fxlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "namekeygenerator.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"

diff --git a/src/game/client/globallanguage.h b/src/game/client/globallanguage.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "ini.h"
 #include "subsysteminterface.h"

diff --git a/src/game/client/maputil.h b/src/game/client/maputil.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "ini.h"

diff --git a/src/game/client/terrain/terrainroads.h b/src/game/client/terrain/terrainroads.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "color.h"
 #include "gametype.h"
 #include "ini.h"

diff --git a/src/game/client/w3dassetmanager.h b/src/game/client/w3dassetmanager.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "assetmgr.h"
 #include "mempoolobj.h"

diff --git a/src/game/common/audio/audioeventinfo.h b/src/game/common/audio/audioeventinfo.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bitflags.h"
 #include "ini.h"
 #include "mempoolobj.h"

diff --git a/src/game/common/audio/audioeventrts.h b/src/game/common/audio/audioeventrts.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "audioeventinfo.h"
 #include "coord.h"
 #include "gametype.h"

diff --git a/src/game/common/audio/gamesounds.h b/src/game/common/audio/gamesounds.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "coord.h"

diff --git a/src/game/common/bezier/bezfwditerator.h b/src/game/common/bezier/bezfwditerator.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "beziersegment.h"
 
 class BezFwdIterator

diff --git a/src/game/common/bezier/beziersegment.h b/src/game/common/bezier/beziersegment.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "coord.h"
 #include "matrix4.h"
 #include <vector>

diff --git a/src/game/common/commandlist.h b/src/game/common/commandlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamemessagelist.h"
 
 class CommandList : public GameMessageList

diff --git a/src/game/common/gamemessage.h b/src/game/common/gamemessage.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"

diff --git a/src/game/common/gamemessagelist.h b/src/game/common/gamemessagelist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamemessage.h"
 #include "subsysteminterface.h"
 

diff --git a/src/game/common/globaldata.h b/src/game/common/globaldata.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "color.h"
 #include "coord.h"

diff --git a/src/game/common/multiplayersettings.h b/src/game/common/multiplayersettings.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #ifdef GAME_DLL
 #include "hooker.h"
 #endif

diff --git a/src/game/common/namekeygenerator.h b/src/game/common/namekeygenerator.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "bittype.h"
 #include "ini.h"

diff --git a/src/game/common/overridable.h b/src/game/common/overridable.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "mempoolobj.h"
 
 template<class T> class Override

diff --git a/src/game/common/randomvalue.h b/src/game/common/randomvalue.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bittype.h"
 
 class INI;

diff --git a/src/game/common/rts/money.h b/src/game/common/rts/money.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "snapshot.h"
 
 class INI;

diff --git a/src/game/common/rts/player.h b/src/game/common/rts/player.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "academystats.h"
 #include "energy.h"
 #include "handicap.h"

diff --git a/src/game/common/rts/playerlist.h b/src/game/common/rts/playerlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "player.h"
 #include "snapshot.h"
 #include "subsysteminterface.h"

diff --git a/src/game/common/rts/scorekeeper.h b/src/game/common/rts/scorekeeper.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bitflags.h"
 #include "gametype.h"
 #include "snapshot.h"

diff --git a/src/game/common/system/disabledtypes.h b/src/game/common/system/disabledtypes.h
@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
+
 template<int> class BitFlags;
 
 enum DisabledType

diff --git a/src/game/common/system/file.h b/src/game/common/system/file.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "gamememory.h"
 #include "mempoolobj.h"

diff --git a/src/game/common/system/filesystem.h b/src/game/common/system/filesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "file.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"

diff --git a/src/game/common/system/functionlexicon.h b/src/game/common/system/functionlexicon.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamewindow.h"
 #include "namekeygenerator.h"
 #include "subsysteminterface.h"

diff --git a/src/game/common/system/localfilesystem.h b/src/game/common/system/localfilesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"
 #include <set>

diff --git a/src/game/common/system/memblob.h b/src/game/common/system/memblob.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "memblock.h"
 #include "rawalloc.h"
 

diff --git a/src/game/common/system/mempoolobj.h b/src/game/common/system/mempoolobj.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "errorcodes.h"
 #include "mempool.h"
 #include "mempoolfact.h"

diff --git a/src/game/common/system/savegame/gamestate.h b/src/game/common/system/savegame/gamestate.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "snapshot.h"
 #include "subsysteminterface.h"

diff --git a/src/game/common/system/streamingarchivefile.h b/src/game/common/system/streamingarchivefile.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamememory.h"
 #include "ramfile.h"
 

diff --git a/src/game/common/system/subsysteminterface.h b/src/game/common/system/subsysteminterface.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include <vector>
 

diff --git a/src/game/common/system/xfer.h b/src/game/common/system/xfer.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "gametype.h"
 #include "kindof.h"

diff --git a/src/game/common/system/xfercrc.h b/src/game/common/system/xfercrc.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "xfer.h"
 
 class XferCRC : public Xfer

diff --git a/src/game/common/userpreferences.h b/src/game/common/userpreferences.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include <map>
 

diff --git a/src/game/crashwrapper.h b/src/game/crashwrapper.h
@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
+
 class CrashPreferences;
 
 class CrashPrefWrapper

diff --git a/src/game/logic/map/terrainlogic.h b/src/game/logic/map/terrainlogic.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"

diff --git a/src/game/logic/object/objectcreationlist.h b/src/game/logic/object/objectcreationlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "mempoolobj.h"
 #include "namekeygenerator.h"
 #include "subsysteminterface.h"

diff --git a/src/game/logic/object/objecttypes.h b/src/game/logic/object/objecttypes.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "mempoolobj.h"
 #include "snapshot.h"

diff --git a/src/game/logic/object/partitionmanager.h b/src/game/logic/object/partitionmanager.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "bitflags.h"
 #include "coord.h"
 #include "gametype.h"

diff --git a/src/game/logic/object/weapon.h b/src/game/logic/object/weapon.h
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "coord.h"

diff --git a/src/game/logic/scriptengine/scriptengine.h b/src/game/logic/scriptengine/scriptengine.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"

diff --git a/src/game/logic/scriptengine/scripttemplate.h b/src/game/logic/scriptengine/scripttemplate.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "mempoolobj.h"
 #include "namekeygenerator.h"

diff --git a/src/game/logic/scriptengine/sequentialscript.h b/src/game/logic/scriptengine/sequentialscript.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gametype.h"
 #include "mempoolobj.h"
 #include "snapshot.h"

diff --git a/src/game/logic/system/cavesystem.h b/src/game/logic/system/cavesystem.h
@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include "always.h"
 #include "gametype.h"
 #include "mempoolobj.h"
 #include "snapshot.h"

diff --git a/src/platform/sdl2/sdl2gameengine.h b/src/platform/sdl2/sdl2gameengine.h
@@ -14,12 +14,13 @@
  */
 #pragma once
 
-#include "gameengine.h"
-
 #ifndef BUILD_WITH_SDL2
 #error Only include sdl2gameengine.h when building with SDL2
 #endif
 
+#include "always.h"
+#include "gameengine.h"
+
 #include <SDL.h>
 
 namespace Thyme

diff --git a/src/platform/sdl2/sdl2mouse.h b/src/platform/sdl2/sdl2mouse.h
@@ -18,6 +18,7 @@
 #error Only include sdl2mouse.h when building with SDL2
 #endif
 
+#include "always.h"
 #include "mouse.h"
 
 #include <SDL.h>