Move always.h from headers to cpp files

src/editor/editmain.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "editmain.h"
 
 #if !defined GAME_DLL && defined PLATFORM_WINDOWS

src/editor/editmain.h

@@ -14,8 +14,6 @@
  */
 #pragma once
 
-#include "always.h"
-
 #ifdef GAME_DLL
 extern HWND &g_applicationHWnd;
 #else

src/game/client/color.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "color.h"
 #include "colorspace.h"
 

src/game/client/color.h

@@ -14,8 +14,6 @@
  */
 #pragma once
 
-#include "always.h"
-
 class RGBColor
 {
 public:

src/game/client/crashpreferences.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "crashpreferences.h"
 #include <captainslog.h>
 #include <cstdio>

src/game/client/crashpreferences.h

@@ -14,7 +14,6 @@
  */
 #pragma once
 
-#include "always.h"
 #include "userpreferences.h"
 
 class CrashPreferences : public UserPreferences

src/game/client/credits.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "credits.h"
 #include "displaystringmanager.h"
 #include "gamefont.h"

src/game/client/credits.h

@@ -13,7 +13,7 @@
  *            LICENSE
  */
 #pragma once
-#include "always.h"
+
 #include "ini.h"
 #include "subsysteminterface.h"
 #include "unicodestring.h"

src/game/client/display.cpp

@@ -13,6 +13,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "display.h"
 #include "displaystringmanager.h"
 #include "gamefont.h"

src/game/client/display.h

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

src/game/client/displaystring.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "displaystring.h"
 
 DisplayString::DisplayString() : m_textString(), m_font(nullptr), m_next(nullptr), m_prev(nullptr) {}

src/game/client/displaystring.h

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

src/game/client/displaystringmanager.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "displaystringmanager.h"
 
 #ifndef GAME_DLL

src/game/client/displaystringmanager.h

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

src/game/client/draw/tintenvelope.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "tintenvelope.h"
 #include "color.h"
 #include "xfer.h"

src/game/client/draw/tintenvelope.h

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

src/game/client/drawable.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "drawable.h"
 #include "aiupdate.h"
 #include "audiomanager.h"

src/game/client/drawable.h

@@ -14,7 +14,6 @@
  */
 #pragma once
 
-#include "always.h"
 #include "anim2d.h"
 #include "module.h"
 #include "object.h"

src/game/client/drawable/update/swayclientupdate.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "swayclientupdate.h"
 #include "drawable.h"
 #include "matrix3d.h"

src/game/client/drawgroupinfo.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "drawgroupinfo.h"
 #include "color.h"
 #include "colorspace.h"

src/game/client/drawgroupinfo.h

@@ -14,7 +14,6 @@
  */
 #pragma once
 
-#include "always.h"
 #include "asciistring.h"
 
 struct FieldParse;

src/game/client/eva.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "eva.h"
 #ifdef GAME_DLL
 #include "hooker.h"

src/game/client/eva.h

@@ -13,7 +13,7 @@
  *            LICENSE
  */
 #pragma once
-#include "always.h"
+
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "mempoolobj.h"

src/game/client/fxlist.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "fxlist.h"
 #include "audioeventrts.h"
 #include "audiomanager.h"

src/game/client/gameclient.cpp

@@ -13,6 +13,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "gameclient.h"
 #include "anim2d.h"
 #include "campaignmanager.h"

src/game/client/gameclient.h

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

src/game/client/gametext.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "gametext.h"
 #include "filesystem.h"
 #include "main.h" // For g_applicationHWnd

src/game/client/gametext.h

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

src/game/client/globallanguage.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "globallanguage.h"
 #include "gamemath.h"
 #include "globaldata.h"

src/game/client/gui/animatewindowmanager.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "animatewindowmanager.h"
 #include "gamewindow.h"
 

src/game/client/gui/animatewindowmanager.h

@@ -13,7 +13,7 @@
  *            LICENSE
  */
 #pragma once
-#include "always.h"
+
 #include "coord.h"
 #include "mempoolobj.h"
 #include "processanimatewindow.h"

src/game/client/gui/challengegenerals.cpp

@@ -12,7 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
-
+#include "always.h"
 #include "challengegenerals.h"
 #include "image.h"
 #include "ini.h"

src/game/client/gui/challengegenerals.h

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

src/game/client/gui/controlbar/controlbar.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "actionmanager.h"
 #include "animatewindowmanager.h"

src/game/client/gui/controlbar/controlbar.h

@@ -13,7 +13,7 @@
  *            LICENSE
  */
 #pragma once
-#include "always.h"
+
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "behaviormodule.h"

src/game/client/gui/controlbar/controlbarbeacon.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "gadgettextentry.h"
 #include "gamewindowmanager.h"

src/game/client/gui/controlbar/controlbarcommand.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "aiupdate.h"
 #include "battleplanupdate.h"
 #include "buildassistant.h"

src/game/client/gui/controlbar/controlbarcommandprocessing.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "audioeventrts.h"
 #include "audiomanager.h"
 #include "behaviormodule.h"

src/game/client/gui/controlbar/controlbarmultiselect.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "gadgetpushbutton.h"
 

src/game/client/gui/controlbar/controlbarobserver.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "colorspace.h"
 #include "controlbar.h"
 #include "gadgetpushbutton.h"

src/game/client/gui/controlbar/controlbarocltimer.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "gadgetprogressbar.h"
 #include "gadgetstatictext.h"

src/game/client/gui/controlbar/controlbarresizer.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "ini.h"
 

src/game/client/gui/controlbar/controlbarscheme.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbarscheme.h"
 #include "colorspace.h"
 #include "controlbar.h"

src/game/client/gui/controlbar/controlbarscheme.h

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

src/game/client/gui/controlbar/controlbarstructureinventory.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "gadgetpushbutton.h"
 #include "hotkey.h"

src/game/client/gui/controlbar/controlbarunderconstruction.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "controlbar.h"
 #include "gadgetstatictext.h"
 #include "gametext.h"

src/game/client/gui/disconnectmenu/disconnectmenu.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "disconnectmenu.h"
 
 #ifndef GAME_DLL

src/game/client/gui/disconnectmenu/disconnectmenu.h

@@ -13,7 +13,6 @@
  *            LICENSE
  */
 #pragma once
-#include "always.h"
 
 class DisconnectManager;
 

src/game/client/gui/gadget/gadgetcheckbox.cpp

@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#include "always.h"
 #include "gadgetcheckbox.h"
 #include "gamewindowmanager.h"
 #include "keyboard.h"