Include always.h in more headers

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"

src/game/client/fxlist.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "namekeygenerator.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"

src/game/client/globallanguage.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "ini.h"
 #include "subsysteminterface.h"

src/game/client/maputil.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "ini.h"

src/game/client/terrain/terrainroads.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "color.h"
 #include "gametype.h"
 #include "ini.h"

src/game/client/w3dassetmanager.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "assetmgr.h"
 #include "mempoolobj.h"

src/game/common/audio/audioeventinfo.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bitflags.h"
 #include "ini.h"
 #include "mempoolobj.h"

src/game/common/audio/audioeventrts.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "audioeventinfo.h"
 #include "coord.h"
 #include "gametype.h"

src/game/common/audio/gamesounds.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "coord.h"

src/game/common/bezier/bezfwditerator.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "beziersegment.h"
 
 class BezFwdIterator

src/game/common/bezier/beziersegment.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "coord.h"
 #include "matrix4.h"
 #include <vector>

src/game/common/commandlist.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamemessagelist.h"
 
 class CommandList : public GameMessageList

src/game/common/gamemessage.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"

src/game/common/gamemessagelist.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamemessage.h"
 #include "subsysteminterface.h"
 

src/game/common/globaldata.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "color.h"
 #include "coord.h"

src/game/common/multiplayersettings.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #ifdef GAME_DLL
 #include "hooker.h"
 #endif

src/game/common/namekeygenerator.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "bittype.h"
 #include "ini.h"

src/game/common/overridable.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "mempoolobj.h"
 
 template<class T> class Override

src/game/common/randomvalue.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bittype.h"
 
 class INI;

src/game/common/rts/money.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "snapshot.h"
 
 class INI;

src/game/common/rts/player.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "academystats.h"
 #include "energy.h"
 #include "handicap.h"

src/game/common/rts/playerlist.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "player.h"
 #include "snapshot.h"
 #include "subsysteminterface.h"

src/game/common/rts/scorekeeper.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bitflags.h"
 #include "gametype.h"
 #include "snapshot.h"

src/game/common/system/disabledtypes.h

@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
+
 template<int> class BitFlags;
 
 enum DisabledType

src/game/common/system/file.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "gamememory.h"
 #include "mempoolobj.h"

src/game/common/system/filesystem.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "file.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"

src/game/common/system/functionlexicon.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamewindow.h"
 #include "namekeygenerator.h"
 #include "subsysteminterface.h"

src/game/common/system/localfilesystem.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"
 #include <set>

src/game/common/system/memblob.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "memblock.h"
 #include "rawalloc.h"
 

src/game/common/system/mempoolobj.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "errorcodes.h"
 #include "mempool.h"
 #include "mempoolfact.h"
@@ -47,14 +48,20 @@ class MemoryPoolObject
 #ifdef __SANITIZE_ADDRESS__
 #define IMPLEMENT_NAMED_POOL(classname, poolname) \
 private: \
-    virtual MemoryPool *Get_Object_Pool() override { return nullptr; } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        return nullptr; \
+    } \
 \
 public: \
     enum classname##MagicEnum{ classname##_GLUE_NOT_IMPLEMENTED = 0 };
 
 #define IMPLEMENT_ABSTRACT_POOL(classname) \
 protected: \
-    virtual MemoryPool *Get_Object_Pool() override { throw CODE_01; } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        throw CODE_01; \
+    } \
 \
 private:
 #else
@@ -79,26 +86,38 @@ private: \
             The##classname##Pool->Get_Alloc_Size()); \
         return The##classname##Pool; \
     } \
-    virtual MemoryPool *Get_Object_Pool() override { return Get_Class_Pool(); } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        return Get_Class_Pool(); \
+    } \
 \
 public: \
     enum classname##MagicEnum{ classname##_GLUE_NOT_IMPLEMENTED = 0 }; \
 \
-    void *operator new(size_t size) { return operator new(size, classname##_GLUE_NOT_IMPLEMENTED); } \
+    void *operator new(size_t size) \
+    { \
+        return operator new(size, classname##_GLUE_NOT_IMPLEMENTED); \
+    } \
     void *operator new(size_t size, classname##MagicEnum) \
     { \
         captainslog_dbgassert(size == sizeof(classname), \
             "The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up " \
             "correctly"); \
         return Get_Class_Pool()->Allocate_Block(); \
     } \
-    void operator delete(void *ptr) { operator delete(ptr, classname##_GLUE_NOT_IMPLEMENTED); } \
+    void operator delete(void *ptr) \
+    { \
+        operator delete(ptr, classname##_GLUE_NOT_IMPLEMENTED); \
+    } \
     void operator delete(void *ptr, classname##MagicEnum) \
     { \
         captainslog_dbgassert(0, "Please call Delete_Instance instead of delete."); \
         Get_Class_Pool()->Free_Block(ptr); \
     } \
-    void *operator new(size_t size, void *where) { return where; } \
+    void *operator new(size_t size, void *where) \
+    { \
+        return where; \
+    } \
     void operator delete(void *ptr, void *where) {}
 
 /* NOTE: Operator delete above must exist because of the pairing operator new. However, it should never be called directly.
@@ -108,7 +127,10 @@ public: \
  */
 #define IMPLEMENT_ABSTRACT_POOL(classname) \
 protected: \
-    virtual MemoryPool *Get_Object_Pool() override { throw CODE_01; } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        throw CODE_01; \
+    } \
     void *operator new(size_t size) = delete; \
     void operator delete(void *ptr) \
     { \

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"

src/game/common/system/streamingarchivefile.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamememory.h"
 #include "ramfile.h"
 

src/game/common/system/subsysteminterface.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include <vector>
 

src/game/common/system/xfer.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "gametype.h"
 #include "kindof.h"

src/game/common/system/xfercrc.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "xfer.h"
 
 class XferCRC : public Xfer

src/game/common/userpreferences.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include <map>
 

src/game/crashwrapper.h

@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
+
 class CrashPreferences;
 
 class CrashPrefWrapper

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"

src/game/logic/object/objectcreationlist.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "mempoolobj.h"
 #include "namekeygenerator.h"
 #include "subsysteminterface.h"