diff --git a/src/editor/editmain.cpp b/src/editor/editmain.cpp index d8cc3e982..05ee095e3 100644 --- a/src/editor/editmain.cpp +++ b/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 diff --git a/src/editor/editmain.h b/src/editor/editmain.h index 8749883fe..d7cf73204 100644 --- a/src/editor/editmain.h +++ b/src/editor/editmain.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - #ifdef GAME_DLL extern HWND &g_applicationHWnd; #else diff --git a/src/game/client/color.cpp b/src/game/client/color.cpp index 68517b80a..7159ad5bf 100644 --- a/src/game/client/color.cpp +++ b/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" diff --git a/src/game/client/color.h b/src/game/client/color.h index 6503fcce6..a032bcdf8 100644 --- a/src/game/client/color.h +++ b/src/game/client/color.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class RGBColor { public: diff --git a/src/game/client/crashpreferences.cpp b/src/game/client/crashpreferences.cpp index fa50773ef..b68b209c1 100644 --- a/src/game/client/crashpreferences.cpp +++ b/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 #include diff --git a/src/game/client/crashpreferences.h b/src/game/client/crashpreferences.h index 9ad593e2f..a9b6793c6 100644 --- a/src/game/client/crashpreferences.h +++ b/src/game/client/crashpreferences.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "userpreferences.h" class CrashPreferences : public UserPreferences diff --git a/src/game/client/credits.cpp b/src/game/client/credits.cpp index d22e426d7..7c3181b3b 100644 --- a/src/game/client/credits.cpp +++ b/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" diff --git a/src/game/client/credits.h b/src/game/client/credits.h index a8fd1425d..172a24358 100644 --- a/src/game/client/credits.h +++ b/src/game/client/credits.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "ini.h" #include "subsysteminterface.h" #include "unicodestring.h" diff --git a/src/game/client/display.cpp b/src/game/client/display.cpp index 667fb1ed7..7d9ef4e9c 100644 --- a/src/game/client/display.cpp +++ b/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" diff --git a/src/game/client/display.h b/src/game/client/display.h index f85a0a568..321c1f109 100644 --- a/src/game/client/display.h +++ b/src/game/client/display.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "color.h" #include "coord.h" #include "gamelod.h" diff --git a/src/game/client/displaystring.cpp b/src/game/client/displaystring.cpp index 206ca54e8..a3ec94021 100644 --- a/src/game/client/displaystring.cpp +++ b/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) {} diff --git a/src/game/client/displaystring.h b/src/game/client/displaystring.h index 0c6f41e6d..7509fedd8 100644 --- a/src/game/client/displaystring.h +++ b/src/game/client/displaystring.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "coord.h" #include "gamefont.h" #include "mempoolobj.h" diff --git a/src/game/client/displaystringmanager.cpp b/src/game/client/displaystringmanager.cpp index 0f9d6365f..7727701c3 100644 --- a/src/game/client/displaystringmanager.cpp +++ b/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 diff --git a/src/game/client/displaystringmanager.h b/src/game/client/displaystringmanager.h index 26e279aab..55c6dd952 100644 --- a/src/game/client/displaystringmanager.h +++ b/src/game/client/displaystringmanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "displaystring.h" #include "subsysteminterface.h" diff --git a/src/game/client/draw/tintenvelope.cpp b/src/game/client/draw/tintenvelope.cpp index 9c05f87eb..e9de231b0 100644 --- a/src/game/client/draw/tintenvelope.cpp +++ b/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" diff --git a/src/game/client/draw/tintenvelope.h b/src/game/client/draw/tintenvelope.h index 2e09dd5f4..d620f0d4e 100644 --- a/src/game/client/draw/tintenvelope.h +++ b/src/game/client/draw/tintenvelope.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "mempoolobj.h" #include "snapshot.h" #include "vector3.h" diff --git a/src/game/client/drawable.cpp b/src/game/client/drawable.cpp index d3eaca162..1c900469b 100644 --- a/src/game/client/drawable.cpp +++ b/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" diff --git a/src/game/client/drawable.h b/src/game/client/drawable.h index 2ceed1c31..b2882cbd4 100644 --- a/src/game/client/drawable.h +++ b/src/game/client/drawable.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "anim2d.h" #include "module.h" #include "object.h" diff --git a/src/game/client/drawable/update/swayclientupdate.cpp b/src/game/client/drawable/update/swayclientupdate.cpp index d1fef668b..4f2b4059b 100644 --- a/src/game/client/drawable/update/swayclientupdate.cpp +++ b/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" diff --git a/src/game/client/drawgroupinfo.cpp b/src/game/client/drawgroupinfo.cpp index 5404161d1..3cd0803ff 100644 --- a/src/game/client/drawgroupinfo.cpp +++ b/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" diff --git a/src/game/client/drawgroupinfo.h b/src/game/client/drawgroupinfo.h index 8bca080cb..b05e1763b 100644 --- a/src/game/client/drawgroupinfo.h +++ b/src/game/client/drawgroupinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" struct FieldParse; diff --git a/src/game/client/eva.cpp b/src/game/client/eva.cpp index 50c680cb6..fc7e71679 100644 --- a/src/game/client/eva.cpp +++ b/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" diff --git a/src/game/client/eva.h b/src/game/client/eva.h index f1089b1b1..dd734dbbc 100644 --- a/src/game/client/eva.h +++ b/src/game/client/eva.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "audioeventrts.h" #include "mempoolobj.h" diff --git a/src/game/client/fxlist.cpp b/src/game/client/fxlist.cpp index b14f85c41..39b23bc1e 100644 --- a/src/game/client/fxlist.cpp +++ b/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" diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 84c8a1edf..c8b458684 100644 --- a/src/game/client/gameclient.cpp +++ b/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" diff --git a/src/game/client/gameclient.h b/src/game/client/gameclient.h index 6672b94b6..bfb25d674 100644 --- a/src/game/client/gameclient.h +++ b/src/game/client/gameclient.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "coord.h" #include "gamemessage.h" diff --git a/src/game/client/gametext.cpp b/src/game/client/gametext.cpp index 54f8a32c0..fdc8e3347 100644 --- a/src/game/client/gametext.cpp +++ b/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 diff --git a/src/game/client/gametext.h b/src/game/client/gametext.h index e32353931..c41d2a954 100644 --- a/src/game/client/gametext.h +++ b/src/game/client/gametext.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "file.h" #include "subsysteminterface.h" diff --git a/src/game/client/globallanguage.cpp b/src/game/client/globallanguage.cpp index a05392c72..9fda02fbe 100644 --- a/src/game/client/globallanguage.cpp +++ b/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" diff --git a/src/game/client/gui/animatewindowmanager.cpp b/src/game/client/gui/animatewindowmanager.cpp index 0c706cde5..86359ce5a 100644 --- a/src/game/client/gui/animatewindowmanager.cpp +++ b/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" diff --git a/src/game/client/gui/animatewindowmanager.h b/src/game/client/gui/animatewindowmanager.h index 45ad13335..d39dea9a9 100644 --- a/src/game/client/gui/animatewindowmanager.h +++ b/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" diff --git a/src/game/client/gui/challengegenerals.cpp b/src/game/client/gui/challengegenerals.cpp index b872a67a8..d44d299de 100644 --- a/src/game/client/gui/challengegenerals.cpp +++ b/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" diff --git a/src/game/client/gui/challengegenerals.h b/src/game/client/gui/challengegenerals.h index 17f319f2a..13c57477b 100644 --- a/src/game/client/gui/challengegenerals.h +++ b/src/game/client/gui/challengegenerals.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "gamelogic.h" diff --git a/src/game/client/gui/controlbar/controlbar.cpp b/src/game/client/gui/controlbar/controlbar.cpp index 71d7ac0ed..f842c2fae 100644 --- a/src/game/client/gui/controlbar/controlbar.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbar.h b/src/game/client/gui/controlbar/controlbar.h index 1bb446011..2f8bc7f63 100644 --- a/src/game/client/gui/controlbar/controlbar.h +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarbeacon.cpp b/src/game/client/gui/controlbar/controlbarbeacon.cpp index 03fe15128..3ae476685 100644 --- a/src/game/client/gui/controlbar/controlbarbeacon.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarcommand.cpp b/src/game/client/gui/controlbar/controlbarcommand.cpp index f21e90f7d..00d0de714 100644 --- a/src/game/client/gui/controlbar/controlbarcommand.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarcommandprocessing.cpp b/src/game/client/gui/controlbar/controlbarcommandprocessing.cpp index 8e9876e59..8c477b9ef 100644 --- a/src/game/client/gui/controlbar/controlbarcommandprocessing.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarmultiselect.cpp b/src/game/client/gui/controlbar/controlbarmultiselect.cpp index ee0f58a72..acb1cb9d2 100644 --- a/src/game/client/gui/controlbar/controlbarmultiselect.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarobserver.cpp b/src/game/client/gui/controlbar/controlbarobserver.cpp index 65faff942..85fd32aa6 100644 --- a/src/game/client/gui/controlbar/controlbarobserver.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarocltimer.cpp b/src/game/client/gui/controlbar/controlbarocltimer.cpp index 9598cf9b7..9efb9e85c 100644 --- a/src/game/client/gui/controlbar/controlbarocltimer.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarresizer.cpp b/src/game/client/gui/controlbar/controlbarresizer.cpp index 5da102d75..21c896229 100644 --- a/src/game/client/gui/controlbar/controlbarresizer.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarscheme.cpp b/src/game/client/gui/controlbar/controlbarscheme.cpp index dae957974..e540537af 100644 --- a/src/game/client/gui/controlbar/controlbarscheme.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarscheme.h b/src/game/client/gui/controlbar/controlbarscheme.h index 94249f923..cb0809294 100644 --- a/src/game/client/gui/controlbar/controlbarscheme.h +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarstructureinventory.cpp b/src/game/client/gui/controlbar/controlbarstructureinventory.cpp index d19b88588..24f703cf9 100644 --- a/src/game/client/gui/controlbar/controlbarstructureinventory.cpp +++ b/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" diff --git a/src/game/client/gui/controlbar/controlbarunderconstruction.cpp b/src/game/client/gui/controlbar/controlbarunderconstruction.cpp index ecb5fbdf5..19a64189b 100644 --- a/src/game/client/gui/controlbar/controlbarunderconstruction.cpp +++ b/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" diff --git a/src/game/client/gui/disconnectmenu/disconnectmenu.cpp b/src/game/client/gui/disconnectmenu/disconnectmenu.cpp index 0f512dd0f..fb01c7720 100644 --- a/src/game/client/gui/disconnectmenu/disconnectmenu.cpp +++ b/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 diff --git a/src/game/client/gui/disconnectmenu/disconnectmenu.h b/src/game/client/gui/disconnectmenu/disconnectmenu.h index 01929e5f7..43b8388f4 100644 --- a/src/game/client/gui/disconnectmenu/disconnectmenu.h +++ b/src/game/client/gui/disconnectmenu/disconnectmenu.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" class DisconnectManager; diff --git a/src/game/client/gui/gadget/gadgetcheckbox.cpp b/src/game/client/gui/gadget/gadgetcheckbox.cpp index fb49b3b28..7ff51d2a2 100644 --- a/src/game/client/gui/gadget/gadgetcheckbox.cpp +++ b/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" diff --git a/src/game/client/gui/gadget/gadgetcheckbox.h b/src/game/client/gui/gadget/gadgetcheckbox.h index d3d38d6e9..9bdcf1aac 100644 --- a/src/game/client/gui/gadget/gadgetcheckbox.h +++ b/src/game/client/gui/gadget/gadgetcheckbox.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" inline void Gadget_Check_Box_Set_Enabled_Image(GameWindow *check_box, const Image *image) diff --git a/src/game/client/gui/gadget/gadgetcombobox.cpp b/src/game/client/gui/gadget/gadgetcombobox.cpp index b81f98ffd..b89410bac 100644 --- a/src/game/client/gui/gadget/gadgetcombobox.cpp +++ b/src/game/client/gui/gadget/gadgetcombobox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetcombobox.h" #include "displaystring.h" #include "gadgetlistbox.h" diff --git a/src/game/client/gui/gadget/gadgetcombobox.h b/src/game/client/gui/gadget/gadgetcombobox.h index d36a6e15a..3252048cf 100644 --- a/src/game/client/gui/gadget/gadgetcombobox.h +++ b/src/game/client/gui/gadget/gadgetcombobox.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "color.h" #include "gamewindow.h" diff --git a/src/game/client/gui/gadget/gadgethorizontalslider.cpp b/src/game/client/gui/gadget/gadgethorizontalslider.cpp index 85d34b1ce..ccd80a1e7 100644 --- a/src/game/client/gui/gadget/gadgethorizontalslider.cpp +++ b/src/game/client/gui/gadget/gadgethorizontalslider.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetslider.h" WindowMsgHandledType Gadget_Horizontal_Slider_Input( diff --git a/src/game/client/gui/gadget/gadgetlistbox.cpp b/src/game/client/gui/gadget/gadgetlistbox.cpp index 92316b002..df7f069c2 100644 --- a/src/game/client/gui/gadget/gadgetlistbox.cpp +++ b/src/game/client/gui/gadget/gadgetlistbox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetlistbox.h" #include "audioeventrts.h" #include "audiomanager.h" diff --git a/src/game/client/gui/gadget/gadgetlistbox.h b/src/game/client/gui/gadget/gadgetlistbox.h index 3c915e275..78662eb6d 100644 --- a/src/game/client/gui/gadget/gadgetlistbox.h +++ b/src/game/client/gui/gadget/gadgetlistbox.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" enum diff --git a/src/game/client/gui/gadget/gadgetprogressbar.cpp b/src/game/client/gui/gadget/gadgetprogressbar.cpp index 2518bf4a6..7066cab03 100644 --- a/src/game/client/gui/gadget/gadgetprogressbar.cpp +++ b/src/game/client/gui/gadget/gadgetprogressbar.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetprogressbar.h" #include "gamewindowmanager.h" diff --git a/src/game/client/gui/gadget/gadgetprogressbar.h b/src/game/client/gui/gadget/gadgetprogressbar.h index 73af62952..296c4a17b 100644 --- a/src/game/client/gui/gadget/gadgetprogressbar.h +++ b/src/game/client/gui/gadget/gadgetprogressbar.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" inline void Gadget_Progress_Bar_Set_Enabled_Left_End_Image(GameWindow *progress_bar, const Image *image) diff --git a/src/game/client/gui/gadget/gadgetpushbutton.cpp b/src/game/client/gui/gadget/gadgetpushbutton.cpp index d6e0ea45c..452d59457 100644 --- a/src/game/client/gui/gadget/gadgetpushbutton.cpp +++ b/src/game/client/gui/gadget/gadgetpushbutton.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetpushbutton.h" #include "audioeventrts.h" #include "audiomanager.h" diff --git a/src/game/client/gui/gadget/gadgetpushbutton.h b/src/game/client/gui/gadget/gadgetpushbutton.h index 5cf46d520..2db09a844 100644 --- a/src/game/client/gui/gadget/gadgetpushbutton.h +++ b/src/game/client/gui/gadget/gadgetpushbutton.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" struct _PushButtonData diff --git a/src/game/client/gui/gadget/gadgetradiobutton.cpp b/src/game/client/gui/gadget/gadgetradiobutton.cpp index 9395aa0e2..82623c16f 100644 --- a/src/game/client/gui/gadget/gadgetradiobutton.cpp +++ b/src/game/client/gui/gadget/gadgetradiobutton.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetradiobutton.h" #include "gamewindowmanager.h" diff --git a/src/game/client/gui/gadget/gadgetradiobutton.h b/src/game/client/gui/gadget/gadgetradiobutton.h index ebeff78a7..bead77078 100644 --- a/src/game/client/gui/gadget/gadgetradiobutton.h +++ b/src/game/client/gui/gadget/gadgetradiobutton.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" struct _RadioButtonData diff --git a/src/game/client/gui/gadget/gadgetslider.h b/src/game/client/gui/gadget/gadgetslider.h index afaee5396..bb7458975 100644 --- a/src/game/client/gui/gadget/gadgetslider.h +++ b/src/game/client/gui/gadget/gadgetslider.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gadgetpushbutton.h" #include "gamewindow.h" diff --git a/src/game/client/gui/gadget/gadgetstatictext.cpp b/src/game/client/gui/gadget/gadgetstatictext.cpp index 50be6ff65..10de3e38a 100644 --- a/src/game/client/gui/gadget/gadgetstatictext.cpp +++ b/src/game/client/gui/gadget/gadgetstatictext.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetstatictext.h" #include "displaystring.h" #include "displaystringmanager.h" diff --git a/src/game/client/gui/gadget/gadgetstatictext.h b/src/game/client/gui/gadget/gadgetstatictext.h index 0a6ebc8dc..5d055bf5a 100644 --- a/src/game/client/gui/gadget/gadgetstatictext.h +++ b/src/game/client/gui/gadget/gadgetstatictext.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" struct _TextData diff --git a/src/game/client/gui/gadget/gadgettabcontrol.cpp b/src/game/client/gui/gadget/gadgettabcontrol.cpp index d48541540..f61a8fd8e 100644 --- a/src/game/client/gui/gadget/gadgettabcontrol.cpp +++ b/src/game/client/gui/gadget/gadgettabcontrol.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgettabcontrol.h" #include "gamewindowmanager.h" diff --git a/src/game/client/gui/gadget/gadgettabcontrol.h b/src/game/client/gui/gadget/gadgettabcontrol.h index 1a4e181be..62706dd91 100644 --- a/src/game/client/gui/gadget/gadgettabcontrol.h +++ b/src/game/client/gui/gadget/gadgettabcontrol.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" enum diff --git a/src/game/client/gui/gadget/gadgettextentry.cpp b/src/game/client/gui/gadget/gadgettextentry.cpp index 02d0dbd20..d35b34928 100644 --- a/src/game/client/gui/gadget/gadgettextentry.cpp +++ b/src/game/client/gui/gadget/gadgettextentry.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgettextentry.h" #include "displaystring.h" #include "displaystringmanager.h" diff --git a/src/game/client/gui/gadget/gadgettextentry.h b/src/game/client/gui/gadget/gadgettextentry.h index aa056089b..c18929f74 100644 --- a/src/game/client/gui/gadget/gadgettextentry.h +++ b/src/game/client/gui/gadget/gadgettextentry.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" #include "gamewindowmanager.h" diff --git a/src/game/client/gui/gadget/gadgetverticalslider.cpp b/src/game/client/gui/gadget/gadgetverticalslider.cpp index 1dcb4a37d..79f0fc108 100644 --- a/src/game/client/gui/gadget/gadgetverticalslider.cpp +++ b/src/game/client/gui/gadget/gadgetverticalslider.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gadgetslider.h" WindowMsgHandledType Gadget_Vertical_Slider_Input( diff --git a/src/game/client/gui/gamefont.cpp b/src/game/client/gui/gamefont.cpp index 2d62b7b83..ed0cd35f7 100644 --- a/src/game/client/gui/gamefont.cpp +++ b/src/game/client/gui/gamefont.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamefont.h" #ifndef GAME_DLL diff --git a/src/game/client/gui/gamefont.h b/src/game/client/gui/gamefont.h index 0c8b31a18..b80d21d86 100644 --- a/src/game/client/gui/gamefont.h +++ b/src/game/client/gui/gamefont.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "mempoolobj.h" #include "subsysteminterface.h" diff --git a/src/game/client/gui/gamewindow.cpp b/src/game/client/gui/gamewindow.cpp index af4f4eadf..272b22e33 100644 --- a/src/game/client/gui/gamewindow.cpp +++ b/src/game/client/gui/gamewindow.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "gamewindow.h" #include "audioeventrts.h" #include "audiomanager.h" diff --git a/src/game/client/gui/gamewindow.h b/src/game/client/gui/gamewindow.h index 909714941..9ea2bb985 100644 --- a/src/game/client/gui/gamewindow.h +++ b/src/game/client/gui/gamewindow.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "coord.h" #include "gamelogic.h" #include "mempoolobj.h" @@ -414,8 +413,7 @@ class ModalWindow : public MemoryPoolObject public: ModalWindow() : // BUGFIX init all members - m_window(nullptr), - m_next(nullptr) + m_window(nullptr), m_next(nullptr) { } virtual ~ModalWindow() override {} diff --git a/src/game/client/gui/gamewindowglobal.cpp b/src/game/client/gui/gamewindowglobal.cpp index 3668770af..3a7a97fb8 100644 --- a/src/game/client/gui/gamewindowglobal.cpp +++ b/src/game/client/gui/gamewindowglobal.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 "display.h" #include "gamefont.h" diff --git a/src/game/client/gui/gamewindowmanager.cpp b/src/game/client/gui/gamewindowmanager.cpp index 2c894312c..105c9e368 100644 --- a/src/game/client/gui/gamewindowmanager.cpp +++ b/src/game/client/gui/gamewindowmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamewindowmanager.h" #include "display.h" #include "displaystringmanager.h" diff --git a/src/game/client/gui/gamewindowmanager.h b/src/game/client/gui/gamewindowmanager.h index 3eec0dc8e..faf878f09 100644 --- a/src/game/client/gui/gamewindowmanager.h +++ b/src/game/client/gui/gamewindowmanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gamewindow.h" #include "subsysteminterface.h" #include "wininstancedata.h" diff --git a/src/game/client/gui/gamewindowmanagerscript.cpp b/src/game/client/gui/gamewindowmanagerscript.cpp index ef4f4e7e3..2623fc21f 100644 --- a/src/game/client/gui/gamewindowmanagerscript.cpp +++ b/src/game/client/gui/gamewindowmanagerscript.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 "display.h" #include "filesystem.h" diff --git a/src/game/client/gui/gamewindowtransitions.cpp b/src/game/client/gui/gamewindowtransitions.cpp index 3ad78293f..8288fe3e2 100644 --- a/src/game/client/gui/gamewindowtransitions.cpp +++ b/src/game/client/gui/gamewindowtransitions.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamewindowtransitions.h" #include "gamewindowmanager.h" #include "ini.h" diff --git a/src/game/client/gui/gamewindowtransitions.h b/src/game/client/gui/gamewindowtransitions.h index 984f18f5c..6c2f24e48 100644 --- a/src/game/client/gui/gamewindowtransitions.h +++ b/src/game/client/gui/gamewindowtransitions.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "namekeygenerator.h" #include "subsysteminterface.h" #include diff --git a/src/game/client/gui/gamewindowtransitionsstyles.cpp b/src/game/client/gui/gamewindowtransitionsstyles.cpp index 0ac4760b6..9abd7ab20 100644 --- a/src/game/client/gui/gamewindowtransitionsstyles.cpp +++ b/src/game/client/gui/gamewindowtransitionsstyles.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamewindowtransitions.h" Transition::Transition() {} diff --git a/src/game/client/gui/guicallbacks/controlbarcallback.cpp b/src/game/client/gui/guicallbacks/controlbarcallback.cpp index 086e0e2c6..35eb0f8ee 100644 --- a/src/game/client/gui/guicallbacks/controlbarcallback.cpp +++ b/src/game/client/gui/guicallbacks/controlbarcallback.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 "commandxlat.h" #include "controlbar.h" diff --git a/src/game/client/gui/guicallbacks/controlbarpopupdescription.cpp b/src/game/client/gui/guicallbacks/controlbarpopupdescription.cpp index 5448510cd..ecc227fd5 100644 --- a/src/game/client/gui/guicallbacks/controlbarpopupdescription.cpp +++ b/src/game/client/gui/guicallbacks/controlbarpopupdescription.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 "buildassistant.h" #include "controlbar.h" diff --git a/src/game/client/gui/guicallbacks/diplomacy.cpp b/src/game/client/gui/guicallbacks/diplomacy.cpp index 4a70e4942..67af8db21 100644 --- a/src/game/client/gui/guicallbacks/diplomacy.cpp +++ b/src/game/client/gui/guicallbacks/diplomacy.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "diplomacy.h" #ifdef GAME_DLL diff --git a/src/game/client/gui/guicallbacks/diplomacy.h b/src/game/client/gui/guicallbacks/diplomacy.h index 7763a844a..069405782 100644 --- a/src/game/client/gui/guicallbacks/diplomacy.h +++ b/src/game/client/gui/guicallbacks/diplomacy.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include diff --git a/src/game/client/gui/guicallbacks/generalsexppoints.cpp b/src/game/client/gui/guicallbacks/generalsexppoints.cpp index 1a8da3020..76646e2b0 100644 --- a/src/game/client/gui/guicallbacks/generalsexppoints.cpp +++ b/src/game/client/gui/guicallbacks/generalsexppoints.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "generalsexppoints.h" #include "controlbar.h" #include "ingameui.h" diff --git a/src/game/client/gui/guicallbacks/generalsexppoints.h b/src/game/client/gui/guicallbacks/generalsexppoints.h index 7fb77122f..f480a5a9a 100644 --- a/src/game/client/gui/guicallbacks/generalsexppoints.h +++ b/src/game/client/gui/guicallbacks/generalsexppoints.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" WindowMsgHandledType Generals_Exp_Points_Input( diff --git a/src/game/client/gui/guicallbacks/ingamechat.cpp b/src/game/client/gui/guicallbacks/ingamechat.cpp index 678992d21..e7b62b3de 100644 --- a/src/game/client/gui/guicallbacks/ingamechat.cpp +++ b/src/game/client/gui/guicallbacks/ingamechat.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ingamechat.h" #ifdef GAME_DLL diff --git a/src/game/client/gui/guicallbacks/ingamechat.h b/src/game/client/gui/guicallbacks/ingamechat.h index 689b7adca..28052cd0f 100644 --- a/src/game/client/gui/guicallbacks/ingamechat.h +++ b/src/game/client/gui/guicallbacks/ingamechat.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" bool Is_In_Game_Chat_Active(); void Reset_In_Game_Chat(); diff --git a/src/game/client/gui/guicallbacks/menus/quitmenu.cpp b/src/game/client/gui/guicallbacks/menus/quitmenu.cpp index 1b9a520d1..6aecb8f8b 100644 --- a/src/game/client/gui/guicallbacks/menus/quitmenu.cpp +++ b/src/game/client/gui/guicallbacks/menus/quitmenu.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "quitmenu.h" #ifdef GAME_DLL diff --git a/src/game/client/gui/guicallbacks/menus/quitmenu.h b/src/game/client/gui/guicallbacks/menus/quitmenu.h index affe8b0ce..8ad2e11a4 100644 --- a/src/game/client/gui/guicallbacks/menus/quitmenu.h +++ b/src/game/client/gui/guicallbacks/menus/quitmenu.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" void Hide_Quit_Menu(); void Toggle_Quit_Menu(); diff --git a/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.cpp b/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.cpp index e6408eb68..a6b2b4eff 100644 --- a/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.cpp +++ b/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "skirmishgameoptionsmenu.h" #include "gametext.h" #include "image.h" diff --git a/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.h b/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.h index f8429498a..ca9f8f0b0 100644 --- a/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.h +++ b/src/game/client/gui/guicallbacks/skirmishgameoptionsmenu.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" #include "gamewindow.h" #include "maputil.h" diff --git a/src/game/client/gui/headertemplate.cpp b/src/game/client/gui/headertemplate.cpp index 10ab7c9ff..574b01098 100644 --- a/src/game/client/gui/headertemplate.cpp +++ b/src/game/client/gui/headertemplate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "headertemplate.h" #include "gamefont.h" #include "globallanguage.h" diff --git a/src/game/client/gui/headertemplate.h b/src/game/client/gui/headertemplate.h index 24db32c20..b6d262491 100644 --- a/src/game/client/gui/headertemplate.h +++ b/src/game/client/gui/headertemplate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamefont.h" #include "ini.h" #include diff --git a/src/game/client/gui/imemanager.cpp b/src/game/client/gui/imemanager.cpp index 946f71103..f12d3fbd2 100644 --- a/src/game/client/gui/imemanager.cpp +++ b/src/game/client/gui/imemanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "imemanager.h" #include "gamefont.h" #include "gamewindowmanager.h" diff --git a/src/game/client/gui/imemanager.h b/src/game/client/gui/imemanager.h index 3f4e51b09..bf00951e2 100644 --- a/src/game/client/gui/imemanager.h +++ b/src/game/client/gui/imemanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "imemanagerinterface.h" #ifdef PLATFORM_WINDOWS #include diff --git a/src/game/client/gui/imemanagerinterface.cpp b/src/game/client/gui/imemanagerinterface.cpp index 547ddb239..2085f08b0 100644 --- a/src/game/client/gui/imemanagerinterface.cpp +++ b/src/game/client/gui/imemanagerinterface.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "imemanagerinterface.h" #ifndef GAME_DLL diff --git a/src/game/client/gui/imemanagerinterface.h b/src/game/client/gui/imemanagerinterface.h index afcfe9712..d0df3b06d 100644 --- a/src/game/client/gui/imemanagerinterface.h +++ b/src/game/client/gui/imemanagerinterface.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "subsysteminterface.h" class GameWindow; diff --git a/src/game/client/gui/loadscreen.cpp b/src/game/client/gui/loadscreen.cpp index 0dde54ccf..761cf99b8 100644 --- a/src/game/client/gui/loadscreen.cpp +++ b/src/game/client/gui/loadscreen.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "loadscreen.h" #include "display.h" #include "fpusetting.h" diff --git a/src/game/client/gui/loadscreen.h b/src/game/client/gui/loadscreen.h index d7ecd3cd6..44294d3ad 100644 --- a/src/game/client/gui/loadscreen.h +++ b/src/game/client/gui/loadscreen.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class GameWindow; class GameInfo; diff --git a/src/game/client/gui/processanimatewindow.cpp b/src/game/client/gui/processanimatewindow.cpp index 694a3f825..5c77ed5d6 100644 --- a/src/game/client/gui/processanimatewindow.cpp +++ b/src/game/client/gui/processanimatewindow.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "processanimatewindow.h" #include "animatewindowmanager.h" #include "display.h" diff --git a/src/game/client/gui/processanimatewindow.h b/src/game/client/gui/processanimatewindow.h index 43c14079e..5d8ee8e84 100644 --- a/src/game/client/gui/processanimatewindow.h +++ b/src/game/client/gui/processanimatewindow.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" class AnimateWindow; diff --git a/src/game/client/gui/shell/shell.cpp b/src/game/client/gui/shell/shell.cpp index d4b25a48b..e9d773216 100644 --- a/src/game/client/gui/shell/shell.cpp +++ b/src/game/client/gui/shell/shell.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "shell.h" #include "imemanager.h" #include "shellmenuscheme.h" diff --git a/src/game/client/gui/shell/shell.h b/src/game/client/gui/shell/shell.h index ca6039aa2..e29b96a30 100644 --- a/src/game/client/gui/shell/shell.h +++ b/src/game/client/gui/shell/shell.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "animatewindowmanager.h" #include "gamewindow.h" #include "subsysteminterface.h" diff --git a/src/game/client/gui/shell/shellmenuscheme.cpp b/src/game/client/gui/shell/shellmenuscheme.cpp index 4fd75e12d..c8de9e5b7 100644 --- a/src/game/client/gui/shell/shellmenuscheme.cpp +++ b/src/game/client/gui/shell/shellmenuscheme.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "shellmenuscheme.h" #include "image.h" #include "ini.h" diff --git a/src/game/client/gui/shell/shellmenuscheme.h b/src/game/client/gui/shell/shellmenuscheme.h index 791959feb..8ab85af4a 100644 --- a/src/game/client/gui/shell/shellmenuscheme.h +++ b/src/game/client/gui/shell/shellmenuscheme.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "coord.h" #include "ini.h" diff --git a/src/game/client/gui/windowlayout.cpp b/src/game/client/gui/windowlayout.cpp index 0a08cabca..da05bc81e 100644 --- a/src/game/client/gui/windowlayout.cpp +++ b/src/game/client/gui/windowlayout.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "windowlayout.h" #include "gamewindow.h" #include "gamewindowmanager.h" diff --git a/src/game/client/gui/windowlayout.h b/src/game/client/gui/windowlayout.h index 7dbca048a..88c6b47fe 100644 --- a/src/game/client/gui/windowlayout.h +++ b/src/game/client/gui/windowlayout.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "mempoolobj.h" #include diff --git a/src/game/client/gui/windowvideomanager.cpp b/src/game/client/gui/windowvideomanager.cpp index 0f4343f07..3139bfc40 100644 --- a/src/game/client/gui/windowvideomanager.cpp +++ b/src/game/client/gui/windowvideomanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "windowvideomanager.h" #include "display.h" diff --git a/src/game/client/gui/windowvideomanager.h b/src/game/client/gui/windowvideomanager.h index 275c634db..75784a9c2 100644 --- a/src/game/client/gui/windowvideomanager.h +++ b/src/game/client/gui/windowvideomanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" #include "videobuffer.h" #include "videoplayer.h" diff --git a/src/game/client/gui/wininstancedata.cpp b/src/game/client/gui/wininstancedata.cpp index 21c42c09a..5f98a5e07 100644 --- a/src/game/client/gui/wininstancedata.cpp +++ b/src/game/client/gui/wininstancedata.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "wininstancedata.h" #include "displaystringmanager.h" #include diff --git a/src/game/client/gui/wininstancedata.h b/src/game/client/gui/wininstancedata.h index 8cd093536..dd65e0a19 100644 --- a/src/game/client/gui/wininstancedata.h +++ b/src/game/client/gui/wininstancedata.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "coord.h" #include "unicodestring.h" diff --git a/src/game/client/ingameui.cpp b/src/game/client/ingameui.cpp index 88728a4d7..6b4b99a5d 100644 --- a/src/game/client/ingameui.cpp +++ b/src/game/client/ingameui.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ingameui.h" #include "actionmanager.h" #include "ai.h" diff --git a/src/game/client/ingameui.h b/src/game/client/ingameui.h index 3aa45f8e2..f228829f7 100644 --- a/src/game/client/ingameui.h +++ b/src/game/client/ingameui.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "bitflags.h" #include "buildassistant.h" #include "color.h" diff --git a/src/game/client/input/keyboard.cpp b/src/game/client/input/keyboard.cpp index deb79a1e0..b25c6c883 100644 --- a/src/game/client/input/keyboard.cpp +++ b/src/game/client/input/keyboard.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "keyboard.h" #include "messagestream.h" #include diff --git a/src/game/client/input/keyboard.h b/src/game/client/input/keyboard.h index fe8e8fe7f..45d1c609b 100644 --- a/src/game/client/input/keyboard.h +++ b/src/game/client/input/keyboard.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "subsysteminterface.h" struct KeyboardIO diff --git a/src/game/client/input/mouse.cpp b/src/game/client/input/mouse.cpp index 997d83594..5a44fb524 100644 --- a/src/game/client/input/mouse.cpp +++ b/src/game/client/input/mouse.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mouse.h" #include "colorspace.h" #include "display.h" diff --git a/src/game/client/input/mouse.h b/src/game/client/input/mouse.h index f9e7ef8f1..52d9d179c 100644 --- a/src/game/client/input/mouse.h +++ b/src/game/client/input/mouse.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "color.h" #include "coord.h" #include "displaystring.h" diff --git a/src/game/client/languagefilter.cpp b/src/game/client/languagefilter.cpp index a6e8c1dfb..bcab41964 100644 --- a/src/game/client/languagefilter.cpp +++ b/src/game/client/languagefilter.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "languagefilter.h" #include "filesystem.h" diff --git a/src/game/client/languagefilter.h b/src/game/client/languagefilter.h index da7203cb2..31b792154 100644 --- a/src/game/client/languagefilter.h +++ b/src/game/client/languagefilter.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "subsysteminterface.h" #include "unicodestring.h" #include diff --git a/src/game/client/line2d.cpp b/src/game/client/line2d.cpp index 889bb9cad..cd730633f 100644 --- a/src/game/client/line2d.cpp +++ b/src/game/client/line2d.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "line2d.h" bool Clip_Line_2D(ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2, IRegion2D *clip_region) diff --git a/src/game/client/line2d.h b/src/game/client/line2d.h index 0d48786e6..1c8469065 100644 --- a/src/game/client/line2d.h +++ b/src/game/client/line2d.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" bool Clip_Line_2D(ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2, IRegion2D *clip_region); diff --git a/src/game/client/maputil.cpp b/src/game/client/maputil.cpp index a393cc118..0c70d1fe7 100644 --- a/src/game/client/maputil.cpp +++ b/src/game/client/maputil.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "maputil.h" #include "cachedfileinputstream.h" #include "colorspace.h" diff --git a/src/game/client/messagestream/commandxlat.cpp b/src/game/client/messagestream/commandxlat.cpp index b2ec4151e..9a9465bb5 100644 --- a/src/game/client/messagestream/commandxlat.cpp +++ b/src/game/client/messagestream/commandxlat.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "commandxlat.h" void Pick_And_Play_Unit_Voice_Response( diff --git a/src/game/client/messagestream/commandxlat.h b/src/game/client/messagestream/commandxlat.h index cbced45b5..962e9d993 100644 --- a/src/game/client/messagestream/commandxlat.h +++ b/src/game/client/messagestream/commandxlat.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawable.h" #include "messagestream.h" diff --git a/src/game/client/messagestream/guicommandtranslator.cpp b/src/game/client/messagestream/guicommandtranslator.cpp index d30b525e7..e9f6b3437 100644 --- a/src/game/client/messagestream/guicommandtranslator.cpp +++ b/src/game/client/messagestream/guicommandtranslator.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "guicommandtranslator.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/messagestream/guicommandtranslator.h b/src/game/client/messagestream/guicommandtranslator.h index b1094875e..e93177cf5 100644 --- a/src/game/client/messagestream/guicommandtranslator.h +++ b/src/game/client/messagestream/guicommandtranslator.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" class GUICommandTranslator : public GameMessageTranslator diff --git a/src/game/client/messagestream/hintspy.cpp b/src/game/client/messagestream/hintspy.cpp index eceb69302..dd67363b0 100644 --- a/src/game/client/messagestream/hintspy.cpp +++ b/src/game/client/messagestream/hintspy.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hintspy.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/messagestream/hintspy.h b/src/game/client/messagestream/hintspy.h index fba2a6772..7812e6cf1 100644 --- a/src/game/client/messagestream/hintspy.h +++ b/src/game/client/messagestream/hintspy.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" class HintSpyTranslator : public GameMessageTranslator diff --git a/src/game/client/messagestream/hotkey.cpp b/src/game/client/messagestream/hotkey.cpp index 3a61f4a1a..cd62d07d8 100644 --- a/src/game/client/messagestream/hotkey.cpp +++ b/src/game/client/messagestream/hotkey.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hotkey.h" #include "gametext.h" #include "gamewindow.h" diff --git a/src/game/client/messagestream/hotkey.h b/src/game/client/messagestream/hotkey.h index 5ba169d96..0a84c489b 100644 --- a/src/game/client/messagestream/hotkey.h +++ b/src/game/client/messagestream/hotkey.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" #include "subsysteminterface.h" #include diff --git a/src/game/client/messagestream/lookatxlat.cpp b/src/game/client/messagestream/lookatxlat.cpp index 8d0a36613..faf0a7a07 100644 --- a/src/game/client/messagestream/lookatxlat.cpp +++ b/src/game/client/messagestream/lookatxlat.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "lookatxlat.h" #include "gamelogic.h" diff --git a/src/game/client/messagestream/lookatxlat.h b/src/game/client/messagestream/lookatxlat.h index 4a3a73ccd..82b088a55 100644 --- a/src/game/client/messagestream/lookatxlat.h +++ b/src/game/client/messagestream/lookatxlat.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" #include "view.h" diff --git a/src/game/client/messagestream/metaevent.cpp b/src/game/client/messagestream/metaevent.cpp index 31f9dcdb7..8d8c1aac6 100644 --- a/src/game/client/messagestream/metaevent.cpp +++ b/src/game/client/messagestream/metaevent.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "metaevent.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/messagestream/metaevent.h b/src/game/client/messagestream/metaevent.h index f260ea3b6..07a0fe012 100644 --- a/src/game/client/messagestream/metaevent.h +++ b/src/game/client/messagestream/metaevent.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamemessage.h" #include "ini.h" #include "mempoolobj.h" diff --git a/src/game/client/messagestream/placeeventtranslator.cpp b/src/game/client/messagestream/placeeventtranslator.cpp index 1c6277371..7d29dc863 100644 --- a/src/game/client/messagestream/placeeventtranslator.cpp +++ b/src/game/client/messagestream/placeeventtranslator.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "placeeventtranslator.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/messagestream/placeeventtranslator.h b/src/game/client/messagestream/placeeventtranslator.h index 8feacc8c2..248a5c807 100644 --- a/src/game/client/messagestream/placeeventtranslator.h +++ b/src/game/client/messagestream/placeeventtranslator.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" class PlaceEventTranslator : public GameMessageTranslator diff --git a/src/game/client/messagestream/selectionxlat.cpp b/src/game/client/messagestream/selectionxlat.cpp index da545a82e..cdedc808c 100644 --- a/src/game/client/messagestream/selectionxlat.cpp +++ b/src/game/client/messagestream/selectionxlat.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "selectionxlat.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/messagestream/selectionxlat.h b/src/game/client/messagestream/selectionxlat.h index edde0b0dc..025d78062 100644 --- a/src/game/client/messagestream/selectionxlat.h +++ b/src/game/client/messagestream/selectionxlat.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" #include diff --git a/src/game/client/messagestream/windowxlat.cpp b/src/game/client/messagestream/windowxlat.cpp index a5aa9b3e2..990b35cdf 100644 --- a/src/game/client/messagestream/windowxlat.cpp +++ b/src/game/client/messagestream/windowxlat.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "windowxlat.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/messagestream/windowxlat.h b/src/game/client/messagestream/windowxlat.h index 7d46bae04..64b065b12 100644 --- a/src/game/client/messagestream/windowxlat.h +++ b/src/game/client/messagestream/windowxlat.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "messagestream.h" class WindowTranslator : public GameMessageTranslator diff --git a/src/game/client/optionpreferences.cpp b/src/game/client/optionpreferences.cpp index 356c786c3..3f4a9010a 100644 --- a/src/game/client/optionpreferences.cpp +++ b/src/game/client/optionpreferences.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "optionpreferences.h" #include "audiomanager.h" #include "globaldata.h" diff --git a/src/game/client/optionpreferences.h b/src/game/client/optionpreferences.h index 6b2cb093e..f0e1b5f60 100644 --- a/src/game/client/optionpreferences.h +++ b/src/game/client/optionpreferences.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "gamelod.h" #include "userpreferences.h" diff --git a/src/game/client/parabolicease.cpp b/src/game/client/parabolicease.cpp index 22304f546..e2ad26854 100644 --- a/src/game/client/parabolicease.cpp +++ b/src/game/client/parabolicease.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "parabolicease.h" #include #include diff --git a/src/game/client/radiusdecal.cpp b/src/game/client/radiusdecal.cpp index 0ecae49f0..2dbb97040 100644 --- a/src/game/client/radiusdecal.cpp +++ b/src/game/client/radiusdecal.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "radiusdecal.h" #include "gamelogic.h" #include "ini.h" diff --git a/src/game/client/radiusdecal.h b/src/game/client/radiusdecal.h index 3524ba4c1..00a12a7a5 100644 --- a/src/game/client/radiusdecal.h +++ b/src/game/client/radiusdecal.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "coord.h" #include "w3dshadow.h" diff --git a/src/game/client/selectioninfo.cpp b/src/game/client/selectioninfo.cpp index cd89a3459..e90e035f6 100644 --- a/src/game/client/selectioninfo.cpp +++ b/src/game/client/selectioninfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "selectioninfo.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/client/selectioninfo.h b/src/game/client/selectioninfo.h index a50db4e63..6594c6535 100644 --- a/src/game/client/selectioninfo.h +++ b/src/game/client/selectioninfo.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "view.h" PickType Get_Pick_Types_For_Context(bool force_to_attack); diff --git a/src/game/client/shader/bwfilter.cpp b/src/game/client/shader/bwfilter.cpp index 44049b1fe..2e6c8ead0 100644 --- a/src/game/client/shader/bwfilter.cpp +++ b/src/game/client/shader/bwfilter.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "display.h" #include "shadermanager.h" #ifdef BUILD_WITH_D3D8 diff --git a/src/game/client/shader/cloudshader.cpp b/src/game/client/shader/cloudshader.cpp index 8ec9a7d99..03bc9a4d1 100644 --- a/src/game/client/shader/cloudshader.cpp +++ b/src/game/client/shader/cloudshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "shadermanager.h" #ifdef BUILD_WITH_D3D8 #include diff --git a/src/game/client/shader/crossfadefilter.cpp b/src/game/client/shader/crossfadefilter.cpp index 88c0c3134..13be6b0a3 100644 --- a/src/game/client/shader/crossfadefilter.cpp +++ b/src/game/client/shader/crossfadefilter.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "assetmgr.h" #include "display.h" #include "shadermanager.h" diff --git a/src/game/client/shader/defaultfilter.cpp b/src/game/client/shader/defaultfilter.cpp index 1fbe4cd44..85ade63d3 100644 --- a/src/game/client/shader/defaultfilter.cpp +++ b/src/game/client/shader/defaultfilter.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "display.h" #include "shadermanager.h" #include "w3dsmudge.h" diff --git a/src/game/client/shader/flatshroudshader.cpp b/src/game/client/shader/flatshroudshader.cpp index b147be195..93f6bec3b 100644 --- a/src/game/client/shader/flatshroudshader.cpp +++ b/src/game/client/shader/flatshroudshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "baseheightmap.h" #include "shadermanager.h" #include "w3dshroud.h" diff --git a/src/game/client/shader/flatterrainshader.cpp b/src/game/client/shader/flatterrainshader.cpp index dd76a513a..c1804ab4f 100644 --- a/src/game/client/shader/flatterrainshader.cpp +++ b/src/game/client/shader/flatterrainshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "baseheightmap.h" #include "globaldata.h" #include "shadermanager.h" diff --git a/src/game/client/shader/maskshader.cpp b/src/game/client/shader/maskshader.cpp index d3dde45f7..c9ae71fde 100644 --- a/src/game/client/shader/maskshader.cpp +++ b/src/game/client/shader/maskshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "shadermanager.h" #ifdef BUILD_WITH_D3D8 #include diff --git a/src/game/client/shader/motionblurfilter.cpp b/src/game/client/shader/motionblurfilter.cpp index 46b5feeda..2c4185ad8 100644 --- a/src/game/client/shader/motionblurfilter.cpp +++ b/src/game/client/shader/motionblurfilter.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "display.h" #include "gamelogic.h" #include "shadermanager.h" diff --git a/src/game/client/shader/roadshader.cpp b/src/game/client/shader/roadshader.cpp index 4cc93bb2b..46da870a9 100644 --- a/src/game/client/shader/roadshader.cpp +++ b/src/game/client/shader/roadshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "globaldata.h" #include "shadermanager.h" #ifdef BUILD_WITH_D3D8 diff --git a/src/game/client/shader/shroudshader.cpp b/src/game/client/shader/shroudshader.cpp index d4f7106dc..71a291ffa 100644 --- a/src/game/client/shader/shroudshader.cpp +++ b/src/game/client/shader/shroudshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "baseheightmap.h" #include "shadermanager.h" #include "w3dshroud.h" diff --git a/src/game/client/shader/terrainshader.cpp b/src/game/client/shader/terrainshader.cpp index 115c5a856..578e90a41 100644 --- a/src/game/client/shader/terrainshader.cpp +++ b/src/game/client/shader/terrainshader.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "globaldata.h" #include "shadermanager.h" #ifdef BUILD_WITH_D3D8 diff --git a/src/game/client/shadermanager.cpp b/src/game/client/shadermanager.cpp index 3bf541509..6b6c44d15 100644 --- a/src/game/client/shadermanager.cpp +++ b/src/game/client/shadermanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "shadermanager.h" #include "assetmgr.h" #include "baseheightmap.h" diff --git a/src/game/client/shadermanager.h b/src/game/client/shadermanager.h index 425e4f748..4302557f7 100644 --- a/src/game/client/shadermanager.h +++ b/src/game/client/shadermanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "dx8wrapper.h" #include "gamelod.h" #include "texture.h" diff --git a/src/game/client/snow.cpp b/src/game/client/snow.cpp index 664315e97..8ce91c5f2 100644 --- a/src/game/client/snow.cpp +++ b/src/game/client/snow.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "snow.h" #ifndef GAME_DLL diff --git a/src/game/client/snow.h b/src/game/client/snow.h index ab91604fd..070c5b040 100644 --- a/src/game/client/snow.h +++ b/src/game/client/snow.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "ini.h" #include "overridable.h" #include "subsysteminterface.h" diff --git a/src/game/client/system/anim2d.cpp b/src/game/client/system/anim2d.cpp index 4c42e49d4..2dbd9591e 100644 --- a/src/game/client/system/anim2d.cpp +++ b/src/game/client/system/anim2d.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "anim2d.h" #include "colorspace.h" #include "gamelogic.h" diff --git a/src/game/client/system/anim2d.h b/src/game/client/system/anim2d.h index cf429a9fd..89ed9753f 100644 --- a/src/game/client/system/anim2d.h +++ b/src/game/client/system/anim2d.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "image.h" #include "snapshot.h" diff --git a/src/game/client/system/campaignmanager.cpp b/src/game/client/system/campaignmanager.cpp index e698e2160..5f45438ca 100644 --- a/src/game/client/system/campaignmanager.cpp +++ b/src/game/client/system/campaignmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "campaignmanager.h" #include "challengegenerals.h" #include "ini.h" diff --git a/src/game/client/system/campaignmanager.h b/src/game/client/system/campaignmanager.h index 7ce6e5668..4bd91f267 100644 --- a/src/game/client/system/campaignmanager.h +++ b/src/game/client/system/campaignmanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "audioeventrts.h" #include "gametype.h" diff --git a/src/game/client/system/debugdisplay.cpp b/src/game/client/system/debugdisplay.cpp index cb0c80744..ab21f4896 100644 --- a/src/game/client/system/debugdisplay.cpp +++ b/src/game/client/system/debugdisplay.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "debugdisplay.h" #include #include diff --git a/src/game/client/system/debugdisplay.h b/src/game/client/system/debugdisplay.h index eb8e9d6dd..cef8facb7 100644 --- a/src/game/client/system/debugdisplay.h +++ b/src/game/client/system/debugdisplay.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class DebugDisplayInterface { public: diff --git a/src/game/client/system/image.h b/src/game/client/system/image.h index 14f631265..a02d90109 100644 --- a/src/game/client/system/image.h +++ b/src/game/client/system/image.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "coord.h" #include "ini.h" #include "mempoolobj.h" diff --git a/src/game/client/system/particlesystem/particle.cpp b/src/game/client/system/particlesystem/particle.cpp index 21530c4fb..e4ee874ba 100644 --- a/src/game/client/system/particlesystem/particle.cpp +++ b/src/game/client/system/particlesystem/particle.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "particle.h" #include "drawable.h" #include "gameclient.h" diff --git a/src/game/client/system/particlesystem/particle.h b/src/game/client/system/particlesystem/particle.h index 2b4311001..e87c9c30b 100644 --- a/src/game/client/system/particlesystem/particle.h +++ b/src/game/client/system/particlesystem/particle.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gametype.h" #include "mempoolobj.h" #include "particleinfo.h" diff --git a/src/game/client/system/particlesystem/particleinfo.cpp b/src/game/client/system/particlesystem/particleinfo.cpp index c3807ef75..1a8ee767a 100644 --- a/src/game/client/system/particlesystem/particleinfo.cpp +++ b/src/game/client/system/particlesystem/particleinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "particleinfo.h" #include "xfer.h" diff --git a/src/game/client/system/particlesystem/particleinfo.h b/src/game/client/system/particlesystem/particleinfo.h index e88c37619..19dc9f6e0 100644 --- a/src/game/client/system/particlesystem/particleinfo.h +++ b/src/game/client/system/particlesystem/particleinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "color.h" #include "coord.h" #include "snapshot.h" diff --git a/src/game/client/system/particlesystem/particlesys.cpp b/src/game/client/system/particlesystem/particlesys.cpp index ade330f4f..adb724ace 100644 --- a/src/game/client/system/particlesystem/particlesys.cpp +++ b/src/game/client/system/particlesystem/particlesys.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "particlesys.h" #include "drawable.h" #include "gameclient.h" diff --git a/src/game/client/system/particlesystem/particlesys.h b/src/game/client/system/particlesystem/particlesys.h index e9cbeb8b9..90dd540ac 100644 --- a/src/game/client/system/particlesystem/particlesys.h +++ b/src/game/client/system/particlesystem/particlesys.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "matrix3d.h" #include "mempoolobj.h" #include "particlesysinfo.h" diff --git a/src/game/client/system/particlesystem/particlesysinfo.cpp b/src/game/client/system/particlesystem/particlesysinfo.cpp index 5e4c8cb52..630cb5ddf 100644 --- a/src/game/client/system/particlesystem/particlesysinfo.cpp +++ b/src/game/client/system/particlesystem/particlesysinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "particlesysinfo.h" #include "xfer.h" diff --git a/src/game/client/system/particlesystem/particlesysinfo.h b/src/game/client/system/particlesystem/particlesysinfo.h index 04f5b33fb..ea7578e53 100644 --- a/src/game/client/system/particlesystem/particlesysinfo.h +++ b/src/game/client/system/particlesystem/particlesysinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "color.h" #include "coord.h" diff --git a/src/game/client/system/particlesystem/particlesysmanager.cpp b/src/game/client/system/particlesystem/particlesysmanager.cpp index cda8c0d06..744473474 100644 --- a/src/game/client/system/particlesystem/particlesysmanager.cpp +++ b/src/game/client/system/particlesystem/particlesysmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "particlesysmanager.h" #include "display.h" #include "gamelogic.h" diff --git a/src/game/client/system/particlesystem/particlesysmanager.h b/src/game/client/system/particlesystem/particlesysmanager.h index 559ddd515..ee91ff196 100644 --- a/src/game/client/system/particlesystem/particlesysmanager.h +++ b/src/game/client/system/particlesystem/particlesysmanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gametype.h" #include "rtsutils.h" #include "snapshot.h" diff --git a/src/game/client/system/particlesystem/particlesystemplate.cpp b/src/game/client/system/particlesystem/particlesystemplate.cpp index 99f547bc0..c4390ae45 100644 --- a/src/game/client/system/particlesystem/particlesystemplate.cpp +++ b/src/game/client/system/particlesystem/particlesystemplate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "particlesystemplate.h" #include "ini.h" #include "particlesysmanager.h" diff --git a/src/game/client/system/particlesystem/particlesystemplate.h b/src/game/client/system/particlesystem/particlesystemplate.h index 62b12fc9c..ea60173d4 100644 --- a/src/game/client/system/particlesystem/particlesystemplate.h +++ b/src/game/client/system/particlesystem/particlesystemplate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "mempoolobj.h" #include "particlesysinfo.h" diff --git a/src/game/client/system/rayeffect.cpp b/src/game/client/system/rayeffect.cpp index 30c4d708e..a0e11b6a2 100644 --- a/src/game/client/system/rayeffect.cpp +++ b/src/game/client/system/rayeffect.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rayeffect.h" #ifndef GAME_DLL diff --git a/src/game/client/system/rayeffect.h b/src/game/client/system/rayeffect.h index 8feefddb8..fff765bde 100644 --- a/src/game/client/system/rayeffect.h +++ b/src/game/client/system/rayeffect.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" #include "subsysteminterface.h" diff --git a/src/game/client/system/smudge.cpp b/src/game/client/system/smudge.cpp index 2b3d1f66d..553aab287 100644 --- a/src/game/client/system/smudge.cpp +++ b/src/game/client/system/smudge.cpp @@ -12,7 +12,9 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "smudge.h" + DLListClass SmudgeSet::s_freeSmudgeList; SmudgeSet::SmudgeSet() : m_smudgeCount(0) {} diff --git a/src/game/client/system/smudge.h b/src/game/client/system/smudge.h index 6a39d9d3d..99d02ee50 100644 --- a/src/game/client/system/smudge.h +++ b/src/game/client/system/smudge.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "dllist.h" #include "vector2.h" #include "vector3.h" diff --git a/src/game/client/terrain/terrainroads.cpp b/src/game/client/terrain/terrainroads.cpp index 3ada17fb9..50ba2160f 100644 --- a/src/game/client/terrain/terrainroads.cpp +++ b/src/game/client/terrain/terrainroads.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "terrainroads.h" #include #include diff --git a/src/game/client/terrain/terrainvisual.cpp b/src/game/client/terrain/terrainvisual.cpp index 504763b7f..8ee2cdce2 100644 --- a/src/game/client/terrain/terrainvisual.cpp +++ b/src/game/client/terrain/terrainvisual.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "terrainvisual.h" #include "xfer.h" diff --git a/src/game/client/terrain/terrainvisual.h b/src/game/client/terrain/terrainvisual.h index 27415645f..e7c90eb54 100644 --- a/src/game/client/terrain/terrainvisual.h +++ b/src/game/client/terrain/terrainvisual.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "snapshot.h" #include "subsysteminterface.h" diff --git a/src/game/client/terraintex.cpp b/src/game/client/terraintex.cpp index 007c45bb8..58230a429 100644 --- a/src/game/client/terraintex.cpp +++ b/src/game/client/terraintex.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "terraintex.h" #include "dx8wrapper.h" #include "globaldata.h" diff --git a/src/game/client/terraintex.h b/src/game/client/terraintex.h index bc7cc0eb2..e31136278 100644 --- a/src/game/client/terraintex.h +++ b/src/game/client/terraintex.h @@ -14,9 +14,9 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "texture.h" + class WorldHeightMap; class TerrainTextureClass : public TextureClass diff --git a/src/game/client/videoplayer/videobuffer.cpp b/src/game/client/videoplayer/videobuffer.cpp index 570d675cc..42de99d3b 100644 --- a/src/game/client/videoplayer/videobuffer.cpp +++ b/src/game/client/videoplayer/videobuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "videobuffer.h" #include "surfaceclass.h" #include "texture.h" diff --git a/src/game/client/videoplayer/videobuffer.h b/src/game/client/videoplayer/videobuffer.h index f0aa723d1..3a66ff5a1 100644 --- a/src/game/client/videoplayer/videobuffer.h +++ b/src/game/client/videoplayer/videobuffer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rect.h" #include "w3dformat.h" diff --git a/src/game/client/videoplayer/videoplayer.cpp b/src/game/client/videoplayer/videoplayer.cpp index a33e6edce..1ddd2379a 100644 --- a/src/game/client/videoplayer/videoplayer.cpp +++ b/src/game/client/videoplayer/videoplayer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "videoplayer.h" #include "videostream.h" #include diff --git a/src/game/client/videoplayer/videoplayer.h b/src/game/client/videoplayer/videoplayer.h index 7b9bb3b4a..387280651 100644 --- a/src/game/client/videoplayer/videoplayer.h +++ b/src/game/client/videoplayer/videoplayer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "ini.h" #include "subsysteminterface.h" diff --git a/src/game/client/videoplayer/videostream.cpp b/src/game/client/videoplayer/videostream.cpp index 2bdd01db2..bb7ccc008 100644 --- a/src/game/client/videoplayer/videostream.cpp +++ b/src/game/client/videoplayer/videostream.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "videostream.h" #include "videoplayer.h" diff --git a/src/game/client/videoplayer/videostream.h b/src/game/client/videoplayer/videostream.h index fab0097f3..0039c4daf 100644 --- a/src/game/client/videoplayer/videostream.h +++ b/src/game/client/videoplayer/videostream.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class VideoPlayer; class VideoBuffer; diff --git a/src/game/client/view.cpp b/src/game/client/view.cpp index 9c1d2da93..143c6205b 100644 --- a/src/game/client/view.cpp +++ b/src/game/client/view.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "view.h" #include "globaldata.h" #include "xfer.h" diff --git a/src/game/client/view.h b/src/game/client/view.h index b10b02c79..b51e02688 100644 --- a/src/game/client/view.h +++ b/src/game/client/view.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "coord.h" #include "gametype.h" #include "snapshot.h" diff --git a/src/game/client/w3dassetmanager.cpp b/src/game/client/w3dassetmanager.cpp index 58f22bfb9..d7624eb6f 100644 --- a/src/game/client/w3dassetmanager.cpp +++ b/src/game/client/w3dassetmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dassetmanager.h" #include "boxrobj.h" #include "chunkio.h" diff --git a/src/game/client/water.cpp b/src/game/client/water.cpp index 066aee575..2510ff18d 100644 --- a/src/game/client/water.cpp +++ b/src/game/client/water.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "water.h" #include "gametype.h" #include "terrainvisual.h" diff --git a/src/game/client/water.h b/src/game/client/water.h index bb8267be9..d4494e5ea 100644 --- a/src/game/client/water.h +++ b/src/game/client/water.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "color.h" #include "gametype.h" diff --git a/src/game/common/audio/audioeventinfo.cpp b/src/game/common/audio/audioeventinfo.cpp index 3def2700d..64e15254c 100644 --- a/src/game/common/audio/audioeventinfo.cpp +++ b/src/game/common/audio/audioeventinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "audioeventinfo.h" #include "audiomanager.h" #include diff --git a/src/game/common/audio/audioeventrts.cpp b/src/game/common/audio/audioeventrts.cpp index aa28a3e4d..a0abe2e56 100644 --- a/src/game/common/audio/audioeventrts.cpp +++ b/src/game/common/audio/audioeventrts.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 "drawable.h" diff --git a/src/game/common/audio/audiomanager.cpp b/src/game/common/audio/audiomanager.cpp index 84690eb54..cfde1e8f8 100644 --- a/src/game/common/audio/audiomanager.cpp +++ b/src/game/common/audio/audiomanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "audiomanager.h" #include "filesystem.h" #include "gamemusic.h" diff --git a/src/game/common/audio/audiomanager.h b/src/game/common/audio/audiomanager.h index 7abd3a335..81a0c946e 100644 --- a/src/game/common/audio/audiomanager.h +++ b/src/game/common/audio/audiomanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "audioeventinfo.h" #include "audiomisc.h" diff --git a/src/game/common/audio/audiomisc.cpp b/src/game/common/audio/audiomisc.cpp index 10eb3e4e1..c498067f7 100644 --- a/src/game/common/audio/audiomisc.cpp +++ b/src/game/common/audio/audiomisc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "audiomisc.h" #include "audiomanager.h" #include diff --git a/src/game/common/audio/audiomisc.h b/src/game/common/audio/audiomisc.h index d6b92a59d..07f36c92d 100644 --- a/src/game/common/audio/audiomisc.h +++ b/src/game/common/audio/audiomisc.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audioeventrts.h" #include "ini.h" diff --git a/src/game/common/audio/audiorequest.h b/src/game/common/audio/audiorequest.h index ddb5ce59d..322c0ad17 100644 --- a/src/game/common/audio/audiorequest.h +++ b/src/game/common/audio/audiorequest.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audioeventrts.h" #include "mempoolobj.h" diff --git a/src/game/common/audio/audiosettings.cpp b/src/game/common/audio/audiosettings.cpp index 01f35521b..142769117 100644 --- a/src/game/common/audio/audiosettings.cpp +++ b/src/game/common/audio/audiosettings.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "audiosettings.h" #include "audiomanager.h" #include "optionpreferences.h" diff --git a/src/game/common/audio/audiosettings.h b/src/game/common/audio/audiosettings.h index 26fbb42d4..b937c778f 100644 --- a/src/game/common/audio/audiosettings.h +++ b/src/game/common/audio/audiosettings.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "gametype.h" #include "ini.h" diff --git a/src/game/common/audio/gamemusic.cpp b/src/game/common/audio/gamemusic.cpp index 6fc84ebdb..c8c90eaf5 100644 --- a/src/game/common/audio/gamemusic.cpp +++ b/src/game/common/audio/gamemusic.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamemusic.h" #include "audiomanager.h" #include "audiorequest.h" diff --git a/src/game/common/audio/gamemusic.h b/src/game/common/audio/gamemusic.h index 4bb87341f..a0ca0d212 100644 --- a/src/game/common/audio/gamemusic.h +++ b/src/game/common/audio/gamemusic.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audioeventrts.h" class MusicManager diff --git a/src/game/common/audio/gamesounds.cpp b/src/game/common/audio/gamesounds.cpp index b4e323b38..1495e2ddd 100644 --- a/src/game/common/audio/gamesounds.cpp +++ b/src/game/common/audio/gamesounds.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamesounds.h" #include "audiomanager.h" #include "partitionmanager.h" diff --git a/src/game/common/bezier/bezfwditerator.cpp b/src/game/common/bezier/bezfwditerator.cpp index e28443997..809fac6ca 100644 --- a/src/game/common/bezier/bezfwditerator.cpp +++ b/src/game/common/bezier/bezfwditerator.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bezfwditerator.h" #include "matrix4.h" diff --git a/src/game/common/bezier/beziersegment.cpp b/src/game/common/bezier/beziersegment.cpp index 95bd672ae..85b075507 100644 --- a/src/game/common/bezier/beziersegment.cpp +++ b/src/game/common/bezier/beziersegment.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "beziersegment.h" #include "bezfwditerator.h" diff --git a/src/game/common/bitflags.cpp b/src/game/common/bitflags.cpp index dc9bc15d4..c6a0e8438 100644 --- a/src/game/common/bitflags.cpp +++ b/src/game/common/bitflags.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bitflags.h" // TODO move this somewhere more appropriate? diff --git a/src/game/common/bitflags.h b/src/game/common/bitflags.h index f382667ce..43ff528f6 100644 --- a/src/game/common/bitflags.h +++ b/src/game/common/bitflags.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "ini.h" #include "xfer.h" diff --git a/src/game/common/commandline.cpp b/src/game/common/commandline.cpp index 6936d0cae..7281ef19c 100644 --- a/src/game/common/commandline.cpp +++ b/src/game/common/commandline.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "commandline.h" #include "archivefilesystem.h" #include "globaldata.h" diff --git a/src/game/common/commandline.h b/src/game/common/commandline.h index 2a72486d2..7ee0f2bfa 100644 --- a/src/game/common/commandline.h +++ b/src/game/common/commandline.h @@ -14,6 +14,4 @@ */ #pragma once -#include "always.h" - void Parse_Command_Line(int argc, char *argv[]); diff --git a/src/game/common/commandlist.cpp b/src/game/common/commandlist.cpp index 75171bb92..a5df1b934 100644 --- a/src/game/common/commandlist.cpp +++ b/src/game/common/commandlist.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "commandlist.h" #include "gamemessage.h" diff --git a/src/game/common/compression/compressionmanager.cpp b/src/game/common/compression/compressionmanager.cpp index 0086fdf07..2ec4a3718 100644 --- a/src/game/common/compression/compressionmanager.cpp +++ b/src/game/common/compression/compressionmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "compressionmanager.h" #include "endiantype.h" #include "refpack.h" diff --git a/src/game/common/compression/compressionmanager.h b/src/game/common/compression/compressionmanager.h index 612cf686d..fdbc6e497 100644 --- a/src/game/common/compression/compressionmanager.h +++ b/src/game/common/compression/compressionmanager.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - enum CompressionType : int32_t { COMPRESSION_NONE, diff --git a/src/game/common/compression/refpack.cpp b/src/game/common/compression/refpack.cpp index 9a25511d4..023c6b8a7 100644 --- a/src/game/common/compression/refpack.cpp +++ b/src/game/common/compression/refpack.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "refpack.h" #include #include diff --git a/src/game/common/compression/refpack.h b/src/game/common/compression/refpack.h index 0aecf0c2c..113a8db6f 100644 --- a/src/game/common/compression/refpack.h +++ b/src/game/common/compression/refpack.h @@ -14,7 +14,5 @@ */ #pragma once -#include "always.h" - int RefPack_Uncompress(void *dst, const void *src, int *size); int RefPack_Compress(void *dst, const void *src, int size, int *opts); diff --git a/src/game/common/compression/zlibcompr.cpp b/src/game/common/compression/zlibcompr.cpp index 5972ad17d..52c1125b9 100644 --- a/src/game/common/compression/zlibcompr.cpp +++ b/src/game/common/compression/zlibcompr.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "zlibcompr.h" #include #include diff --git a/src/game/common/compression/zlibcompr.h b/src/game/common/compression/zlibcompr.h index 95451ffa9..9c7b99f84 100644 --- a/src/game/common/compression/zlibcompr.h +++ b/src/game/common/compression/zlibcompr.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - int Zlib_Uncompress(void *dst, int dst_size, const void *src, int src_size); int Zlib_Compress(void *dst, int dst_size, const void *src, int src_size, int level); int Zlib_MaxSize(int size); diff --git a/src/game/common/coord.h b/src/game/common/coord.h index 8f01993f4..063c76ae2 100644 --- a/src/game/common/coord.h +++ b/src/game/common/coord.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gamemath.h" using GameMath::Sqrt; diff --git a/src/game/common/crc.cpp b/src/game/common/crc.cpp index 5e4a4e3d8..445bd4ab7 100644 --- a/src/game/common/crc.cpp +++ b/src/game/common/crc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "crc.h" void CRC::Add_CRC(uint8_t byte) diff --git a/src/game/common/crc.h b/src/game/common/crc.h index 0eb7e0507..c32897e78 100644 --- a/src/game/common/crc.h +++ b/src/game/common/crc.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "array.h" #include "bittype.h" diff --git a/src/game/common/damagefx.cpp b/src/game/common/damagefx.cpp index 077d4535a..50cb0474d 100644 --- a/src/game/common/damagefx.cpp +++ b/src/game/common/damagefx.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "damagefx.h" #include "fxlist.h" diff --git a/src/game/common/damagefx.h b/src/game/common/damagefx.h index 89445baed..6ffca3284 100644 --- a/src/game/common/damagefx.h +++ b/src/game/common/damagefx.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "namekeygenerator.h" #include "rtsutils.h" #include "subsysteminterface.h" diff --git a/src/game/common/dict.cpp b/src/game/common/dict.cpp index 6bba01c4f..a8c27e02c 100644 --- a/src/game/common/dict.cpp +++ b/src/game/common/dict.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dict.h" #include "memdynalloc.h" #include diff --git a/src/game/common/dict.h b/src/game/common/dict.h index 625beb336..902ce2f7d 100644 --- a/src/game/common/dict.h +++ b/src/game/common/dict.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "namekeygenerator.h" #include "unicodestring.h" diff --git a/src/game/common/gameengine.cpp b/src/game/common/gameengine.cpp index c10e1f1d2..d7e6c165e 100644 --- a/src/game/common/gameengine.cpp +++ b/src/game/common/gameengine.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gameengine.h" #include "actionmanager.h" #include "ai.h" diff --git a/src/game/common/gameengine.h b/src/game/common/gameengine.h index 5c3af25b4..7298fd2b7 100644 --- a/src/game/common/gameengine.h +++ b/src/game/common/gameengine.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "subsysteminterface.h" class ArchiveFileSystem; diff --git a/src/game/common/gamelod.cpp b/src/game/common/gamelod.cpp index ea30ee2bb..748bd3201 100644 --- a/src/game/common/gamelod.cpp +++ b/src/game/common/gamelod.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamelod.h" #include "cpudetect.h" #include "gameclient.h" diff --git a/src/game/common/gamelod.h b/src/game/common/gamelod.h index 80926b4af..3ec724a11 100644 --- a/src/game/common/gamelod.h +++ b/src/game/common/gamelod.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "gametype.h" #include "ini.h" diff --git a/src/game/common/gamemain.cpp b/src/game/common/gamemain.cpp index 350fd7773..622868a8c 100644 --- a/src/game/common/gamemain.cpp +++ b/src/game/common/gamemain.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamemain.h" #include "disabledtypes.h" #include "main.h" diff --git a/src/game/common/gamemain.h b/src/game/common/gamemain.h index 035f1c528..d16771dd3 100644 --- a/src/game/common/gamemain.h +++ b/src/game/common/gamemain.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - void Game_Main(int argc, char *argv[]); #ifdef GAME_DLL diff --git a/src/game/common/gamemessage.cpp b/src/game/common/gamemessage.cpp index e0ff893f9..0162d375b 100644 --- a/src/game/common/gamemessage.cpp +++ b/src/game/common/gamemessage.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamemessage.h" #include "gamemessagelist.h" #include "playerlist.h" diff --git a/src/game/common/gamemessagelist.cpp b/src/game/common/gamemessagelist.cpp index f65d5d05f..adccdf634 100644 --- a/src/game/common/gamemessagelist.cpp +++ b/src/game/common/gamemessagelist.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamemessagelist.h" GameMessageList::~GameMessageList() diff --git a/src/game/common/globaldata.cpp b/src/game/common/globaldata.cpp index 71cc8e28a..7cf39ae30 100644 --- a/src/game/common/globaldata.cpp +++ b/src/game/common/globaldata.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "globaldata.h" #include "crc.h" #include "endiantype.h" diff --git a/src/game/common/ini/ini.cpp b/src/game/common/ini/ini.cpp index f5332cb1a..f41e87a1c 100644 --- a/src/game/common/ini/ini.cpp +++ b/src/game/common/ini/ini.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ini.h" #include "ai.h" #include "anim2d.h" diff --git a/src/game/common/ini/ini.h b/src/game/common/ini/ini.h index ee5a3102f..321f184c0 100644 --- a/src/game/common/ini/ini.h +++ b/src/game/common/ini/ini.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "gametype.h" #include diff --git a/src/game/common/ini/inidrawgroupinfo.cpp b/src/game/common/ini/inidrawgroupinfo.cpp index 7c3e9c5f9..14dbc3bf5 100644 --- a/src/game/common/ini/inidrawgroupinfo.cpp +++ b/src/game/common/ini/inidrawgroupinfo.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 "ini.h" diff --git a/src/game/common/latchrestore.h b/src/game/common/latchrestore.h index 62bbeaf31..4afe88afa 100644 --- a/src/game/common/latchrestore.h +++ b/src/game/common/latchrestore.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" template class LatchRestore { diff --git a/src/game/common/mapobject.cpp b/src/game/common/mapobject.cpp index 67813d870..e17b5536e 100644 --- a/src/game/common/mapobject.cpp +++ b/src/game/common/mapobject.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mapobject.h" #include "color.h" #include "colorspace.h" diff --git a/src/game/common/mapobject.h b/src/game/common/mapobject.h index 9046b5dd8..9a4341212 100644 --- a/src/game/common/mapobject.h +++ b/src/game/common/mapobject.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "coord.h" #include "dict.h" diff --git a/src/game/common/messagestream.cpp b/src/game/common/messagestream.cpp index 25981e736..ef76ad6e5 100644 --- a/src/game/common/messagestream.cpp +++ b/src/game/common/messagestream.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "messagestream.h" #include "commandlist.h" #include "gamelogic.h" diff --git a/src/game/common/messagestream.h b/src/game/common/messagestream.h index 7c8c3bc1e..8bea28a84 100644 --- a/src/game/common/messagestream.h +++ b/src/game/common/messagestream.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gamemessagelist.h" enum GameMessageDisposition diff --git a/src/game/common/multiplayersettings.cpp b/src/game/common/multiplayersettings.cpp index fb8968943..6f6586c1b 100644 --- a/src/game/common/multiplayersettings.cpp +++ b/src/game/common/multiplayersettings.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "multiplayersettings.h" #include "gamemath.h" #include diff --git a/src/game/common/namekeygenerator.cpp b/src/game/common/namekeygenerator.cpp index b1a696393..0af854c9b 100644 --- a/src/game/common/namekeygenerator.cpp +++ b/src/game/common/namekeygenerator.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "namekeygenerator.h" #include diff --git a/src/game/common/randomvalue.cpp b/src/game/common/randomvalue.cpp index 5d8975af0..4e7961748 100644 --- a/src/game/common/randomvalue.cpp +++ b/src/game/common/randomvalue.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "randomvalue.h" #include "crc.h" #include "gamemath.h" diff --git a/src/game/common/recorder.cpp b/src/game/common/recorder.cpp index 4676fd770..83ad350aa 100644 --- a/src/game/common/recorder.cpp +++ b/src/game/common/recorder.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "recorder.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/common/recorder.h b/src/game/common/recorder.h index 3bca5cfe7..55677cb1f 100644 --- a/src/game/common/recorder.h +++ b/src/game/common/recorder.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gameinfo.h" #include "gametype.h" #include "subsysteminterface.h" diff --git a/src/game/common/rts/academystats.cpp b/src/game/common/rts/academystats.cpp index 375df7eba..ea8a5a0d7 100644 --- a/src/game/common/rts/academystats.cpp +++ b/src/game/common/rts/academystats.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "academystats.h" #include "controlbar.h" #include "gamelogic.h" diff --git a/src/game/common/rts/academystats.h b/src/game/common/rts/academystats.h index 429bd673a..57531d0c5 100644 --- a/src/game/common/rts/academystats.h +++ b/src/game/common/rts/academystats.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "snapshot.h" #include "unicodestring.h" diff --git a/src/game/common/rts/actionmanager.cpp b/src/game/common/rts/actionmanager.cpp index 0d979b540..d34ce85a6 100644 --- a/src/game/common/rts/actionmanager.cpp +++ b/src/game/common/rts/actionmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "actionmanager.h" #include "behaviormodule.h" #include "object.h" diff --git a/src/game/common/rts/actionmanager.h b/src/game/common/rts/actionmanager.h index c5d42cc87..4093f82d8 100644 --- a/src/game/common/rts/actionmanager.h +++ b/src/game/common/rts/actionmanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gametype.h" #include "object.h" #include "subsysteminterface.h" diff --git a/src/game/common/rts/buildinfo.cpp b/src/game/common/rts/buildinfo.cpp index 2d3bcf1a4..f8abba583 100644 --- a/src/game/common/rts/buildinfo.cpp +++ b/src/game/common/rts/buildinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "buildinfo.h" #include "ai.h" #include "xfer.h" diff --git a/src/game/common/rts/buildinfo.h b/src/game/common/rts/buildinfo.h index 619a4c3ec..522aba3d7 100644 --- a/src/game/common/rts/buildinfo.h +++ b/src/game/common/rts/buildinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "coord.h" #include "datachunk.h" diff --git a/src/game/common/rts/energy.cpp b/src/game/common/rts/energy.cpp index eb0891285..d7414b201 100644 --- a/src/game/common/rts/energy.cpp +++ b/src/game/common/rts/energy.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "energy.h" #include "audiomanager.h" #include "gamelogic.h" diff --git a/src/game/common/rts/energy.h b/src/game/common/rts/energy.h index b599e67ad..d8b68f6cd 100644 --- a/src/game/common/rts/energy.h +++ b/src/game/common/rts/energy.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "snapshot.h" #include diff --git a/src/game/common/rts/handicap.cpp b/src/game/common/rts/handicap.cpp index 79133f66d..a1a9b774e 100644 --- a/src/game/common/rts/handicap.cpp +++ b/src/game/common/rts/handicap.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "handicap.h" #include "dict.h" #include "namekeygenerator.h" diff --git a/src/game/common/rts/handicap.h b/src/game/common/rts/handicap.h index 892920cfe..5dbe5884d 100644 --- a/src/game/common/rts/handicap.h +++ b/src/game/common/rts/handicap.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "thingtemplate.h" class Dict; diff --git a/src/game/common/rts/missionstats.cpp b/src/game/common/rts/missionstats.cpp index 0cfd59d01..8c8e028e7 100644 --- a/src/game/common/rts/missionstats.cpp +++ b/src/game/common/rts/missionstats.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "missionstats.h" #include "xfer.h" diff --git a/src/game/common/rts/missionstats.h b/src/game/common/rts/missionstats.h index 3de75addf..511372ac2 100644 --- a/src/game/common/rts/missionstats.h +++ b/src/game/common/rts/missionstats.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gametype.h" #include "snapshot.h" diff --git a/src/game/common/rts/money.cpp b/src/game/common/rts/money.cpp index 45c854184..9d4e0f2f4 100644 --- a/src/game/common/rts/money.cpp +++ b/src/game/common/rts/money.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "money.h" #include "audiomanager.h" #include "ini.h" diff --git a/src/game/common/rts/player.cpp b/src/game/common/rts/player.cpp index 0a753ee5a..65d4e3a4c 100644 --- a/src/game/common/rts/player.cpp +++ b/src/game/common/rts/player.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "player.h" #include "actionmanager.h" #include "ai.h" diff --git a/src/game/common/rts/playerlist.cpp b/src/game/common/rts/playerlist.cpp index 3b4e15f44..482464ca2 100644 --- a/src/game/common/rts/playerlist.cpp +++ b/src/game/common/rts/playerlist.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "playerlist.h" #include "network.h" #include "sideslist.h" diff --git a/src/game/common/rts/playertemplate.cpp b/src/game/common/rts/playertemplate.cpp index 65ca78827..b36345af4 100644 --- a/src/game/common/rts/playertemplate.cpp +++ b/src/game/common/rts/playertemplate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "playertemplate.h" #include "image.h" #include diff --git a/src/game/common/rts/playertemplate.h b/src/game/common/rts/playertemplate.h index ff65dd917..09e9237af 100644 --- a/src/game/common/rts/playertemplate.h +++ b/src/game/common/rts/playertemplate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "color.h" #include "gametype.h" diff --git a/src/game/common/rts/productionprerequisite.cpp b/src/game/common/rts/productionprerequisite.cpp index 09c06d126..5b2778d62 100644 --- a/src/game/common/rts/productionprerequisite.cpp +++ b/src/game/common/rts/productionprerequisite.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "productionprerequisite.h" #include "gametext.h" #include "player.h" diff --git a/src/game/common/rts/productionprerequisite.h b/src/game/common/rts/productionprerequisite.h index 4a67f3a38..886b04b98 100644 --- a/src/game/common/rts/productionprerequisite.h +++ b/src/game/common/rts/productionprerequisite.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "science.h" #include diff --git a/src/game/common/rts/resourcegatheringmanager.cpp b/src/game/common/rts/resourcegatheringmanager.cpp index f1dd0b5b9..7f2ce291d 100644 --- a/src/game/common/rts/resourcegatheringmanager.cpp +++ b/src/game/common/rts/resourcegatheringmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "resourcegatheringmanager.h" ResourceGatheringManager::~ResourceGatheringManager() diff --git a/src/game/common/rts/resourcegatheringmanager.h b/src/game/common/rts/resourcegatheringmanager.h index b81463f25..254f6d8d0 100644 --- a/src/game/common/rts/resourcegatheringmanager.h +++ b/src/game/common/rts/resourcegatheringmanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "mempoolobj.h" #include "object.h" #include "snapshot.h" diff --git a/src/game/common/rts/science.cpp b/src/game/common/rts/science.cpp index c85822f17..e23457243 100644 --- a/src/game/common/rts/science.cpp +++ b/src/game/common/rts/science.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "science.h" #include "ini.h" #include "namekeygenerator.h" diff --git a/src/game/common/rts/science.h b/src/game/common/rts/science.h index 281024b1b..f41aea44d 100644 --- a/src/game/common/rts/science.h +++ b/src/game/common/rts/science.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gametype.h" #include "ini.h" #include "mempoolobj.h" diff --git a/src/game/common/rts/scorekeeper.cpp b/src/game/common/rts/scorekeeper.cpp index e2b98ce23..62f7bdb9f 100644 --- a/src/game/common/rts/scorekeeper.cpp +++ b/src/game/common/rts/scorekeeper.cpp @@ -12,7 +12,6 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - #include "always.h" #include "scorekeeper.h" #include "gamelogic.h" diff --git a/src/game/common/rts/sidesinfo.cpp b/src/game/common/rts/sidesinfo.cpp index 913300962..18ed268d3 100644 --- a/src/game/common/rts/sidesinfo.cpp +++ b/src/game/common/rts/sidesinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "sidesinfo.h" SidesInfo::SidesInfo(const SidesInfo &that) : m_buildList(nullptr), m_dict(0), m_scripts(nullptr) diff --git a/src/game/common/rts/sidesinfo.h b/src/game/common/rts/sidesinfo.h index 84586e9da..13467ae4e 100644 --- a/src/game/common/rts/sidesinfo.h +++ b/src/game/common/rts/sidesinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "buildinfo.h" #include "dict.h" #include "scriptlist.h" diff --git a/src/game/common/rts/specialpower.cpp b/src/game/common/rts/specialpower.cpp index a81b80def..4b6eca749 100644 --- a/src/game/common/rts/specialpower.cpp +++ b/src/game/common/rts/specialpower.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "specialpower.h" #include "object.h" #include "player.h" diff --git a/src/game/common/rts/specialpower.h b/src/game/common/rts/specialpower.h index bffc98966..bb698170a 100644 --- a/src/game/common/rts/specialpower.h +++ b/src/game/common/rts/specialpower.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "academystats.h" #include "audioeventrts.h" #include "object.h" diff --git a/src/game/common/rts/team.cpp b/src/game/common/rts/team.cpp index 357371d11..c86d5f30e 100644 --- a/src/game/common/rts/team.cpp +++ b/src/game/common/rts/team.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "team.h" #include "ai.h" #include "damage.h" diff --git a/src/game/common/rts/team.h b/src/game/common/rts/team.h index 85da8ed12..87254282c 100644 --- a/src/game/common/rts/team.h +++ b/src/game/common/rts/team.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aiupdate.h" #include "bitflags.h" #include "coord.h" diff --git a/src/game/common/rts/teamsinfo.cpp b/src/game/common/rts/teamsinfo.cpp index 7ac113475..982f33181 100644 --- a/src/game/common/rts/teamsinfo.cpp +++ b/src/game/common/rts/teamsinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "teamsinfo.h" #include "staticnamekey.h" diff --git a/src/game/common/rts/teamsinfo.h b/src/game/common/rts/teamsinfo.h index 585860363..3a6e2673a 100644 --- a/src/game/common/rts/teamsinfo.h +++ b/src/game/common/rts/teamsinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "dict.h" #include "namekeygenerator.h" #include diff --git a/src/game/common/rtsutils.h b/src/game/common/rtsutils.h index 036a89df3..36508638d 100644 --- a/src/game/common/rtsutils.h +++ b/src/game/common/rtsutils.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "endiantype.h" #include "rtsutilsw3d.h" diff --git a/src/game/common/skirmishbattlehonors.cpp b/src/game/common/skirmishbattlehonors.cpp index 08b97936b..ca805aa8b 100644 --- a/src/game/common/skirmishbattlehonors.cpp +++ b/src/game/common/skirmishbattlehonors.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "skirmishbattlehonors.h" SkirmishBattleHonors::SkirmishBattleHonors() diff --git a/src/game/common/skirmishbattlehonors.h b/src/game/common/skirmishbattlehonors.h index 5430ed45f..422209968 100644 --- a/src/game/common/skirmishbattlehonors.h +++ b/src/game/common/skirmishbattlehonors.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "userpreferences.h" class SkirmishBattleHonors : public UserPreferences diff --git a/src/game/common/sparsematchfinder.h b/src/game/common/sparsematchfinder.h index 9b59bd0a3..2b5fbcb0c 100644 --- a/src/game/common/sparsematchfinder.h +++ b/src/game/common/sparsematchfinder.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include template class SparseMatchFinder diff --git a/src/game/common/statemachine.cpp b/src/game/common/statemachine.cpp index e1473ab28..4232e6683 100644 --- a/src/game/common/statemachine.cpp +++ b/src/game/common/statemachine.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "statemachine.h" #include "gamelogic.h" #include "globaldata.h" diff --git a/src/game/common/statemachine.h b/src/game/common/statemachine.h index 74b54d4d6..501cf6b42 100644 --- a/src/game/common/statemachine.h +++ b/src/game/common/statemachine.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "coord.h" #include "mempoolobj.h" diff --git a/src/game/common/staticnamekey.cpp b/src/game/common/staticnamekey.cpp index 77f5d534c..6a06930e0 100644 --- a/src/game/common/staticnamekey.cpp +++ b/src/game/common/staticnamekey.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "staticnamekey.h" #ifndef GAME_DLL diff --git a/src/game/common/staticnamekey.h b/src/game/common/staticnamekey.h index 529dd1665..8837da763 100644 --- a/src/game/common/staticnamekey.h +++ b/src/game/common/staticnamekey.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "namekeygenerator.h" class StaticNameKey diff --git a/src/game/common/statscollector.cpp b/src/game/common/statscollector.cpp index 41b49297f..d52106d6b 100644 --- a/src/game/common/statscollector.cpp +++ b/src/game/common/statscollector.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "statscollector.h" #include "gamelogic.h" diff --git a/src/game/common/statscollector.h b/src/game/common/statscollector.h index 44d9dcbc0..0c44b0268 100644 --- a/src/game/common/statscollector.h +++ b/src/game/common/statscollector.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" class GameMessage; diff --git a/src/game/common/system/archivefile.cpp b/src/game/common/system/archivefile.cpp index 52b74c1d4..78af14fe5 100644 --- a/src/game/common/system/archivefile.cpp +++ b/src/game/common/system/archivefile.cpp @@ -12,8 +12,10 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "archivefile.h" #include "file.h" + bool Search_String_Matches(Utf8String string, Utf8String search); const ArchivedFileInfo *ArchiveFile::Get_Archived_File_Info(Utf8String const &filename) const diff --git a/src/game/common/system/archivefile.h b/src/game/common/system/archivefile.h index 865f6ff70..7d30a3a1f 100644 --- a/src/game/common/system/archivefile.h +++ b/src/game/common/system/archivefile.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "file.h" #include "rtsutils.h" diff --git a/src/game/common/system/archivefilesystem.cpp b/src/game/common/system/archivefilesystem.cpp index 2673f887e..78454c2f2 100644 --- a/src/game/common/system/archivefilesystem.cpp +++ b/src/game/common/system/archivefilesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "archivefilesystem.h" #include "archivefile.h" #include "globaldata.h" diff --git a/src/game/common/system/archivefilesystem.h b/src/game/common/system/archivefilesystem.h index bba61a546..072331870 100644 --- a/src/game/common/system/archivefilesystem.h +++ b/src/game/common/system/archivefilesystem.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rtsutils.h" #include "subsysteminterface.h" #include diff --git a/src/game/common/system/asciistring.cpp b/src/game/common/system/asciistring.cpp index 31400fa06..10f99d4bc 100644 --- a/src/game/common/system/asciistring.cpp +++ b/src/game/common/system/asciistring.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "asciistring.h" #include "endiantype.h" #include "errorcodes.h" diff --git a/src/game/common/system/asciistring.h b/src/game/common/system/asciistring.h index 30fca0541..f0d0e0a62 100644 --- a/src/game/common/system/asciistring.h +++ b/src/game/common/system/asciistring.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include #include #include diff --git a/src/game/common/system/buildassistant.cpp b/src/game/common/system/buildassistant.cpp index 33ddd4df3..d71423095 100644 --- a/src/game/common/system/buildassistant.cpp +++ b/src/game/common/system/buildassistant.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "buildassistant.h" #include "globaldata.h" #include "xfer.h" diff --git a/src/game/common/system/buildassistant.h b/src/game/common/system/buildassistant.h index efe047759..6c963bb53 100644 --- a/src/game/common/system/buildassistant.h +++ b/src/game/common/system/buildassistant.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "subsysteminterface.h" #include diff --git a/src/game/common/system/cachedfileinputstream.cpp b/src/game/common/system/cachedfileinputstream.cpp index 6d6f09b1a..4590b7e9a 100644 --- a/src/game/common/system/cachedfileinputstream.cpp +++ b/src/game/common/system/cachedfileinputstream.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "cachedfileinputstream.h" #include "compressionmanager.h" #include "filesystem.h" diff --git a/src/game/common/system/cachedfileinputstream.h b/src/game/common/system/cachedfileinputstream.h index 28e9f1d9d..6c8a85c68 100644 --- a/src/game/common/system/cachedfileinputstream.h +++ b/src/game/common/system/cachedfileinputstream.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "chunkinputstream.h" diff --git a/src/game/common/system/cdmanager.cpp b/src/game/common/system/cdmanager.cpp index b43e8bdc3..f20bc0ccf 100644 --- a/src/game/common/system/cdmanager.cpp +++ b/src/game/common/system/cdmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "cdmanager.h" #include "captainslog.h" #ifdef GAME_DLL diff --git a/src/game/common/system/cdmanager.h b/src/game/common/system/cdmanager.h index 47d7494c4..556008d02 100644 --- a/src/game/common/system/cdmanager.h +++ b/src/game/common/system/cdmanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "subsysteminterface.h" class CDDriveInterface; diff --git a/src/game/common/system/chunkinputstream.h b/src/game/common/system/chunkinputstream.h index bccbfdf86..deb8e0d5e 100644 --- a/src/game/common/system/chunkinputstream.h +++ b/src/game/common/system/chunkinputstream.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "inputstream.h" class ChunkInputStream : public InputStream diff --git a/src/game/common/system/datachunk.cpp b/src/game/common/system/datachunk.cpp index e45b6e369..b61b58351 100644 --- a/src/game/common/system/datachunk.cpp +++ b/src/game/common/system/datachunk.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "datachunk.h" #include "endiantype.h" diff --git a/src/game/common/system/datachunk.h b/src/game/common/system/datachunk.h index 5a57df4c9..24ffb230f 100644 --- a/src/game/common/system/datachunk.h +++ b/src/game/common/system/datachunk.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "chunkinputstream.h" #include "datachunktoc.h" diff --git a/src/game/common/system/datachunktoc.cpp b/src/game/common/system/datachunktoc.cpp index 2dcb2c084..bf0af0747 100644 --- a/src/game/common/system/datachunktoc.cpp +++ b/src/game/common/system/datachunktoc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "datachunktoc.h" #include "endiantype.h" #include "rtsutils.h" diff --git a/src/game/common/system/datachunktoc.h b/src/game/common/system/datachunktoc.h index 8002d599d..74ace8477 100644 --- a/src/game/common/system/datachunktoc.h +++ b/src/game/common/system/datachunktoc.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "chunkinputstream.h" #include "mempoolobj.h" diff --git a/src/game/common/system/disabledtypes.cpp b/src/game/common/system/disabledtypes.cpp index 3a444aa50..857cf45ce 100644 --- a/src/game/common/system/disabledtypes.cpp +++ b/src/game/common/system/disabledtypes.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "disabledtypes.h" #include "bitflags.h" diff --git a/src/game/common/system/file.cpp b/src/game/common/system/file.cpp index 02230491e..ea185474d 100644 --- a/src/game/common/system/file.cpp +++ b/src/game/common/system/file.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "file.h" #include #include diff --git a/src/game/common/system/filesystem.cpp b/src/game/common/system/filesystem.cpp index a264f5178..1b29e850c 100644 --- a/src/game/common/system/filesystem.cpp +++ b/src/game/common/system/filesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "filesystem.h" #include "archivefilesystem.h" #include "localfilesystem.h" diff --git a/src/game/common/system/functionlexicon.cpp b/src/game/common/system/functionlexicon.cpp index 227582022..b13c23094 100644 --- a/src/game/common/system/functionlexicon.cpp +++ b/src/game/common/system/functionlexicon.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "functionlexicon.h" #include diff --git a/src/game/common/system/gamememory.cpp b/src/game/common/system/gamememory.cpp index 343422370..5c0404330 100644 --- a/src/game/common/system/gamememory.cpp +++ b/src/game/common/system/gamememory.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamememory.h" #include "critsection.h" #include "gamememoryinit.h" diff --git a/src/game/common/system/gamememory.h b/src/game/common/system/gamememory.h index 198db00c0..b4559c502 100644 --- a/src/game/common/system/gamememory.h +++ b/src/game/common/system/gamememory.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rawalloc.h" class MemoryPool; diff --git a/src/game/common/system/gamememoryinit.cpp b/src/game/common/system/gamememoryinit.cpp index 1d09510bb..b096f53d1 100644 --- a/src/game/common/system/gamememoryinit.cpp +++ b/src/game/common/system/gamememoryinit.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamememoryinit.h" #include "rawalloc.h" #include diff --git a/src/game/common/system/gamememoryinit.h b/src/game/common/system/gamememoryinit.h index d45d7dfad..3a2b47609 100644 --- a/src/game/common/system/gamememoryinit.h +++ b/src/game/common/system/gamememoryinit.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - struct PoolInitRec { const char *pool_name; diff --git a/src/game/common/system/gametype.cpp b/src/game/common/system/gametype.cpp index 6c2a1035d..5058cc253 100644 --- a/src/game/common/system/gametype.cpp +++ b/src/game/common/system/gametype.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gametype.h" const char *g_timeOfDayNames[TIME_OF_DAY_COUNT + 1] = { diff --git a/src/game/common/system/gametype.h b/src/game/common/system/gametype.h index 13b8f8702..cc0297726 100644 --- a/src/game/common/system/gametype.h +++ b/src/game/common/system/gametype.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - enum TimeOfDayType : int32_t { TIME_OF_DAY_INVALID = 0, diff --git a/src/game/common/system/geometry.cpp b/src/game/common/system/geometry.cpp index e040f466e..15a025924 100644 --- a/src/game/common/system/geometry.cpp +++ b/src/game/common/system/geometry.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "geometry.h" #include "gamemath.h" #include "randomvalue.h" diff --git a/src/game/common/system/geometry.h b/src/game/common/system/geometry.h index 243ac5292..2a170c6a7 100644 --- a/src/game/common/system/geometry.h +++ b/src/game/common/system/geometry.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "coord.h" #include "ini.h" #include "snapshot.h" diff --git a/src/game/common/system/inputstream.h b/src/game/common/system/inputstream.h index a56893756..0511e7233 100644 --- a/src/game/common/system/inputstream.h +++ b/src/game/common/system/inputstream.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class InputStream { public: diff --git a/src/game/common/system/kindof.cpp b/src/game/common/system/kindof.cpp index e052118fa..ea99f9946 100644 --- a/src/game/common/system/kindof.cpp +++ b/src/game/common/system/kindof.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "kindof.h" #include "bitflags.h" diff --git a/src/game/common/system/kindof.h b/src/game/common/system/kindof.h index ca24f76b4..58856f10b 100644 --- a/src/game/common/system/kindof.h +++ b/src/game/common/system/kindof.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - template class BitFlags; enum KindOfType : int32_t diff --git a/src/game/common/system/localfile.cpp b/src/game/common/system/localfile.cpp index e4d90c7f7..d15f2b101 100644 --- a/src/game/common/system/localfile.cpp +++ b/src/game/common/system/localfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "localfile.h" #include "ramfile.h" #include @@ -33,16 +34,16 @@ #define open(filename, oflags, ...) _wopen(UTF8To16(filename), oflags, ##__VA_ARGS__) // Make lseek 64bit on windows to match other platforms behaviour? -//#ifdef lseek +// #ifdef lseek // #undef lseek -//#endif +// #endif -//#ifdef off_t -// #undef off_t -//#endif +// #ifdef off_t +// #undef off_t +// #endif -//#define lseek _lseeki64 -// typedef __int64 off_t; +// #define lseek _lseeki64 +// typedef __int64 off_t; #else #error Headers for posix IO needed in localfile.cpp #endif diff --git a/src/game/common/system/localfile.h b/src/game/common/system/localfile.h index dab973d76..85a1f1cf4 100644 --- a/src/game/common/system/localfile.h +++ b/src/game/common/system/localfile.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "file.h" class LocalFile : public File diff --git a/src/game/common/system/localfilesystem.cpp b/src/game/common/system/localfilesystem.cpp index 7fcd72e34..bd0db4700 100644 --- a/src/game/common/system/localfilesystem.cpp +++ b/src/game/common/system/localfilesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "localfilesystem.h" #ifndef GAME_DLL diff --git a/src/game/common/system/memblock.h b/src/game/common/system/memblock.h index 5383461da..e43fa2e34 100644 --- a/src/game/common/system/memblock.h +++ b/src/game/common/system/memblock.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rawalloc.h" #include diff --git a/src/game/common/system/memdynalloc.cpp b/src/game/common/system/memdynalloc.cpp index a2f3338e1..3c81a8cd4 100644 --- a/src/game/common/system/memdynalloc.cpp +++ b/src/game/common/system/memdynalloc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "memdynalloc.h" #include "critsection.h" #include "gamememoryinit.h" diff --git a/src/game/common/system/memdynalloc.h b/src/game/common/system/memdynalloc.h index 2f8f37a76..0f638ecb9 100644 --- a/src/game/common/system/memdynalloc.h +++ b/src/game/common/system/memdynalloc.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rawalloc.h" struct PoolInitRec; diff --git a/src/game/common/system/mempool.cpp b/src/game/common/system/mempool.cpp index 24b7e9984..eadfaf14c 100644 --- a/src/game/common/system/mempool.cpp +++ b/src/game/common/system/mempool.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mempool.h" #include "critsection.h" #include "memblob.h" diff --git a/src/game/common/system/mempool.h b/src/game/common/system/mempool.h index 051b46bcf..0d8ba562e 100644 --- a/src/game/common/system/mempool.h +++ b/src/game/common/system/mempool.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rawalloc.h" class MemoryPoolFactory; diff --git a/src/game/common/system/mempoolfact.cpp b/src/game/common/system/mempoolfact.cpp index da569cfc9..a017dcbd1 100644 --- a/src/game/common/system/mempoolfact.cpp +++ b/src/game/common/system/mempoolfact.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mempoolfact.h" #include "gamememoryinit.h" #include "memdynalloc.h" diff --git a/src/game/common/system/mempoolfact.h b/src/game/common/system/mempoolfact.h index 198c70963..6fdad15f4 100644 --- a/src/game/common/system/mempoolfact.h +++ b/src/game/common/system/mempoolfact.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rawalloc.h" struct PoolInitRec; diff --git a/src/game/common/system/outputstream.h b/src/game/common/system/outputstream.h index 0449dd346..834a1d478 100644 --- a/src/game/common/system/outputstream.h +++ b/src/game/common/system/outputstream.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class OutputStream { public: diff --git a/src/game/common/system/quotedprintable.cpp b/src/game/common/system/quotedprintable.cpp index 07f726ea5..71c2582cb 100644 --- a/src/game/common/system/quotedprintable.cpp +++ b/src/game/common/system/quotedprintable.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "quotedprintable.h" #include diff --git a/src/game/common/system/quotedprintable.h b/src/game/common/system/quotedprintable.h index 0454f2118..48c905e30 100644 --- a/src/game/common/system/quotedprintable.h +++ b/src/game/common/system/quotedprintable.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" Utf8String Ascii_String_To_Quoted_Printable(Utf8String string); diff --git a/src/game/common/system/radar.cpp b/src/game/common/system/radar.cpp index fbdce3d8c..2cb1e5f15 100644 --- a/src/game/common/system/radar.cpp +++ b/src/game/common/system/radar.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "radar.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/common/system/radar.h b/src/game/common/system/radar.h index 09eb46e63..8ab80830d 100644 --- a/src/game/common/system/radar.h +++ b/src/game/common/system/radar.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "color.h" #include "coord.h" #include "gametype.h" diff --git a/src/game/common/system/ramfile.cpp b/src/game/common/system/ramfile.cpp index 5b9f05be7..c742719c7 100644 --- a/src/game/common/system/ramfile.cpp +++ b/src/game/common/system/ramfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ramfile.h" #include "filesystem.h" #include diff --git a/src/game/common/system/rawalloc.h b/src/game/common/system/rawalloc.h index 5259e9f89..090d510fa 100644 --- a/src/game/common/system/rawalloc.h +++ b/src/game/common/system/rawalloc.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include #include diff --git a/src/game/common/system/registryget.cpp b/src/game/common/system/registryget.cpp index 647af7ffa..467a17b5e 100644 --- a/src/game/common/system/registryget.cpp +++ b/src/game/common/system/registryget.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "registryget.h" #include diff --git a/src/game/common/system/registryget.h b/src/game/common/system/registryget.h index a2bb8c1a8..a453237ea 100644 --- a/src/game/common/system/registryget.h +++ b/src/game/common/system/registryget.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" Utf8String Get_Registry_Language(); diff --git a/src/game/common/system/savegame/gamestate.cpp b/src/game/common/system/savegame/gamestate.cpp index e8e7cad91..669bf18ba 100644 --- a/src/game/common/system/savegame/gamestate.cpp +++ b/src/game/common/system/savegame/gamestate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamestate.h" #include "filetransfer.h" #include "globaldata.h" diff --git a/src/game/common/system/savegame/gamestatemap.cpp b/src/game/common/system/savegame/gamestatemap.cpp index 0997b219a..0e6ef5f6d 100644 --- a/src/game/common/system/savegame/gamestatemap.cpp +++ b/src/game/common/system/savegame/gamestatemap.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamestatemap.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/common/system/savegame/gamestatemap.h b/src/game/common/system/savegame/gamestatemap.h index 60de725cb..cc79957d2 100644 --- a/src/game/common/system/savegame/gamestatemap.h +++ b/src/game/common/system/savegame/gamestatemap.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "snapshot.h" #include "subsysteminterface.h" diff --git a/src/game/common/system/snapshot.cpp b/src/game/common/system/snapshot.cpp index b14249794..3ca5c3c92 100644 --- a/src/game/common/system/snapshot.cpp +++ b/src/game/common/system/snapshot.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "snapshot.h" diff --git a/src/game/common/system/snapshot.h b/src/game/common/system/snapshot.h index 2755f4a8f..e9009ec03 100644 --- a/src/game/common/system/snapshot.h +++ b/src/game/common/system/snapshot.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class Xfer; enum SnapshotCode diff --git a/src/game/common/system/stackdump.cpp b/src/game/common/system/stackdump.cpp index 985a09c33..680902aac 100644 --- a/src/game/common/system/stackdump.cpp +++ b/src/game/common/system/stackdump.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "stackdump.h" #include "cpudetect.h" #include "main.h" diff --git a/src/game/common/system/stackdump.h b/src/game/common/system/stackdump.h index 6c92bca40..848d57d38 100644 --- a/src/game/common/system/stackdump.h +++ b/src/game/common/system/stackdump.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #ifdef PLATFORM_WINDOWS diff --git a/src/game/common/system/streamingarchivefile.cpp b/src/game/common/system/streamingarchivefile.cpp index 21f67c6db..b37715dfc 100644 --- a/src/game/common/system/streamingarchivefile.cpp +++ b/src/game/common/system/streamingarchivefile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "streamingarchivefile.h" #include "filesystem.h" #include diff --git a/src/game/common/system/subsysteminterface.cpp b/src/game/common/system/subsysteminterface.cpp index f69e096ed..042c617ca 100644 --- a/src/game/common/system/subsysteminterface.cpp +++ b/src/game/common/system/subsysteminterface.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "subsysteminterface.h" #include "ini.h" #include "xfer.h" diff --git a/src/game/common/system/unicodestring.cpp b/src/game/common/system/unicodestring.cpp index 71fe12abf..54f6e20e2 100644 --- a/src/game/common/system/unicodestring.cpp +++ b/src/game/common/system/unicodestring.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "unicodestring.h" #include "asciistring.h" #include "errorcodes.h" diff --git a/src/game/common/system/unicodestring.h b/src/game/common/system/unicodestring.h index 8f9e5c730..c43aa28c1 100644 --- a/src/game/common/system/unicodestring.h +++ b/src/game/common/system/unicodestring.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "critsection.h" #include #include diff --git a/src/game/common/system/upgrade.cpp b/src/game/common/system/upgrade.cpp index 58c0e0494..de76b5e5c 100644 --- a/src/game/common/system/upgrade.cpp +++ b/src/game/common/system/upgrade.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "upgrade.h" #include "ingameui.h" #include "player.h" diff --git a/src/game/common/system/upgrade.h b/src/game/common/system/upgrade.h index 32c469c37..53b395aa0 100644 --- a/src/game/common/system/upgrade.h +++ b/src/game/common/system/upgrade.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "academystats.h" #include "audioeventrts.h" #include "mempoolobj.h" diff --git a/src/game/common/system/xfer.cpp b/src/game/common/system/xfer.cpp index 86026ca6d..40eb965f3 100644 --- a/src/game/common/system/xfer.cpp +++ b/src/game/common/system/xfer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bitflags.h" #include "color.h" #include "endiantype.h" diff --git a/src/game/common/system/xfercrc.cpp b/src/game/common/system/xfercrc.cpp index 91f65a1d0..f1c2a498c 100644 --- a/src/game/common/system/xfercrc.cpp +++ b/src/game/common/system/xfercrc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "xfercrc.h" #include "endiantype.h" #include "snapshot.h" diff --git a/src/game/common/terraintypes.cpp b/src/game/common/terraintypes.cpp index 8b3936fdf..b2912b167 100644 --- a/src/game/common/terraintypes.cpp +++ b/src/game/common/terraintypes.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "terraintypes.h" #include diff --git a/src/game/common/terraintypes.h b/src/game/common/terraintypes.h index 5d01f1f53..0975578fd 100644 --- a/src/game/common/terraintypes.h +++ b/src/game/common/terraintypes.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "ini.h" #include "mempoolobj.h" diff --git a/src/game/common/thing/drawmodule.h b/src/game/common/thing/drawmodule.h index b58c7c765..bee232f42 100644 --- a/src/game/common/thing/drawmodule.h +++ b/src/game/common/thing/drawmodule.h @@ -13,17 +13,19 @@ * LICENSE */ #pragma once -#include "always.h" + #include "bitflags.h" #include "gametype.h" #include "module.h" #include "object.h" + class DebrisDrawInterface; class TracerDrawInterface; class RopeDrawInterface; class LaserDrawInterface; class Matrix3D; class OBBoxClass; + #ifdef GAME_DEBUG_STRUCTS class DebugDrawStats { diff --git a/src/game/common/thing/module.cpp b/src/game/common/thing/module.cpp index ac4a69d7f..7a65a9b5b 100644 --- a/src/game/common/thing/module.cpp +++ b/src/game/common/thing/module.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "module.h" #include "thing.h" diff --git a/src/game/common/thing/module.h b/src/game/common/thing/module.h index f4b4928be..ae0a7fb32 100644 --- a/src/game/common/thing/module.h +++ b/src/game/common/thing/module.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gamelod.h" #include "namekeygenerator.h" #include "snapshot.h" diff --git a/src/game/common/thing/modulefactory.cpp b/src/game/common/thing/modulefactory.cpp index 7fed4472e..526ead6f2 100644 --- a/src/game/common/thing/modulefactory.cpp +++ b/src/game/common/thing/modulefactory.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "modulefactory.h" #ifndef GAME_DLL diff --git a/src/game/common/thing/modulefactory.h b/src/game/common/thing/modulefactory.h index 0e93deb79..51bf3f29e 100644 --- a/src/game/common/thing/modulefactory.h +++ b/src/game/common/thing/modulefactory.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "ini.h" #include "module.h" #include "namekeygenerator.h" diff --git a/src/game/common/thing/moduleinfo.cpp b/src/game/common/thing/moduleinfo.cpp index 0cae8a635..be8ad6353 100644 --- a/src/game/common/thing/moduleinfo.cpp +++ b/src/game/common/thing/moduleinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "moduleinfo.h" #include "module.h" #include "thingtemplate.h" diff --git a/src/game/common/thing/moduleinfo.h b/src/game/common/thing/moduleinfo.h index 2af6824f7..a748f531a 100644 --- a/src/game/common/thing/moduleinfo.h +++ b/src/game/common/thing/moduleinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include diff --git a/src/game/common/thing/thing.cpp b/src/game/common/thing/thing.cpp index 0c708f97d..095a4b59e 100644 --- a/src/game/common/thing/thing.cpp +++ b/src/game/common/thing/thing.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "thing.h" #include "gamemath.h" #include "globaldata.h" diff --git a/src/game/common/thing/thing.h b/src/game/common/thing/thing.h index 2961e5666..5aff679c2 100644 --- a/src/game/common/thing/thing.h +++ b/src/game/common/thing/thing.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "bitflags.h" #include "coord.h" #include "kindof.h" diff --git a/src/game/common/thing/thingfactory.cpp b/src/game/common/thing/thingfactory.cpp index f37ed71aa..a8b6415fa 100644 --- a/src/game/common/thing/thingfactory.cpp +++ b/src/game/common/thing/thingfactory.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "thingfactory.h" #include "behaviormodule.h" #include "gameclient.h" diff --git a/src/game/common/thing/thingfactory.h b/src/game/common/thing/thingfactory.h index 135d4f022..e42f00790 100644 --- a/src/game/common/thing/thingfactory.h +++ b/src/game/common/thing/thingfactory.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rtsutils.h" #include "subsysteminterface.h" #include "thingtemplate.h" diff --git a/src/game/common/thing/thingtemplate.cpp b/src/game/common/thing/thingtemplate.cpp index 98ae9e409..6e3e1c613 100644 --- a/src/game/common/thing/thingtemplate.cpp +++ b/src/game/common/thing/thingtemplate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "thingtemplate.h" #include "aiupdate.h" #include "audioeventrts.h" diff --git a/src/game/common/thing/thingtemplate.h b/src/game/common/thing/thingtemplate.h index d2a01a4bb..1cf8ef3eb 100644 --- a/src/game/common/thing/thingtemplate.h +++ b/src/game/common/thing/thingtemplate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "armortemplateset.h" #include "asciistring.h" #include "audioeventrts.h" diff --git a/src/game/common/userpreferences.cpp b/src/game/common/userpreferences.cpp index 48cac2bb3..777c1be4b 100644 --- a/src/game/common/userpreferences.cpp +++ b/src/game/common/userpreferences.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "userpreferences.h" #include "globaldata.h" #include diff --git a/src/game/common/version.cpp b/src/game/common/version.cpp index cffac0086..8ae15918d 100644 --- a/src/game/common/version.cpp +++ b/src/game/common/version.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "version.h" #include "gametext.h" diff --git a/src/game/common/version.h b/src/game/common/version.h index 6667d662e..e714d9efc 100644 --- a/src/game/common/version.h +++ b/src/game/common/version.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "unicodestring.h" diff --git a/src/game/copyprotect.cpp b/src/game/copyprotect.cpp index b31bd9c6c..0b2c5875c 100644 --- a/src/game/copyprotect.cpp +++ b/src/game/copyprotect.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "copyprotect.h" bool CopyProtect::isLauncherRunning() diff --git a/src/game/crashwrapper.cpp b/src/game/crashwrapper.cpp index 2bd314edf..be3aa0dfc 100644 --- a/src/game/crashwrapper.cpp +++ b/src/game/crashwrapper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "crashwrapper.h" #include "crashpreferences.h" #include diff --git a/src/game/force_nocd.cpp b/src/game/force_nocd.cpp index 82b591f2f..5fb2c4ad4 100644 --- a/src/game/force_nocd.cpp +++ b/src/game/force_nocd.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "force_nocd.h" bool IsFirstCDPresent() diff --git a/src/game/logic/ai/ai.cpp b/src/game/logic/ai/ai.cpp index 5d68c45fb..8ee0f2e39 100644 --- a/src/game/logic/ai/ai.cpp +++ b/src/game/logic/ai/ai.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ai.h" #include "aipathfind.h" #include "buildinfo.h" diff --git a/src/game/logic/ai/ai.h b/src/game/logic/ai/ai.h index 53dcbeeb3..1945ad9b6 100644 --- a/src/game/logic/ai/ai.h +++ b/src/game/logic/ai/ai.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aigroup.h" #include "aiupdate.h" #include "gametype.h" diff --git a/src/game/logic/ai/aigroup.cpp b/src/game/logic/ai/aigroup.cpp index f5fd5ea06..ad43aeb4b 100644 --- a/src/game/logic/ai/aigroup.cpp +++ b/src/game/logic/ai/aigroup.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aigroup.h" #include "actionmanager.h" #include "ai.h" diff --git a/src/game/logic/ai/aigroup.h b/src/game/logic/ai/aigroup.h index faecb2c48..410e2cc0d 100644 --- a/src/game/logic/ai/aigroup.h +++ b/src/game/logic/ai/aigroup.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aiupdate.h" #include "controlbar.h" #include "gametype.h" diff --git a/src/game/logic/ai/aiguard.cpp b/src/game/logic/ai/aiguard.cpp index 34ae12cab..af3693834 100644 --- a/src/game/logic/ai/aiguard.cpp +++ b/src/game/logic/ai/aiguard.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aiguard.h" #include "ai.h" diff --git a/src/game/logic/ai/aiguard.h b/src/game/logic/ai/aiguard.h index 17f1dcbfe..d9de0c7a2 100644 --- a/src/game/logic/ai/aiguard.h +++ b/src/game/logic/ai/aiguard.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aistates.h" #include "aiupdate.h" diff --git a/src/game/logic/ai/aipathfind.cpp b/src/game/logic/ai/aipathfind.cpp index a3f36622c..a5e3fa96c 100644 --- a/src/game/logic/ai/aipathfind.cpp +++ b/src/game/logic/ai/aipathfind.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aipathfind.h" #include "object.h" #ifdef GAME_DLL diff --git a/src/game/logic/ai/aipathfind.h b/src/game/logic/ai/aipathfind.h index cabcb3561..2c6f80e9b 100644 --- a/src/game/logic/ai/aipathfind.h +++ b/src/game/logic/ai/aipathfind.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" #include "gametype.h" #include "mempoolobj.h" diff --git a/src/game/logic/ai/aiplayer.cpp b/src/game/logic/ai/aiplayer.cpp index 2170d5476..8ee29154c 100644 --- a/src/game/logic/ai/aiplayer.cpp +++ b/src/game/logic/ai/aiplayer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aiplayer.h" #include "ai.h" #include "gamelogic.h" diff --git a/src/game/logic/ai/aiplayer.h b/src/game/logic/ai/aiplayer.h index a375e89b0..733833ca6 100644 --- a/src/game/logic/ai/aiplayer.h +++ b/src/game/logic/ai/aiplayer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "mempoolobj.h" #include "player.h" #include "snapshot.h" diff --git a/src/game/logic/ai/aistates.cpp b/src/game/logic/ai/aistates.cpp index 219ec272c..51c64c18c 100644 --- a/src/game/logic/ai/aistates.cpp +++ b/src/game/logic/ai/aistates.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aistates.h" void AIAttackFireWeaponState::Xfer_Snapshot(Xfer *xfer) diff --git a/src/game/logic/ai/aistates.h b/src/game/logic/ai/aistates.h index b3d8c59d4..36bccce3c 100644 --- a/src/game/logic/ai/aistates.h +++ b/src/game/logic/ai/aistates.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "statemachine.h" enum AIStateType diff --git a/src/game/logic/ai/squad.cpp b/src/game/logic/ai/squad.cpp index c29e155dd..678d1b8e5 100644 --- a/src/game/logic/ai/squad.cpp +++ b/src/game/logic/ai/squad.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "squad.h" #include "ai.h" #include "gamelogic.h" diff --git a/src/game/logic/ai/squad.h b/src/game/logic/ai/squad.h index e1b8fe41f..354cd7d03 100644 --- a/src/game/logic/ai/squad.h +++ b/src/game/logic/ai/squad.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "mempoolobj.h" #include "object.h" diff --git a/src/game/logic/ai/turretai.cpp b/src/game/logic/ai/turretai.cpp index ae9a49b81..3fc6c5039 100644 --- a/src/game/logic/ai/turretai.cpp +++ b/src/game/logic/ai/turretai.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "turretai.h" #include "aiupdate.h" #include "audiomanager.h" diff --git a/src/game/logic/ai/turretai.h b/src/game/logic/ai/turretai.h index 55e5ffb7b..15425c1e1 100644 --- a/src/game/logic/ai/turretai.h +++ b/src/game/logic/ai/turretai.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aistates.h" #include "statemachine.h" #include "updatemodule.h" diff --git a/src/game/logic/map/polygontrigger.cpp b/src/game/logic/map/polygontrigger.cpp index 1b94904ef..bd05fb86e 100644 --- a/src/game/logic/map/polygontrigger.cpp +++ b/src/game/logic/map/polygontrigger.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "polygontrigger.h" #include "globaldata.h" #include "terrainlogic.h" diff --git a/src/game/logic/map/polygontrigger.h b/src/game/logic/map/polygontrigger.h index 9e651bdc7..f835bb2fc 100644 --- a/src/game/logic/map/polygontrigger.h +++ b/src/game/logic/map/polygontrigger.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "datachunk.h" #include "terrainlogic.h" diff --git a/src/game/logic/map/sideslist.cpp b/src/game/logic/map/sideslist.cpp index c0ea28e53..0b25006bb 100644 --- a/src/game/logic/map/sideslist.cpp +++ b/src/game/logic/map/sideslist.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "sideslist.h" #include "cachedfileinputstream.h" #include "scriptlist.h" diff --git a/src/game/logic/map/sideslist.h b/src/game/logic/map/sideslist.h index 8c55771b8..142696ba3 100644 --- a/src/game/logic/map/sideslist.h +++ b/src/game/logic/map/sideslist.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "sidesinfo.h" #include "snapshot.h" #include "subsysteminterface.h" diff --git a/src/game/logic/map/terrainlogic.cpp b/src/game/logic/map/terrainlogic.cpp index 5991b5218..b5ec59131 100644 --- a/src/game/logic/map/terrainlogic.cpp +++ b/src/game/logic/map/terrainlogic.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "terrainlogic.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/game/logic/object/armor.cpp b/src/game/logic/object/armor.cpp index 58118edd0..ffdcb69fb 100644 --- a/src/game/logic/object/armor.cpp +++ b/src/game/logic/object/armor.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "armor.h" #ifndef GAME_DLL diff --git a/src/game/logic/object/armor.h b/src/game/logic/object/armor.h index e571cf8db..a70f0460c 100644 --- a/src/game/logic/object/armor.h +++ b/src/game/logic/object/armor.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "namekeygenerator.h" #include "rtsutils.h" #include "subsysteminterface.h" diff --git a/src/game/logic/object/armortemplateset.cpp b/src/game/logic/object/armortemplateset.cpp index f193dee06..44ca49562 100644 --- a/src/game/logic/object/armortemplateset.cpp +++ b/src/game/logic/object/armortemplateset.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "armortemplateset.h" #include "armor.h" #include "damagefx.h" diff --git a/src/game/logic/object/armortemplateset.h b/src/game/logic/object/armortemplateset.h index ec556bfad..822e654da 100644 --- a/src/game/logic/object/armortemplateset.h +++ b/src/game/logic/object/armortemplateset.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "bitflags.h" #include "ini.h" diff --git a/src/game/logic/object/behavior/autohealbehavior.cpp b/src/game/logic/object/behavior/autohealbehavior.cpp index daa6fb054..83d4542b4 100644 --- a/src/game/logic/object/behavior/autohealbehavior.cpp +++ b/src/game/logic/object/behavior/autohealbehavior.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "autohealbehavior.h" void AutoHealBehavior::Undo_Upgrade() diff --git a/src/game/logic/object/behavior/autohealbehavior.h b/src/game/logic/object/behavior/autohealbehavior.h index a24cfadf6..f9d479647 100644 --- a/src/game/logic/object/behavior/autohealbehavior.h +++ b/src/game/logic/object/behavior/autohealbehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "damagemodule.h" #include "particlesysmanager.h" #include "updatemodule.h" diff --git a/src/game/logic/object/behavior/behaviormodule.cpp b/src/game/logic/object/behavior/behaviormodule.cpp index 5af1422f4..2649f5560 100644 --- a/src/game/logic/object/behavior/behaviormodule.cpp +++ b/src/game/logic/object/behavior/behaviormodule.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "behaviormodule.h" BehaviorModule::BehaviorModule(Thing *thing, const ModuleData *module_data) : ObjectModule(thing, module_data) {} diff --git a/src/game/logic/object/behavior/behaviormodule.h b/src/game/logic/object/behavior/behaviormodule.h index 182f6b77d..2262c296b 100644 --- a/src/game/logic/object/behavior/behaviormodule.h +++ b/src/game/logic/object/behavior/behaviormodule.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "buildassistant.h" #include "module.h" #include "opencontain.h" diff --git a/src/game/logic/object/behavior/bridgebehavior.cpp b/src/game/logic/object/behavior/bridgebehavior.cpp index 266d940d6..fc69cad14 100644 --- a/src/game/logic/object/behavior/bridgebehavior.cpp +++ b/src/game/logic/object/behavior/bridgebehavior.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bridgebehavior.h" #include "behaviormodule.h" #include "object.h" diff --git a/src/game/logic/object/behavior/bridgebehavior.h b/src/game/logic/object/behavior/bridgebehavior.h index 5cad81264..6fb335977 100644 --- a/src/game/logic/object/behavior/bridgebehavior.h +++ b/src/game/logic/object/behavior/bridgebehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "terrainroads.h" class Object; diff --git a/src/game/logic/object/behavior/bridgetowerbehavior.cpp b/src/game/logic/object/behavior/bridgetowerbehavior.cpp index 7ef1bf017..de0b74121 100644 --- a/src/game/logic/object/behavior/bridgetowerbehavior.cpp +++ b/src/game/logic/object/behavior/bridgetowerbehavior.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bridgetowerbehavior.h" #include "behaviormodule.h" #include "object.h" diff --git a/src/game/logic/object/behavior/bridgetowerbehavior.h b/src/game/logic/object/behavior/bridgetowerbehavior.h index 4a5dd9a90..bafdb2e97 100644 --- a/src/game/logic/object/behavior/bridgetowerbehavior.h +++ b/src/game/logic/object/behavior/bridgetowerbehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "terrainroads.h" class Object; diff --git a/src/game/logic/object/behavior/overchargebehavior.cpp b/src/game/logic/object/behavior/overchargebehavior.cpp index d085d4642..29494b5ad 100644 --- a/src/game/logic/object/behavior/overchargebehavior.cpp +++ b/src/game/logic/object/behavior/overchargebehavior.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "overchargebehavior.h" diff --git a/src/game/logic/object/behavior/overchargebehavior.h b/src/game/logic/object/behavior/overchargebehavior.h index 32e26c4fa..9237ccdfd 100644 --- a/src/game/logic/object/behavior/overchargebehavior.h +++ b/src/game/logic/object/behavior/overchargebehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "damagemodule.h" #include "updatemodule.h" diff --git a/src/game/logic/object/behavior/parkingplacebehavior.h b/src/game/logic/object/behavior/parkingplacebehavior.h index 111155275..ac46bd9a1 100644 --- a/src/game/logic/object/behavior/parkingplacebehavior.h +++ b/src/game/logic/object/behavior/parkingplacebehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" enum RunwayReservationType diff --git a/src/game/logic/object/behavior/rebuildholebehavior.cpp b/src/game/logic/object/behavior/rebuildholebehavior.cpp index a32de9011..adc5470ee 100644 --- a/src/game/logic/object/behavior/rebuildholebehavior.cpp +++ b/src/game/logic/object/behavior/rebuildholebehavior.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rebuildholebehavior.h" #include "behaviormodule.h" diff --git a/src/game/logic/object/behavior/rebuildholebehavior.h b/src/game/logic/object/behavior/rebuildholebehavior.h index 68c5b189c..3ce19cf33 100644 --- a/src/game/logic/object/behavior/rebuildholebehavior.h +++ b/src/game/logic/object/behavior/rebuildholebehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" class RebuildHoleBehaviorInterface diff --git a/src/game/logic/object/behavior/spawnbehavior.h b/src/game/logic/object/behavior/spawnbehavior.h index 1b34bf2de..7bf1cb5f6 100644 --- a/src/game/logic/object/behavior/spawnbehavior.h +++ b/src/game/logic/object/behavior/spawnbehavior.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "damage.h" #include "object.h" diff --git a/src/game/logic/object/body/bodymodule.h b/src/game/logic/object/body/bodymodule.h index cae6e86cb..3eadc0893 100644 --- a/src/game/logic/object/body/bodymodule.h +++ b/src/game/logic/object/body/bodymodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "armortemplateset.h" #include "gametype.h" #include "object.h" diff --git a/src/game/logic/object/collide/collidemodule.cpp b/src/game/logic/object/collide/collidemodule.cpp index b6b186f25..e02244536 100644 --- a/src/game/logic/object/collide/collidemodule.cpp +++ b/src/game/logic/object/collide/collidemodule.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "collidemodule.h" diff --git a/src/game/logic/object/collide/collidemodule.h b/src/game/logic/object/collide/collidemodule.h index 57a4d669b..a447b87b9 100644 --- a/src/game/logic/object/collide/collidemodule.h +++ b/src/game/logic/object/collide/collidemodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "behaviormodule.h" class CollideModule : public BehaviorModule, public CollideModuleInterface diff --git a/src/game/logic/object/collide/squishcollide.cpp b/src/game/logic/object/collide/squishcollide.cpp index 9170dc807..92f20a36e 100644 --- a/src/game/logic/object/collide/squishcollide.cpp +++ b/src/game/logic/object/collide/squishcollide.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "squishcollide.h" diff --git a/src/game/logic/object/collide/squishcollide.h b/src/game/logic/object/collide/squishcollide.h index d9a305356..e3e6aefc6 100644 --- a/src/game/logic/object/collide/squishcollide.h +++ b/src/game/logic/object/collide/squishcollide.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "collidemodule.h" class SquishCollide : public CollideModule diff --git a/src/game/logic/object/contain/opencontain.h b/src/game/logic/object/contain/opencontain.h index bd4c08e82..2715a9061 100644 --- a/src/game/logic/object/contain/opencontain.h +++ b/src/game/logic/object/contain/opencontain.h @@ -13,8 +13,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" + class OpenContain; class Player; diff --git a/src/game/logic/object/create/createmodule.cpp b/src/game/logic/object/create/createmodule.cpp index a70a458a2..296944473 100644 --- a/src/game/logic/object/create/createmodule.cpp +++ b/src/game/logic/object/create/createmodule.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "createmodule.h" diff --git a/src/game/logic/object/create/createmodule.h b/src/game/logic/object/create/createmodule.h index 1038f52dd..45778e964 100644 --- a/src/game/logic/object/create/createmodule.h +++ b/src/game/logic/object/create/createmodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "behaviormodule.h" class CreateModuleData : public BehaviorModuleData diff --git a/src/game/logic/object/create/veterancygaincreate.cpp b/src/game/logic/object/create/veterancygaincreate.cpp index 9df9424ee..bacf8a5da 100644 --- a/src/game/logic/object/create/veterancygaincreate.cpp +++ b/src/game/logic/object/create/veterancygaincreate.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "veterancygaincreate.h" diff --git a/src/game/logic/object/create/veterancygaincreate.h b/src/game/logic/object/create/veterancygaincreate.h index bca19b837..a90969a8f 100644 --- a/src/game/logic/object/create/veterancygaincreate.h +++ b/src/game/logic/object/create/veterancygaincreate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "createmodule.h" class VeterancyGainCreateModuleData : public CreateModuleData diff --git a/src/game/logic/object/damage/damagemodule.cpp b/src/game/logic/object/damage/damagemodule.cpp index 4d7a8ec3b..3f41258ef 100644 --- a/src/game/logic/object/damage/damagemodule.cpp +++ b/src/game/logic/object/damage/damagemodule.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "damagemodule.h" diff --git a/src/game/logic/object/damage/damagemodule.h b/src/game/logic/object/damage/damagemodule.h index 83054c747..740c6a9a2 100644 --- a/src/game/logic/object/damage/damagemodule.h +++ b/src/game/logic/object/damage/damagemodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "behaviormodule.h" class DamageModuleInterface diff --git a/src/game/logic/object/die/diemodule.cpp b/src/game/logic/object/die/diemodule.cpp index 017e7de48..ebd25c996 100644 --- a/src/game/logic/object/die/diemodule.cpp +++ b/src/game/logic/object/die/diemodule.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "diemodule.h" diff --git a/src/game/logic/object/die/diemodule.h b/src/game/logic/object/die/diemodule.h index da0545321..acb853686 100644 --- a/src/game/logic/object/die/diemodule.h +++ b/src/game/logic/object/die/diemodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "behaviormodule.h" class DieModuleInterface diff --git a/src/game/logic/object/die/specialpowercompletiondie.cpp b/src/game/logic/object/die/specialpowercompletiondie.cpp index 5579cb782..6220b63b2 100644 --- a/src/game/logic/object/die/specialpowercompletiondie.cpp +++ b/src/game/logic/object/die/specialpowercompletiondie.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "specialpowercompletiondie.h" void SpecialPowerCompletionDie::Notify_Script_Engine() diff --git a/src/game/logic/object/die/specialpowercompletiondie.h b/src/game/logic/object/die/specialpowercompletiondie.h index 71a7d38b2..f80e3da24 100644 --- a/src/game/logic/object/die/specialpowercompletiondie.h +++ b/src/game/logic/object/die/specialpowercompletiondie.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "diemodule.h" class SpecialPowerCompletionDie : public DieModule diff --git a/src/game/logic/object/experiencetracker.cpp b/src/game/logic/object/experiencetracker.cpp index 918edb23e..c7eac0602 100644 --- a/src/game/logic/object/experiencetracker.cpp +++ b/src/game/logic/object/experiencetracker.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "experiencetracker.h" #include "gamelogic.h" #include "object.h" diff --git a/src/game/logic/object/firingtracker.cpp b/src/game/logic/object/firingtracker.cpp index 75e454d3e..32d4953a7 100644 --- a/src/game/logic/object/firingtracker.cpp +++ b/src/game/logic/object/firingtracker.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "firingtracker.h" #include "audiomanager.h" #include "gamelogic.h" diff --git a/src/game/logic/object/firingtracker.h b/src/game/logic/object/firingtracker.h index 6decf3f00..226810e0d 100644 --- a/src/game/logic/object/firingtracker.h +++ b/src/game/logic/object/firingtracker.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" class FiringTrackerModuleData : public ModuleData diff --git a/src/game/logic/object/ghostobject.cpp b/src/game/logic/object/ghostobject.cpp index 83427e637..73871f3fa 100644 --- a/src/game/logic/object/ghostobject.cpp +++ b/src/game/logic/object/ghostobject.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ghostobject.h" #include "gamelogic.h" #include "object.h" diff --git a/src/game/logic/object/ghostobject.h b/src/game/logic/object/ghostobject.h index 400283200..e933005ac 100644 --- a/src/game/logic/object/ghostobject.h +++ b/src/game/logic/object/ghostobject.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" #include "geometry.h" #include "snapshot.h" diff --git a/src/game/logic/object/helper/objectdefectionhelper.cpp b/src/game/logic/object/helper/objectdefectionhelper.cpp index f1d7e1f5e..6c1743b8e 100644 --- a/src/game/logic/object/helper/objectdefectionhelper.cpp +++ b/src/game/logic/object/helper/objectdefectionhelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "objectdefectionhelper.h" #include "audioeventrts.h" #include "audiomanager.h" diff --git a/src/game/logic/object/helper/objectdefectionhelper.h b/src/game/logic/object/helper/objectdefectionhelper.h index 857e6d090..eb33d2f2a 100644 --- a/src/game/logic/object/helper/objectdefectionhelper.h +++ b/src/game/logic/object/helper/objectdefectionhelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class ObjectDefectionHelperModuleData : public ModuleData diff --git a/src/game/logic/object/helper/objecthelper.cpp b/src/game/logic/object/helper/objecthelper.cpp index d4423a55c..09f2a64c5 100644 --- a/src/game/logic/object/helper/objecthelper.cpp +++ b/src/game/logic/object/helper/objecthelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "objecthelper.h" #include "gamelogic.h" diff --git a/src/game/logic/object/helper/objecthelper.h b/src/game/logic/object/helper/objecthelper.h index 367b5fba7..c8ca10f5f 100644 --- a/src/game/logic/object/helper/objecthelper.h +++ b/src/game/logic/object/helper/objecthelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" class ObjectHelper : public UpdateModule diff --git a/src/game/logic/object/helper/objectrepulsorhelper.cpp b/src/game/logic/object/helper/objectrepulsorhelper.cpp index f5c07ab25..1e8d39f67 100644 --- a/src/game/logic/object/helper/objectrepulsorhelper.cpp +++ b/src/game/logic/object/helper/objectrepulsorhelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "objectrepulsorhelper.h" ObjectRepulsorHelper::ObjectRepulsorHelper(Thing *thing, const ModuleData *module_data) : ObjectHelper(thing, module_data) {} diff --git a/src/game/logic/object/helper/objectrepulsorhelper.h b/src/game/logic/object/helper/objectrepulsorhelper.h index 0b6faa066..08a6f1694 100644 --- a/src/game/logic/object/helper/objectrepulsorhelper.h +++ b/src/game/logic/object/helper/objectrepulsorhelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class ObjectRepulsorHelperModuleData : public ModuleData diff --git a/src/game/logic/object/helper/objectsmchelper.cpp b/src/game/logic/object/helper/objectsmchelper.cpp index bebad95a7..57cf2ae3f 100644 --- a/src/game/logic/object/helper/objectsmchelper.cpp +++ b/src/game/logic/object/helper/objectsmchelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "objectsmchelper.h" ObjectSMCHelper::ObjectSMCHelper(Thing *thing, const ModuleData *module_data) : ObjectHelper(thing, module_data) {} diff --git a/src/game/logic/object/helper/objectsmchelper.h b/src/game/logic/object/helper/objectsmchelper.h index 17f792f2e..2f2cd176b 100644 --- a/src/game/logic/object/helper/objectsmchelper.h +++ b/src/game/logic/object/helper/objectsmchelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class ObjectSMCHelperModuleData : public ModuleData diff --git a/src/game/logic/object/helper/objectweaponstatushelper.cpp b/src/game/logic/object/helper/objectweaponstatushelper.cpp index fabbb7554..76dce200d 100644 --- a/src/game/logic/object/helper/objectweaponstatushelper.cpp +++ b/src/game/logic/object/helper/objectweaponstatushelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "objectweaponstatushelper.h" ObjectWeaponStatusHelper::ObjectWeaponStatusHelper(Thing *thing, const ModuleData *module_data) : diff --git a/src/game/logic/object/helper/objectweaponstatushelper.h b/src/game/logic/object/helper/objectweaponstatushelper.h index a87285100..8dd28bc80 100644 --- a/src/game/logic/object/helper/objectweaponstatushelper.h +++ b/src/game/logic/object/helper/objectweaponstatushelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class ObjectWeaponStatusHelperModuleData : public ModuleData diff --git a/src/game/logic/object/helper/statusdamagehelper.cpp b/src/game/logic/object/helper/statusdamagehelper.cpp index 640d812e7..34b216b4c 100644 --- a/src/game/logic/object/helper/statusdamagehelper.cpp +++ b/src/game/logic/object/helper/statusdamagehelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "statusdamagehelper.h" #include "gamelogic.h" diff --git a/src/game/logic/object/helper/statusdamagehelper.h b/src/game/logic/object/helper/statusdamagehelper.h index 2289c4eff..f889588a9 100644 --- a/src/game/logic/object/helper/statusdamagehelper.h +++ b/src/game/logic/object/helper/statusdamagehelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class StatusDamageHelperModuleData : public ModuleData diff --git a/src/game/logic/object/helper/subdualdamagehelper.cpp b/src/game/logic/object/helper/subdualdamagehelper.cpp index 63a1d6c5e..fb3f556bf 100644 --- a/src/game/logic/object/helper/subdualdamagehelper.cpp +++ b/src/game/logic/object/helper/subdualdamagehelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "subdualdamagehelper.h" #include "bodymodule.h" #include "damage.h" diff --git a/src/game/logic/object/helper/subdualdamagehelper.h b/src/game/logic/object/helper/subdualdamagehelper.h index d1af2f671..85036be0c 100644 --- a/src/game/logic/object/helper/subdualdamagehelper.h +++ b/src/game/logic/object/helper/subdualdamagehelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class SubdualDamageHelperModuleData : public ModuleData diff --git a/src/game/logic/object/helper/tempweaponbonushelper.cpp b/src/game/logic/object/helper/tempweaponbonushelper.cpp index 727692c53..e4146b475 100644 --- a/src/game/logic/object/helper/tempweaponbonushelper.cpp +++ b/src/game/logic/object/helper/tempweaponbonushelper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "tempweaponbonushelper.h" #include "drawable.h" #include "gamelogic.h" diff --git a/src/game/logic/object/helper/tempweaponbonushelper.h b/src/game/logic/object/helper/tempweaponbonushelper.h index 5d41232bd..817aa41b8 100644 --- a/src/game/logic/object/helper/tempweaponbonushelper.h +++ b/src/game/logic/object/helper/tempweaponbonushelper.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "objecthelper.h" class TempWeaponBonusHelperModuleData : public ModuleData diff --git a/src/game/logic/object/locomotor.cpp b/src/game/logic/object/locomotor.cpp index 3b63e560c..a70ccf86d 100644 --- a/src/game/logic/object/locomotor.cpp +++ b/src/game/logic/object/locomotor.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "locomotor.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/game/logic/object/locomotor.h b/src/game/logic/object/locomotor.h index e10b8be0e..60a5d5b66 100644 --- a/src/game/logic/object/locomotor.h +++ b/src/game/logic/object/locomotor.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "coord.h" #include "ini.h" diff --git a/src/game/logic/object/object.cpp b/src/game/logic/object/object.cpp index b16a2c101..d6f2a108e 100644 --- a/src/game/logic/object/object.cpp +++ b/src/game/logic/object/object.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "object.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/game/logic/object/object.h b/src/game/logic/object/object.h index 3e104e463..9e9cdd33a 100644 --- a/src/game/logic/object/object.h +++ b/src/game/logic/object/object.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "armortemplateset.h" #include "bitflags.h" #include "disabledtypes.h" diff --git a/src/game/logic/object/objectcreationlist.cpp b/src/game/logic/object/objectcreationlist.cpp index 426e4c5db..c3a988cf6 100644 --- a/src/game/logic/object/objectcreationlist.cpp +++ b/src/game/logic/object/objectcreationlist.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "objectcreationlist.h" #include "object.h" diff --git a/src/game/logic/object/objecttypes.cpp b/src/game/logic/object/objecttypes.cpp index 4297e61c9..6ab48c06a 100644 --- a/src/game/logic/object/objecttypes.cpp +++ b/src/game/logic/object/objecttypes.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "objecttypes.h" #include "player.h" #include "thingfactory.h" diff --git a/src/game/logic/object/partitionmanager.cpp b/src/game/logic/object/partitionmanager.cpp index f12d96647..1bb1f12a7 100644 --- a/src/game/logic/object/partitionmanager.cpp +++ b/src/game/logic/object/partitionmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "partitionmanager.h" #include "object.h" #include "simpleobjectiterator.h" diff --git a/src/game/logic/object/simpleobjectiterator.cpp b/src/game/logic/object/simpleobjectiterator.cpp index dcaf126a5..db7610964 100644 --- a/src/game/logic/object/simpleobjectiterator.cpp +++ b/src/game/logic/object/simpleobjectiterator.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "simpleobjectiterator.h" #include "object.h" diff --git a/src/game/logic/object/simpleobjectiterator.h b/src/game/logic/object/simpleobjectiterator.h index a42383adf..0d77317ba 100644 --- a/src/game/logic/object/simpleobjectiterator.h +++ b/src/game/logic/object/simpleobjectiterator.h @@ -13,9 +13,10 @@ * LICENSE */ #pragma once -#include "always.h" + #include "mempoolobj.h" #include "partitionmanager.h" + class Object; class ObjectIterator : public MemoryPoolObject diff --git a/src/game/logic/object/update/aiupdate.cpp b/src/game/logic/object/update/aiupdate.cpp index ce5e05b2e..27081fcb3 100644 --- a/src/game/logic/object/update/aiupdate.cpp +++ b/src/game/logic/object/update/aiupdate.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 "aipathfind.h" #include "gamelogic.h" diff --git a/src/game/logic/object/update/aiupdate.h b/src/game/logic/object/update/aiupdate.h index 6d5c1ad6b..7f5858953 100644 --- a/src/game/logic/object/update/aiupdate.h +++ b/src/game/logic/object/update/aiupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aistates.h" #include "damage.h" #include "locomotor.h" diff --git a/src/game/logic/object/update/aiupdate/dozeraiupdate.cpp b/src/game/logic/object/update/aiupdate/dozeraiupdate.cpp index 7f379d693..2e9951cde 100644 --- a/src/game/logic/object/update/aiupdate/dozeraiupdate.cpp +++ b/src/game/logic/object/update/aiupdate/dozeraiupdate.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dozeraiupdate.h" diff --git a/src/game/logic/object/update/aiupdate/dozeraiupdate.h b/src/game/logic/object/update/aiupdate/dozeraiupdate.h index e6c9608ef..0bfdb82b2 100644 --- a/src/game/logic/object/update/aiupdate/dozeraiupdate.h +++ b/src/game/logic/object/update/aiupdate/dozeraiupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" enum DozerTask diff --git a/src/game/logic/object/update/assistedtargetingupdate.cpp b/src/game/logic/object/update/assistedtargetingupdate.cpp index 45f285584..ea53b8c2e 100644 --- a/src/game/logic/object/update/assistedtargetingupdate.cpp +++ b/src/game/logic/object/update/assistedtargetingupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "assistedtargetingupdate.h" bool AssistedTargetingUpdate::Is_Free_To_Assist() const diff --git a/src/game/logic/object/update/assistedtargetingupdate.h b/src/game/logic/object/update/assistedtargetingupdate.h index 9dc46d756..8e3554f45 100644 --- a/src/game/logic/object/update/assistedtargetingupdate.h +++ b/src/game/logic/object/update/assistedtargetingupdate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "updatemodule.h" class AssistedTargetingUpdate : public UpdateModule diff --git a/src/game/logic/object/update/autodepositupdate.cpp b/src/game/logic/object/update/autodepositupdate.cpp index 4dbf1b064..2ed3707c7 100644 --- a/src/game/logic/object/update/autodepositupdate.cpp +++ b/src/game/logic/object/update/autodepositupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "autodepositupdate.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/logic/object/update/autodepositupdate.h b/src/game/logic/object/update/autodepositupdate.h index 95b622a7e..36fec7869 100644 --- a/src/game/logic/object/update/autodepositupdate.h +++ b/src/game/logic/object/update/autodepositupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" class Player; diff --git a/src/game/logic/object/update/battleplanupdate.cpp b/src/game/logic/object/update/battleplanupdate.cpp index 45a53eb49..c2cf6cb5d 100644 --- a/src/game/logic/object/update/battleplanupdate.cpp +++ b/src/game/logic/object/update/battleplanupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "battleplanupdate.h" BattlePlanStatus BattlePlanUpdate::Get_Active_Battle_Plan() diff --git a/src/game/logic/object/update/battleplanupdate.h b/src/game/logic/object/update/battleplanupdate.h index 9b52db2f6..49b459128 100644 --- a/src/game/logic/object/update/battleplanupdate.h +++ b/src/game/logic/object/update/battleplanupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "player.h" #include "specialpowerupdatemodule.h" diff --git a/src/game/logic/object/update/clientupdatemodule.h b/src/game/logic/object/update/clientupdatemodule.h index 67bb8ff2f..e38b1c88e 100644 --- a/src/game/logic/object/update/clientupdatemodule.h +++ b/src/game/logic/object/update/clientupdatemodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "module.h" #include "moduleinfo.h" diff --git a/src/game/logic/object/update/dockupdate/dockupdate.cpp b/src/game/logic/object/update/dockupdate/dockupdate.cpp index 4589a0366..df66b7826 100644 --- a/src/game/logic/object/update/dockupdate/dockupdate.cpp +++ b/src/game/logic/object/update/dockupdate/dockupdate.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dockupdate.h" diff --git a/src/game/logic/object/update/dockupdate/dockupdate.h b/src/game/logic/object/update/dockupdate/dockupdate.h index 17a4aa6e5..73360f3df 100644 --- a/src/game/logic/object/update/dockupdate/dockupdate.h +++ b/src/game/logic/object/update/dockupdate/dockupdate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "updatemodule.h" class DockUpdate : public UpdateModule, public DockUpdateInterface diff --git a/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.cpp b/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.cpp index 3852a7a5c..9f2892a61 100644 --- a/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.cpp +++ b/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "supplywarehousedockupdate.h" diff --git a/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.h b/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.h index df99c918d..8f126e87a 100644 --- a/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.h +++ b/src/game/logic/object/update/dockupdate/supplywarehousedockupdate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "dockupdate.h" class SupplyWarehouseDockUpdate : public DockUpdate diff --git a/src/game/logic/object/update/laserupdate.cpp b/src/game/logic/object/update/laserupdate.cpp index d467eb75e..e50fd85b6 100644 --- a/src/game/logic/object/update/laserupdate.cpp +++ b/src/game/logic/object/update/laserupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "laserupdate.h" #include "drawable.h" #include "drawmodule.h" diff --git a/src/game/logic/object/update/laserupdate.h b/src/game/logic/object/update/laserupdate.h index 9cbd50e11..831432a1f 100644 --- a/src/game/logic/object/update/laserupdate.h +++ b/src/game/logic/object/update/laserupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "clientupdatemodule.h" #include "coord.h" #include "particlesysmanager.h" diff --git a/src/game/logic/object/update/mobmemberslavedupdate.cpp b/src/game/logic/object/update/mobmemberslavedupdate.cpp index 4e9ab04af..0a89f4204 100644 --- a/src/game/logic/object/update/mobmemberslavedupdate.cpp +++ b/src/game/logic/object/update/mobmemberslavedupdate.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mobmemberslavedupdate.h" diff --git a/src/game/logic/object/update/mobmemberslavedupdate.h b/src/game/logic/object/update/mobmemberslavedupdate.h index 6e698eac7..198cd09ca 100644 --- a/src/game/logic/object/update/mobmemberslavedupdate.h +++ b/src/game/logic/object/update/mobmemberslavedupdate.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "color.h" #include "updatemodule.h" diff --git a/src/game/logic/object/update/oclupdate.cpp b/src/game/logic/object/update/oclupdate.cpp index 53bf575de..ef72ae033 100644 --- a/src/game/logic/object/update/oclupdate.cpp +++ b/src/game/logic/object/update/oclupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "oclupdate.h" #include "gamelogic.h" diff --git a/src/game/logic/object/update/oclupdate.h b/src/game/logic/object/update/oclupdate.h index 37d4f719f..caa5d896e 100644 --- a/src/game/logic/object/update/oclupdate.h +++ b/src/game/logic/object/update/oclupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" class OCLUpdate : public UpdateModule diff --git a/src/game/logic/object/update/physicsupdate.cpp b/src/game/logic/object/update/physicsupdate.cpp index 0a6b625db..09efe8318 100644 --- a/src/game/logic/object/update/physicsupdate.cpp +++ b/src/game/logic/object/update/physicsupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "physicsupdate.h" #include "aiupdate.h" #include "audiomanager.h" diff --git a/src/game/logic/object/update/physicsupdate.h b/src/game/logic/object/update/physicsupdate.h index fb71aba5b..402f60806 100644 --- a/src/game/logic/object/update/physicsupdate.h +++ b/src/game/logic/object/update/physicsupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" #include "typeoperators.h" #include "updatemodule.h" diff --git a/src/game/logic/object/update/projectilestreamupdate.cpp b/src/game/logic/object/update/projectilestreamupdate.cpp index d16450e7d..a86928fac 100644 --- a/src/game/logic/object/update/projectilestreamupdate.cpp +++ b/src/game/logic/object/update/projectilestreamupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "projectilestreamupdate.h" #include "gamelogic.h" #include "object.h" diff --git a/src/game/logic/object/update/projectilestreamupdate.h b/src/game/logic/object/update/projectilestreamupdate.h index b209c902a..fd7d1a30a 100644 --- a/src/game/logic/object/update/projectilestreamupdate.h +++ b/src/game/logic/object/update/projectilestreamupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" enum diff --git a/src/game/logic/object/update/specialabilityupdate.cpp b/src/game/logic/object/update/specialabilityupdate.cpp index c3a689cbf..eb9ef52d5 100644 --- a/src/game/logic/object/update/specialabilityupdate.cpp +++ b/src/game/logic/object/update/specialabilityupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "specialabilityupdate.h" SpecialPowerType SpecialAbilityUpdate::Get_Special_Power_Type() const diff --git a/src/game/logic/object/update/specialabilityupdate.h b/src/game/logic/object/update/specialabilityupdate.h index 7100315f2..2c9a2f433 100644 --- a/src/game/logic/object/update/specialabilityupdate.h +++ b/src/game/logic/object/update/specialabilityupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" #include "specialpowerupdatemodule.h" diff --git a/src/game/logic/object/update/specialpowerupdatemodule.cpp b/src/game/logic/object/update/specialpowerupdatemodule.cpp index 91726dedb..8d45e2f78 100644 --- a/src/game/logic/object/update/specialpowerupdatemodule.cpp +++ b/src/game/logic/object/update/specialpowerupdatemodule.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "specialpowerupdatemodule.h" diff --git a/src/game/logic/object/update/specialpowerupdatemodule.h b/src/game/logic/object/update/specialpowerupdatemodule.h index 33da61706..598d90993 100644 --- a/src/game/logic/object/update/specialpowerupdatemodule.h +++ b/src/game/logic/object/update/specialpowerupdatemodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" #include "updatemodule.h" diff --git a/src/game/logic/object/update/stealthupdate.h b/src/game/logic/object/update/stealthupdate.h index 0e1d36e61..792f13ea7 100644 --- a/src/game/logic/object/update/stealthupdate.h +++ b/src/game/logic/object/update/stealthupdate.h @@ -13,8 +13,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" + class FXList; class StealthUpdateModuleData : public UpdateModuleData diff --git a/src/game/logic/object/update/stickybombupdate.cpp b/src/game/logic/object/update/stickybombupdate.cpp index a37b5f7c1..74fb79133 100644 --- a/src/game/logic/object/update/stickybombupdate.cpp +++ b/src/game/logic/object/update/stickybombupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "stickybombupdate.h" void StickyBombUpdate::Detonate() diff --git a/src/game/logic/object/update/stickybombupdate.h b/src/game/logic/object/update/stickybombupdate.h index 6f0869e29..a15aac6a8 100644 --- a/src/game/logic/object/update/stickybombupdate.h +++ b/src/game/logic/object/update/stickybombupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamelogic.h" #include "updatemodule.h" diff --git a/src/game/logic/object/update/toppleupdate.cpp b/src/game/logic/object/update/toppleupdate.cpp index c2ebbc633..e5c91b438 100644 --- a/src/game/logic/object/update/toppleupdate.cpp +++ b/src/game/logic/object/update/toppleupdate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "toppleupdate.h" bool ToppleUpdate::Is_Able_To_Be_Toppled() const diff --git a/src/game/logic/object/update/toppleupdate.h b/src/game/logic/object/update/toppleupdate.h index d213043ae..14be6221f 100644 --- a/src/game/logic/object/update/toppleupdate.h +++ b/src/game/logic/object/update/toppleupdate.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "updatemodule.h" class ToppleUpdate : public UpdateModule, public CollideModuleInterface diff --git a/src/game/logic/object/update/updatemodule.cpp b/src/game/logic/object/update/updatemodule.cpp index 7ed5af1cd..aede19008 100644 --- a/src/game/logic/object/update/updatemodule.cpp +++ b/src/game/logic/object/update/updatemodule.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "updatemodule.h" #include "gamelogic.h" diff --git a/src/game/logic/object/update/updatemodule.h b/src/game/logic/object/update/updatemodule.h index 65a7ef869..5588178f1 100644 --- a/src/game/logic/object/update/updatemodule.h +++ b/src/game/logic/object/update/updatemodule.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "behaviormodule.h" #include "disabledtypes.h" #include "moduleinfo.h" diff --git a/src/game/logic/object/upgrade/powerplantupgrade.cpp b/src/game/logic/object/upgrade/powerplantupgrade.cpp index 279adab70..da045a864 100644 --- a/src/game/logic/object/upgrade/powerplantupgrade.cpp +++ b/src/game/logic/object/upgrade/powerplantupgrade.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "powerplantupgrade.h" diff --git a/src/game/logic/object/upgrade/powerplantupgrade.h b/src/game/logic/object/upgrade/powerplantupgrade.h index e75b32ba8..cb8e2877e 100644 --- a/src/game/logic/object/upgrade/powerplantupgrade.h +++ b/src/game/logic/object/upgrade/powerplantupgrade.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "upgrademodule.h" class PowerPlantUpgrade : public UpgradeModule diff --git a/src/game/logic/object/upgrade/radarupgrade.cpp b/src/game/logic/object/upgrade/radarupgrade.cpp index f71770a2d..8cee044d6 100644 --- a/src/game/logic/object/upgrade/radarupgrade.cpp +++ b/src/game/logic/object/upgrade/radarupgrade.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "radarupgrade.h" diff --git a/src/game/logic/object/upgrade/radarupgrade.h b/src/game/logic/object/upgrade/radarupgrade.h index 1b4836c5f..69c9e7ceb 100644 --- a/src/game/logic/object/upgrade/radarupgrade.h +++ b/src/game/logic/object/upgrade/radarupgrade.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "upgrademodule.h" class RadarUpgradeModuleData : public ModuleData diff --git a/src/game/logic/object/upgrade/upgrademodule.cpp b/src/game/logic/object/upgrade/upgrademodule.cpp index a0cadd74a..1eb902b1f 100644 --- a/src/game/logic/object/upgrade/upgrademodule.cpp +++ b/src/game/logic/object/upgrade/upgrademodule.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "upgrademodule.h" diff --git a/src/game/logic/object/upgrade/upgrademodule.h b/src/game/logic/object/upgrade/upgrademodule.h index a318de899..6f3d7acca 100644 --- a/src/game/logic/object/upgrade/upgrademodule.h +++ b/src/game/logic/object/upgrade/upgrademodule.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "behaviormodule.h" class UpgradeMuxData diff --git a/src/game/logic/object/weapon.cpp b/src/game/logic/object/weapon.cpp index 92c885c10..4a3519c25 100644 --- a/src/game/logic/object/weapon.cpp +++ b/src/game/logic/object/weapon.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "weapon.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/game/logic/object/weaponset.cpp b/src/game/logic/object/weaponset.cpp index 898d41a62..98257e01d 100644 --- a/src/game/logic/object/weaponset.cpp +++ b/src/game/logic/object/weaponset.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "weaponset.h" #include "object.h" #include "opencontain.h" diff --git a/src/game/logic/object/weaponset.h b/src/game/logic/object/weaponset.h index ea5b0c25b..2df6e691b 100644 --- a/src/game/logic/object/weaponset.h +++ b/src/game/logic/object/weaponset.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "bitflags.h" #include "gametype.h" #include "snapshot.h" diff --git a/src/game/logic/object/weapontemplateset.cpp b/src/game/logic/object/weapontemplateset.cpp index ec67a47dc..7ac573758 100644 --- a/src/game/logic/object/weapontemplateset.cpp +++ b/src/game/logic/object/weapontemplateset.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "weapontemplateset.h" #include "weapon.h" #include diff --git a/src/game/logic/object/weapontemplateset.h b/src/game/logic/object/weapontemplateset.h index ab9ef0553..d7446c03b 100644 --- a/src/game/logic/object/weapontemplateset.h +++ b/src/game/logic/object/weapontemplateset.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "bitflags.h" #include "gametype.h" #include "ini.h" diff --git a/src/game/logic/scriptengine/script.cpp b/src/game/logic/scriptengine/script.cpp index 66b3cf587..acaae0a30 100644 --- a/src/game/logic/scriptengine/script.cpp +++ b/src/game/logic/scriptengine/script.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "script.h" #include "scriptaction.h" #include "scriptcondition.h" diff --git a/src/game/logic/scriptengine/script.h b/src/game/logic/scriptengine/script.h index cd7a87136..c9ac6e908 100644 --- a/src/game/logic/scriptengine/script.h +++ b/src/game/logic/scriptengine/script.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "mempoolobj.h" #include "scriptaction.h" diff --git a/src/game/logic/scriptengine/scriptaction.cpp b/src/game/logic/scriptengine/scriptaction.cpp index c351f68ca..68542c95e 100644 --- a/src/game/logic/scriptengine/scriptaction.cpp +++ b/src/game/logic/scriptengine/scriptaction.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptaction.h" #include "script.h" #include "scriptengine.h" diff --git a/src/game/logic/scriptengine/scriptaction.h b/src/game/logic/scriptengine/scriptaction.h index da35d7b38..a585019c1 100644 --- a/src/game/logic/scriptengine/scriptaction.h +++ b/src/game/logic/scriptengine/scriptaction.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audiomanager.h" #include "mempoolobj.h" #include "scriptparam.h" diff --git a/src/game/logic/scriptengine/scriptactions.cpp b/src/game/logic/scriptengine/scriptactions.cpp index d360a3a92..017a23212 100644 --- a/src/game/logic/scriptengine/scriptactions.cpp +++ b/src/game/logic/scriptengine/scriptactions.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptactions.h" #include "gamelogic.h" #include "object.h" diff --git a/src/game/logic/scriptengine/scriptactions.h b/src/game/logic/scriptengine/scriptactions.h index 67b562152..4a4657434 100644 --- a/src/game/logic/scriptengine/scriptactions.h +++ b/src/game/logic/scriptengine/scriptactions.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "audiomanager.h" #include "coord.h" diff --git a/src/game/logic/scriptengine/scriptcondition.cpp b/src/game/logic/scriptengine/scriptcondition.cpp index bfce43eff..ae678bb4c 100644 --- a/src/game/logic/scriptengine/scriptcondition.cpp +++ b/src/game/logic/scriptengine/scriptcondition.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptcondition.h" #include "script.h" #include "scriptengine.h" diff --git a/src/game/logic/scriptengine/scriptcondition.h b/src/game/logic/scriptengine/scriptcondition.h index cc231b577..7cd44de6f 100644 --- a/src/game/logic/scriptengine/scriptcondition.h +++ b/src/game/logic/scriptengine/scriptcondition.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "datachunk.h" #include "mempoolobj.h" #include "scriptparam.h" diff --git a/src/game/logic/scriptengine/scriptconditions.cpp b/src/game/logic/scriptengine/scriptconditions.cpp index 42c808768..71d44cb9c 100644 --- a/src/game/logic/scriptengine/scriptconditions.cpp +++ b/src/game/logic/scriptengine/scriptconditions.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptconditions.h" #ifndef GAME_DLL diff --git a/src/game/logic/scriptengine/scriptconditions.h b/src/game/logic/scriptengine/scriptconditions.h index 7cbe6cbcd..6f05e68b6 100644 --- a/src/game/logic/scriptengine/scriptconditions.h +++ b/src/game/logic/scriptengine/scriptconditions.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "mempoolobj.h" #include "subsysteminterface.h" diff --git a/src/game/logic/scriptengine/scriptengine.cpp b/src/game/logic/scriptengine/scriptengine.cpp index ed74a8841..e8895040a 100644 --- a/src/game/logic/scriptengine/scriptengine.cpp +++ b/src/game/logic/scriptengine/scriptengine.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptengine.h" #include "ai.h" #include "assetmgr.h" diff --git a/src/game/logic/scriptengine/scriptgroup.cpp b/src/game/logic/scriptengine/scriptgroup.cpp index c99a07f82..faac2ac14 100644 --- a/src/game/logic/scriptengine/scriptgroup.cpp +++ b/src/game/logic/scriptengine/scriptgroup.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptgroup.h" #include "script.h" #include "scriptlist.h" diff --git a/src/game/logic/scriptengine/scriptgroup.h b/src/game/logic/scriptengine/scriptgroup.h index 19d25d63b..06cc7db50 100644 --- a/src/game/logic/scriptengine/scriptgroup.h +++ b/src/game/logic/scriptengine/scriptgroup.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "datachunk.h" #include "mempoolobj.h" diff --git a/src/game/logic/scriptengine/scriptlist.cpp b/src/game/logic/scriptengine/scriptlist.cpp index 2e7825bd7..899aa6423 100644 --- a/src/game/logic/scriptengine/scriptlist.cpp +++ b/src/game/logic/scriptengine/scriptlist.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptlist.h" #include "script.h" #include "scriptgroup.h" diff --git a/src/game/logic/scriptengine/scriptlist.h b/src/game/logic/scriptengine/scriptlist.h index a48104471..be56e0adb 100644 --- a/src/game/logic/scriptengine/scriptlist.h +++ b/src/game/logic/scriptengine/scriptlist.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "mempoolobj.h" #include "script.h" #include "scriptgroup.h" diff --git a/src/game/logic/scriptengine/scriptparam.cpp b/src/game/logic/scriptengine/scriptparam.cpp index e53a90f05..849a22507 100644 --- a/src/game/logic/scriptengine/scriptparam.cpp +++ b/src/game/logic/scriptengine/scriptparam.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scriptparam.h" #include "gamemath.h" #include "gametype.h" diff --git a/src/game/logic/scriptengine/scriptparam.h b/src/game/logic/scriptengine/scriptparam.h index a97995e55..4f1c86904 100644 --- a/src/game/logic/scriptengine/scriptparam.h +++ b/src/game/logic/scriptengine/scriptparam.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "bitflags.h" #include "coord.h" #include "datachunk.h" diff --git a/src/game/logic/scriptengine/scripttemplate.cpp b/src/game/logic/scriptengine/scripttemplate.cpp index e73bbb3be..387b0068f 100644 --- a/src/game/logic/scriptengine/scripttemplate.cpp +++ b/src/game/logic/scriptengine/scripttemplate.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scripttemplate.h" #include diff --git a/src/game/logic/scriptengine/sequentialscript.cpp b/src/game/logic/scriptengine/sequentialscript.cpp index b882f24ee..ad09e7ea3 100644 --- a/src/game/logic/scriptengine/sequentialscript.cpp +++ b/src/game/logic/scriptengine/sequentialscript.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "sequentialscript.h" #include "script.h" #include "scriptengine.h" diff --git a/src/game/logic/scriptengine/victoryconditions.cpp b/src/game/logic/scriptengine/victoryconditions.cpp index b06b59888..dbdaea416 100644 --- a/src/game/logic/scriptengine/victoryconditions.cpp +++ b/src/game/logic/scriptengine/victoryconditions.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "victoryconditions.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/logic/scriptengine/victoryconditions.h b/src/game/logic/scriptengine/victoryconditions.h index 80ce8bff8..78ef0e597 100644 --- a/src/game/logic/scriptengine/victoryconditions.h +++ b/src/game/logic/scriptengine/victoryconditions.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "subsysteminterface.h" class Player; diff --git a/src/game/logic/system/cavesystem.cpp b/src/game/logic/system/cavesystem.cpp index 95e8c88a2..01e30b820 100644 --- a/src/game/logic/system/cavesystem.cpp +++ b/src/game/logic/system/cavesystem.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "cavesystem.h" #include "object.h" #include "xfer.h" diff --git a/src/game/logic/system/cratesystem.cpp b/src/game/logic/system/cratesystem.cpp index f0227c833..a800399fc 100644 --- a/src/game/logic/system/cratesystem.cpp +++ b/src/game/logic/system/cratesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "cratesystem.h" #include "science.h" diff --git a/src/game/logic/system/cratesystem.h b/src/game/logic/system/cratesystem.h index ba2477527..d9cb75c08 100644 --- a/src/game/logic/system/cratesystem.h +++ b/src/game/logic/system/cratesystem.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "bitflags.h" #include "overridable.h" #include "subsysteminterface.h" diff --git a/src/game/logic/system/damage.cpp b/src/game/logic/system/damage.cpp index 87117a40b..5de60a421 100644 --- a/src/game/logic/system/damage.cpp +++ b/src/game/logic/system/damage.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "damage.h" #include "thingfactory.h" diff --git a/src/game/logic/system/damage.h b/src/game/logic/system/damage.h index 5a9a38dc7..6c0f9ea19 100644 --- a/src/game/logic/system/damage.h +++ b/src/game/logic/system/damage.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "object.h" #include "weaponset.h" diff --git a/src/game/logic/system/gamelogic.cpp b/src/game/logic/system/gamelogic.cpp index 35099fc63..442508020 100644 --- a/src/game/logic/system/gamelogic.cpp +++ b/src/game/logic/system/gamelogic.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamelogic.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/game/logic/system/gamelogic.h b/src/game/logic/system/gamelogic.h index 9792edf72..5434f91f5 100644 --- a/src/game/logic/system/gamelogic.h +++ b/src/game/logic/system/gamelogic.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "bitflags.h" #include "gametype.h" #include "rtsutils.h" diff --git a/src/game/logic/system/gamelogicdispatch.cpp b/src/game/logic/system/gamelogicdispatch.cpp index 19503d4cf..8384ef135 100644 --- a/src/game/logic/system/gamelogicdispatch.cpp +++ b/src/game/logic/system/gamelogicdispatch.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 "gameengine.h" #include "gamelogic.h" diff --git a/src/game/logic/system/rankinfo.cpp b/src/game/logic/system/rankinfo.cpp index 97f02a99f..2ca81be00 100644 --- a/src/game/logic/system/rankinfo.cpp +++ b/src/game/logic/system/rankinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rankinfo.h" #include "ini.h" #include diff --git a/src/game/logic/system/rankinfo.h b/src/game/logic/system/rankinfo.h index a55d748c0..6776ba2ff 100644 --- a/src/game/logic/system/rankinfo.h +++ b/src/game/logic/system/rankinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "overridable.h" #include "science.h" #include "subsysteminterface.h" diff --git a/src/game/main.cpp b/src/game/main.cpp index dc69a87ce..d9e16dbf1 100644 --- a/src/game/main.cpp +++ b/src/game/main.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "main.h" #include "audiomanager.h" #include "copyprotect.h" diff --git a/src/game/main.h b/src/game/main.h index b58810f05..a147a72b6 100644 --- a/src/game/main.h +++ b/src/game/main.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - #ifdef GAME_DLL extern HWND &g_applicationHWnd; extern unsigned &g_theMessageTime; diff --git a/src/game/network/filetransfer.cpp b/src/game/network/filetransfer.cpp index 4ee9096a7..b1cc0ccbd 100644 --- a/src/game/network/filetransfer.cpp +++ b/src/game/network/filetransfer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "filetransfer.h" #include #include diff --git a/src/game/network/filetransfer.h b/src/game/network/filetransfer.h index 862223709..500b5b71f 100644 --- a/src/game/network/filetransfer.h +++ b/src/game/network/filetransfer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" class GameInfo; diff --git a/src/game/network/framemetrics.cpp b/src/game/network/framemetrics.cpp index ec984c9b1..35eba8ed7 100644 --- a/src/game/network/framemetrics.cpp +++ b/src/game/network/framemetrics.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "framemetrics.h" #include "display.h" #include "globaldata.h" diff --git a/src/game/network/framemetrics.h b/src/game/network/framemetrics.h index 9ac331be5..3d9f9195f 100644 --- a/src/game/network/framemetrics.h +++ b/src/game/network/framemetrics.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include class FrameMetrics diff --git a/src/game/network/gameinfo.cpp b/src/game/network/gameinfo.cpp index 16cfc86ef..2e48e1f90 100644 --- a/src/game/network/gameinfo.cpp +++ b/src/game/network/gameinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gameinfo.h" #include "captainslog.h" #include "filesystem.h" diff --git a/src/game/network/gameinfo.h b/src/game/network/gameinfo.h index 25ca49482..a3319160f 100644 --- a/src/game/network/gameinfo.h +++ b/src/game/network/gameinfo.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "money.h" #include "unicodestring.h" diff --git a/src/game/network/gamemessageparser.cpp b/src/game/network/gamemessageparser.cpp index 9b84afd1f..44723e213 100644 --- a/src/game/network/gamemessageparser.cpp +++ b/src/game/network/gamemessageparser.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamemessageparser.h" GameMessageParserArgumentType::GameMessageParserArgumentType(ArgumentDataType type, int arg_count) : diff --git a/src/game/network/gamemessageparser.h b/src/game/network/gamemessageparser.h index a3f61770f..f04ab74fe 100644 --- a/src/game/network/gamemessageparser.h +++ b/src/game/network/gamemessageparser.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamemessage.h" #include "mempoolobj.h" #include diff --git a/src/game/network/gamespy/chat.cpp b/src/game/network/gamespy/chat.cpp index d4f4a64f7..1ca29de04 100644 --- a/src/game/network/gamespy/chat.cpp +++ b/src/game/network/gamespy/chat.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "chat.h" #include "ini.h" diff --git a/src/game/network/gamespy/chat.h b/src/game/network/gamespy/chat.h index 916e49f88..0bfdab35d 100644 --- a/src/game/network/gamespy/chat.h +++ b/src/game/network/gamespy/chat.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #ifdef GAME_DLL #include "hooker.h" #endif diff --git a/src/game/network/gamespy/peerdefs.cpp b/src/game/network/gamespy/peerdefs.cpp index 8ed7a9e09..1837eb638 100644 --- a/src/game/network/gamespy/peerdefs.cpp +++ b/src/game/network/gamespy/peerdefs.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "peerdefs.h" #ifndef GAME_DLL diff --git a/src/game/network/gamespy/peerdefs.h b/src/game/network/gamespy/peerdefs.h index 56ce8a371..8970e8a39 100644 --- a/src/game/network/gamespy/peerdefs.h +++ b/src/game/network/gamespy/peerdefs.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "stagingroomgameinfo.h" #include #include diff --git a/src/game/network/gamespy/stagingroomgameinfo.cpp b/src/game/network/gamespy/stagingroomgameinfo.cpp index a38da0122..3b98ac412 100644 --- a/src/game/network/gamespy/stagingroomgameinfo.cpp +++ b/src/game/network/gamespy/stagingroomgameinfo.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "stagingroomgameinfo.h" diff --git a/src/game/network/gamespy/stagingroomgameinfo.h b/src/game/network/gamespy/stagingroomgameinfo.h index 0920b8112..522a193a6 100644 --- a/src/game/network/gamespy/stagingroomgameinfo.h +++ b/src/game/network/gamespy/stagingroomgameinfo.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gameinfo.h" class GameSpyStagingRoom : public GameInfo diff --git a/src/game/network/gamespy/thread/buddythread.cpp b/src/game/network/gamespy/thread/buddythread.cpp index 7d6affe5b..2bd28d1c8 100644 --- a/src/game/network/gamespy/thread/buddythread.cpp +++ b/src/game/network/gamespy/thread/buddythread.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "buddythread.h" #ifndef GAME_DLL diff --git a/src/game/network/gamespy/thread/buddythread.h b/src/game/network/gamespy/thread/buddythread.h index 9a03ad9d0..cf25b6a5b 100644 --- a/src/game/network/gamespy/thread/buddythread.h +++ b/src/game/network/gamespy/thread/buddythread.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" typedef enum _GPEnum { diff --git a/src/game/network/gamespy/thread/gameresultsthread.cpp b/src/game/network/gamespy/thread/gameresultsthread.cpp index 7bfcfa82c..08e15ebab 100644 --- a/src/game/network/gamespy/thread/gameresultsthread.cpp +++ b/src/game/network/gamespy/thread/gameresultsthread.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gameresultsthread.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/game/network/gamespy/thread/gameresultsthread.h b/src/game/network/gamespy/thread/gameresultsthread.h index fb324c02f..2c21e22f3 100644 --- a/src/game/network/gamespy/thread/gameresultsthread.h +++ b/src/game/network/gamespy/thread/gameresultsthread.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "subsysteminterface.h" class GameResultsRequest; diff --git a/src/game/network/gamespy/thread/threadutils.cpp b/src/game/network/gamespy/thread/threadutils.cpp index 57ce3e3ed..99d8d08c0 100644 --- a/src/game/network/gamespy/thread/threadutils.cpp +++ b/src/game/network/gamespy/thread/threadutils.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "threadutils.h" #if defined PLATFORM_WINDOWS #include diff --git a/src/game/network/gamespy/thread/threadutils.h b/src/game/network/gamespy/thread/threadutils.h index df90345f7..227b48824 100644 --- a/src/game/network/gamespy/thread/threadutils.h +++ b/src/game/network/gamespy/thread/threadutils.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include std::wstring MultiByteToWideCharSingleLine(const char *orig); diff --git a/src/game/network/ipenumeration.cpp b/src/game/network/ipenumeration.cpp index 50da5471d..4b0e75627 100644 --- a/src/game/network/ipenumeration.cpp +++ b/src/game/network/ipenumeration.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ipenumeration.h" #include "sockets.h" diff --git a/src/game/network/ipenumeration.h b/src/game/network/ipenumeration.h index f3dbb6bb0..b80d03eb0 100644 --- a/src/game/network/ipenumeration.h +++ b/src/game/network/ipenumeration.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "mempoolobj.h" diff --git a/src/game/network/lanapi.cpp b/src/game/network/lanapi.cpp index e4269219e..c0c81cf75 100644 --- a/src/game/network/lanapi.cpp +++ b/src/game/network/lanapi.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "lanapi.h" #include "gametext.h" #include "rtsutils.h" diff --git a/src/game/network/lanapi.h b/src/game/network/lanapi.h index 90ba0c8a9..62044ed04 100644 --- a/src/game/network/lanapi.h +++ b/src/game/network/lanapi.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "lanapiinterface.h" class Transport; diff --git a/src/game/network/lanapiinterface.cpp b/src/game/network/lanapiinterface.cpp index eafbe17a3..5fe332ef5 100644 --- a/src/game/network/lanapiinterface.cpp +++ b/src/game/network/lanapiinterface.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "lanapiinterface.h" #ifndef GAME_DLL diff --git a/src/game/network/lanapiinterface.h b/src/game/network/lanapiinterface.h index d25af732c..283cdfaf4 100644 --- a/src/game/network/lanapiinterface.h +++ b/src/game/network/lanapiinterface.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "subsysteminterface.h" #include "unicodestring.h" diff --git a/src/game/network/langameinfo.h b/src/game/network/langameinfo.h index 41eca8931..570b1964a 100644 --- a/src/game/network/langameinfo.h +++ b/src/game/network/langameinfo.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gameinfo.h" class LANPlayer diff --git a/src/game/network/network.cpp b/src/game/network/network.cpp index cdf7f9622..8f8be052f 100644 --- a/src/game/network/network.cpp +++ b/src/game/network/network.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "network.h" #ifndef GAME_DLL diff --git a/src/game/network/network.h b/src/game/network/network.h index be5a2e50d..bf955e50e 100644 --- a/src/game/network/network.h +++ b/src/game/network/network.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "subsysteminterface.h" #include diff --git a/src/game/network/networkutil.cpp b/src/game/network/networkutil.cpp index 5bdfa0bf5..6bf4a2792 100644 --- a/src/game/network/networkutil.cpp +++ b/src/game/network/networkutil.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" int MAX_FRAMES_AHEAD = 128; int MIN_RUNAHEAD = 10; diff --git a/src/game/network/transport.cpp b/src/game/network/transport.cpp index d71a3c51a..e4e2257c7 100644 --- a/src/game/network/transport.cpp +++ b/src/game/network/transport.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "transport.h" #include "crc.h" #include "endiantype.h" diff --git a/src/game/network/transport.h b/src/game/network/transport.h index 9ea246001..ffa724f05 100644 --- a/src/game/network/transport.h +++ b/src/game/network/transport.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "udp.h" #pragma pack(push, 1) diff --git a/src/game/network/udp.cpp b/src/game/network/udp.cpp index 78612fc2a..9bb8fd603 100644 --- a/src/game/network/udp.cpp +++ b/src/game/network/udp.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "udp.h" #include "endiantype.h" #include diff --git a/src/game/network/udp.h b/src/game/network/udp.h index e01f96451..d88cdf31b 100644 --- a/src/game/network/udp.h +++ b/src/game/network/udp.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "sockets.h" class UDP diff --git a/src/hooker/dllmain.cpp b/src/hooker/dllmain.cpp index 09dca975f..926416232 100644 --- a/src/hooker/dllmain.cpp +++ b/src/hooker/dllmain.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hooker.h" #include "setuphooks.h" #include diff --git a/src/hooker/hooker.h b/src/hooker/hooker.h index 245a75693..ed3a3201c 100644 --- a/src/hooker/hooker.h +++ b/src/hooker/hooker.h @@ -26,7 +26,6 @@ #error This file must not be compiled into standalone binary #endif -#include "always.h" #include #include diff --git a/src/hooker/mapview.cpp b/src/hooker/mapview.cpp index 3ee8f6767..cb3435af1 100644 --- a/src/hooker/mapview.cpp +++ b/src/hooker/mapview.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mapview.h" #include "bittype.h" #include "macros.h" diff --git a/src/hooker/setupglobals_zh.cpp b/src/hooker/setupglobals_zh.cpp index 654a0bb8d..69d5d5343 100644 --- a/src/hooker/setupglobals_zh.cpp +++ b/src/hooker/setupglobals_zh.cpp @@ -2,6 +2,7 @@ #error This file must not be compiled into standalone binary #endif +#include "always.h" #include "hooker.h" #include "view.h" diff --git a/src/hooker/setuphooks_zh.cpp b/src/hooker/setuphooks_zh.cpp index 24b8dea5a..a242a5da7 100644 --- a/src/hooker/setuphooks_zh.cpp +++ b/src/hooker/setuphooks_zh.cpp @@ -16,6 +16,7 @@ #error This file must not be compiled into standalone binary #endif +#include "always.h" #include "aabtree.h" #include "ai.h" #include "aigroup.h" diff --git a/src/platform/audio/alaudiomanager.cpp b/src/platform/audio/alaudiomanager.cpp index cd3c44c48..7db6ec6c8 100644 --- a/src/platform/audio/alaudiomanager.cpp +++ b/src/platform/audio/alaudiomanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "alaudiomanager.h" #include "alaudiostream.h" #include "filesystem.h" diff --git a/src/platform/audio/alaudiomanager.h b/src/platform/audio/alaudiomanager.h index 320dbd162..995b2357f 100644 --- a/src/platform/audio/alaudiomanager.h +++ b/src/platform/audio/alaudiomanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audiomanager.h" #include diff --git a/src/platform/audio/alaudiostream.cpp b/src/platform/audio/alaudiostream.cpp index cca490c22..56400703b 100644 --- a/src/platform/audio/alaudiostream.cpp +++ b/src/platform/audio/alaudiostream.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "alaudiostream.h" #include "alaudiomanager.h" diff --git a/src/platform/audio/alaudiostream.h b/src/platform/audio/alaudiostream.h index 531cd5fb5..93a051077 100644 --- a/src/platform/audio/alaudiostream.h +++ b/src/platform/audio/alaudiostream.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include #define AL_STREAM_BUFFER_COUNT 32 diff --git a/src/platform/audio/ffmpegaudiofilecache.cpp b/src/platform/audio/ffmpegaudiofilecache.cpp index 5951653a8..dcfb95212 100644 --- a/src/platform/audio/ffmpegaudiofilecache.cpp +++ b/src/platform/audio/ffmpegaudiofilecache.cpp @@ -12,14 +12,14 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" +#include "ffmpegaudiofilecache.h" extern "C" { #include } #include "audioeventrts.h" #include "audiomanager.h" -#include "ffmpegaudiofilecache.h" #include "filesystem.h" #include #include diff --git a/src/platform/audio/ffmpegaudiofilecache.h b/src/platform/audio/ffmpegaudiofilecache.h index de93d2474..a8d80de40 100644 --- a/src/platform/audio/ffmpegaudiofilecache.h +++ b/src/platform/audio/ffmpegaudiofilecache.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "audiomanager.h" #include "ffmpegfile.h" diff --git a/src/platform/audio/milesaudiofilecache.cpp b/src/platform/audio/milesaudiofilecache.cpp index d70f5a4c1..21bc9453e 100644 --- a/src/platform/audio/milesaudiofilecache.cpp +++ b/src/platform/audio/milesaudiofilecache.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "milesaudiofilecache.h" #include "audioeventrts.h" #include "audiomanager.h" diff --git a/src/platform/audio/milesaudiofilecache.h b/src/platform/audio/milesaudiofilecache.h index ce90f2159..0eb7d041d 100644 --- a/src/platform/audio/milesaudiofilecache.h +++ b/src/platform/audio/milesaudiofilecache.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "audiomanager.h" #include "mutex.h" diff --git a/src/platform/audio/milesaudiomanager.cpp b/src/platform/audio/milesaudiomanager.cpp index 61275da7d..24e7d65ee 100644 --- a/src/platform/audio/milesaudiomanager.cpp +++ b/src/platform/audio/milesaudiomanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "milesaudiomanager.h" #include "filesystem.h" #include "gamemath.h" diff --git a/src/platform/audio/milesaudiomanager.h b/src/platform/audio/milesaudiomanager.h index 527cd335a..095aedb2f 100644 --- a/src/platform/audio/milesaudiomanager.h +++ b/src/platform/audio/milesaudiomanager.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audiomanager.h" #include #include diff --git a/src/platform/audio/playingaudio.h b/src/platform/audio/playingaudio.h index c41bb9f67..207a930e1 100644 --- a/src/platform/audio/playingaudio.h +++ b/src/platform/audio/playingaudio.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "audioeventinfo.h" enum PlayingAudioType : int32_t diff --git a/src/platform/common/ffmpegfile.cpp b/src/platform/common/ffmpegfile.cpp index 8a4ef0c0e..941f1ab71 100644 --- a/src/platform/common/ffmpegfile.cpp +++ b/src/platform/common/ffmpegfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ffmpegfile.h" extern "C" { diff --git a/src/platform/common/ffmpegfile.h b/src/platform/common/ffmpegfile.h index bf7b46a4b..078a7fbb7 100644 --- a/src/platform/common/ffmpegfile.h +++ b/src/platform/common/ffmpegfile.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "filesystem.h" struct AVFormatContext; diff --git a/src/platform/fpusetting.cpp b/src/platform/fpusetting.cpp index 18e26325e..bb6becd96 100644 --- a/src/platform/fpusetting.cpp +++ b/src/platform/fpusetting.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "fpusetting.h" #include diff --git a/src/platform/fpusetting.h b/src/platform/fpusetting.h index d105285b4..7cb46d1de 100644 --- a/src/platform/fpusetting.h +++ b/src/platform/fpusetting.h @@ -14,6 +14,4 @@ */ #pragma once -#include "always.h" - void Set_FP_Mode(); diff --git a/src/platform/sdl2/sdl2gameengine.cpp b/src/platform/sdl2/sdl2gameengine.cpp index f7291bfdd..f5ca3edec 100644 --- a/src/platform/sdl2/sdl2gameengine.cpp +++ b/src/platform/sdl2/sdl2gameengine.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "sdl2gameengine.h" #include "audiomanager.h" #include "main.h" diff --git a/src/platform/sdl2/sdl2keybd.cpp b/src/platform/sdl2/sdl2keybd.cpp index a60dbf262..49228c6a2 100644 --- a/src/platform/sdl2/sdl2keybd.cpp +++ b/src/platform/sdl2/sdl2keybd.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "sdl2keybd.h" #include "main.h" #include diff --git a/src/platform/sdl2/sdl2keybd.h b/src/platform/sdl2/sdl2keybd.h index dbbc45f25..6d792e80f 100644 --- a/src/platform/sdl2/sdl2keybd.h +++ b/src/platform/sdl2/sdl2keybd.h @@ -18,7 +18,6 @@ #error Only include sdl2keybd.h when building with SDL2 #endif -#include "always.h" #include "keyboard.h" #include diff --git a/src/platform/sdl2/sdl2mouse.cpp b/src/platform/sdl2/sdl2mouse.cpp index d372b7511..b393d29a4 100644 --- a/src/platform/sdl2/sdl2mouse.cpp +++ b/src/platform/sdl2/sdl2mouse.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "sdl2mouse.h" #include "editmain.h" #include "gameclient.h" diff --git a/src/platform/standardfile.cpp b/src/platform/standardfile.cpp index 07523eb47..d1350ac17 100644 --- a/src/platform/standardfile.cpp +++ b/src/platform/standardfile.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "standardfile.h" #include #include diff --git a/src/platform/stdlocalfilesystem.cpp b/src/platform/stdlocalfilesystem.cpp index 47449afa9..37b50e83c 100644 --- a/src/platform/stdlocalfilesystem.cpp +++ b/src/platform/stdlocalfilesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "stdlocalfilesystem.h" #include "standardfile.h" #include "win32localfile.h" diff --git a/src/platform/video/binkvideoplayer.cpp b/src/platform/video/binkvideoplayer.cpp index e5828dffc..c3c95a280 100644 --- a/src/platform/video/binkvideoplayer.cpp +++ b/src/platform/video/binkvideoplayer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "binkvideoplayer.h" #include "audiomanager.h" #include "binkvideostream.h" diff --git a/src/platform/video/binkvideoplayer.h b/src/platform/video/binkvideoplayer.h index f2d71c39a..3bd018ea5 100644 --- a/src/platform/video/binkvideoplayer.h +++ b/src/platform/video/binkvideoplayer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "videoplayer.h" struct Bink; diff --git a/src/platform/video/binkvideostream.cpp b/src/platform/video/binkvideostream.cpp index e0fb3fced..b6d6eb253 100644 --- a/src/platform/video/binkvideostream.cpp +++ b/src/platform/video/binkvideostream.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "binkvideostream.h" #include "videobuffer.h" #include diff --git a/src/platform/video/binkvideostream.h b/src/platform/video/binkvideostream.h index c27b33c0e..028e375c6 100644 --- a/src/platform/video/binkvideostream.h +++ b/src/platform/video/binkvideostream.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "videostream.h" struct Bink; diff --git a/src/platform/video/ffmpegvideoplayer.cpp b/src/platform/video/ffmpegvideoplayer.cpp index c0e59131e..455ede017 100644 --- a/src/platform/video/ffmpegvideoplayer.cpp +++ b/src/platform/video/ffmpegvideoplayer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ffmpegvideoplayer.h" #include "audiomanager.h" #include "ffmpegfile.h" diff --git a/src/platform/video/ffmpegvideoplayer.h b/src/platform/video/ffmpegvideoplayer.h index 99021cfce..cd9875049 100644 --- a/src/platform/video/ffmpegvideoplayer.h +++ b/src/platform/video/ffmpegvideoplayer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "videoplayer.h" namespace Thyme diff --git a/src/platform/video/ffmpegvideostream.cpp b/src/platform/video/ffmpegvideostream.cpp index 5c2d4298f..d7ac3eed6 100644 --- a/src/platform/video/ffmpegvideostream.cpp +++ b/src/platform/video/ffmpegvideostream.cpp @@ -1,3 +1,19 @@ +/** + * @file + * + * @author feliwir + * + * @brief Video stream implementation using FFmpeg. + * + * @copyright Thyme is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version + * 2 of the License, or (at your option) any later version. + * A full copy of the GNU General Public License can be found in + * LICENSE + */ +#include "always.h" +#include "ffmpegvideostream.h" extern "C" { #include #include @@ -5,7 +21,6 @@ extern "C" { #include "ffmpegfile.h" #include "ffmpegvideoplayer.h" -#include "ffmpegvideostream.h" #include "videobuffer.h" #ifdef BUILD_WITH_OPENAL diff --git a/src/platform/video/ffmpegvideostream.h b/src/platform/video/ffmpegvideostream.h index f99a8a6e0..0b87fe55a 100644 --- a/src/platform/video/ffmpegvideostream.h +++ b/src/platform/video/ffmpegvideostream.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "videostream.h" struct AVFrame; diff --git a/src/platform/video/swvideobuffer.cpp b/src/platform/video/swvideobuffer.cpp index 70ef5661a..746e82104 100644 --- a/src/platform/video/swvideobuffer.cpp +++ b/src/platform/video/swvideobuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "swvideobuffer.h" #include diff --git a/src/platform/video/swvideobuffer.h b/src/platform/video/swvideobuffer.h index 2258f10ae..3d7a55783 100644 --- a/src/platform/video/swvideobuffer.h +++ b/src/platform/video/swvideobuffer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "videobuffer.h" namespace Thyme diff --git a/src/platform/w3dengine/client/baseheightmap.cpp b/src/platform/w3dengine/client/baseheightmap.cpp index 67c0735c3..2f4b6f6bb 100644 --- a/src/platform/w3dengine/client/baseheightmap.cpp +++ b/src/platform/w3dengine/client/baseheightmap.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "baseheightmap.h" #include "castres.h" #include "colmath.h" diff --git a/src/platform/w3dengine/client/baseheightmap.h b/src/platform/w3dengine/client/baseheightmap.h index 904edfb8e..742fc9a0d 100644 --- a/src/platform/w3dengine/client/baseheightmap.h +++ b/src/platform/w3dengine/client/baseheightmap.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "coord.h" #include "dx8wrapper.h" diff --git a/src/platform/w3dengine/client/camerashakesystem.cpp b/src/platform/w3dengine/client/camerashakesystem.cpp index 5752dd936..0361d88e4 100644 --- a/src/platform/w3dengine/client/camerashakesystem.cpp +++ b/src/platform/w3dengine/client/camerashakesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "camerashakesystem.h" #include diff --git a/src/platform/w3dengine/client/camerashakesystem.h b/src/platform/w3dengine/client/camerashakesystem.h index 2044a09e1..35b957c93 100644 --- a/src/platform/w3dengine/client/camerashakesystem.h +++ b/src/platform/w3dengine/client/camerashakesystem.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "camera.h" #include "multilist.h" #include "vector3.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.cpp index 90c377df5..89bf14d55 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddebrisdraw.h" #include "drawable.h" #include "hanim.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.h b/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.h index faff2a4e0..0315bd269 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3ddebrisdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" #include "w3dshadow.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.cpp index 303a23c08..4bfaf5657 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddefaultdraw.h" #include "drawable.h" #include "w3dassetmanager.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.h b/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.h index 7a7755255..5a0329458 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3ddefaultdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawmodule.h" class RenderObjClass; diff --git a/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.cpp index c71b0cd4a..3713ea78a 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddependencymodeldraw.h" #include "drawable.h" #include "object.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.h b/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.h index f566e8b6c..6cdbba691 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3ddependencymodeldraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" class W3DDependencyModelDrawModuleData : public W3DModelDrawModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.cpp index 2a0f4edb5..104dfbabd 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dlaserdraw.h" #include "assetmgr.h" #include "color.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.h index e373084a8..d7dbb8b02 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dlaserdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawmodule.h" class SegmentedLineClass; diff --git a/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.cpp index 06bf95e2e..86c4184e5 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dmodeldraw.h" #include "aiupdate.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.h b/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.h index b6cc1e7b9..5d2cbbae5 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dmodeldraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawmodule.h" #include "particlesysmanager.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.cpp index a6337fdd8..b7cfcc9f2 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3doverlordaircraftdraw.h" #include "drawable.h" #include "object.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.h b/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.h index db6783850..380668592 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3doverlordaircraftdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" class W3DOverlordAircraftDrawModuleData : public W3DModelDrawModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.cpp index 35aa801cd..a0fb829a4 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3doverlordtankdraw.h" #include "drawable.h" #include "object.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.h b/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.h index 9775dab5a..80b1fd52f 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3doverlordtankdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dtankdraw.h" class W3DOverlordTankDrawModuleData : public W3DTankDrawModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.cpp index 492d6367c..c19c3f684 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3doverlordtruckdraw.h" #include "drawable.h" #include "object.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.h b/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.h index daf52b471..126197edd 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3doverlordtruckdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dtruckdraw.h" class W3DOverlordTruckDrawModuleData : public W3DTruckDrawModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.cpp index 66123d4e2..db81292fd 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dpolicecardraw.h" #include "drawable.h" #include "hanim.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.h b/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.h index 361919773..b71d634ee 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dpolicecardraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dtruckdraw.h" class W3DDynamicLight; diff --git a/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.cpp index 18e9a744e..07a51b241 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dprojectilestreamdraw.h" #include "assetmgr.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.h index de9c455a4..335220df1 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dprojectilestreamdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawmodule.h" #include "projectilestreamupdate.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.cpp index 12baedc1f..4e693a46d 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dpropdraw.h" #include "baseheightmap.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.h index 7c4dc7583..2a7d81de3 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dpropdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" class W3DPropDrawModuleData : public ModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.cpp index cfe1803a3..ca276acdf 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dropedraw.h" #include "drawable.h" #include "line3d.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h index b28eedd6c..cb73e7d60 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "color.h" #include "w3dmodeldraw.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.cpp index 5633d9683..597a3479e 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dsciencemodeldraw.h" #include "playerlist.h" #include "science.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.h b/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.h index 866b18c2c..c30373001 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dsciencemodeldraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" class W3DScienceModelDrawModuleData : public W3DModelDrawModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.cpp index cf7b28f70..614f24379 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dsupplydraw.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.h b/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.h index 1ecea7d46..9a9943734 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dsupplydraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" class W3DSupplyDrawModuleData : public W3DModelDrawModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.cpp index b9ebcd161..f0aeab0eb 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtankdraw.h" #include "aiupdate.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.h index a279a2728..1cea6b427 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dtankdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "rendobj.h" #include "w3dmodeldraw.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.cpp index a83fe5908..d297f6b0f 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtanktruckdraw.h" #include "aiupdate.h" #include "audiomanager.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.h index e1bf21203..36ec73fb3 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dtanktruckdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "rendobj.h" #include "w3dmodeldraw.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.cpp index 4b563c26b..7c9c2a7fb 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtracerdraw.h" #include "drawable.h" #include "gamelogic.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h index 9c5018d65..0ce868038 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "color.h" #include "w3dmodeldraw.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.cpp index 8e830b7f9..51b136395 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtreedraw.h" #include "baseheightmap.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.h index a005a851f..b9999a459 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dtreedraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawmodule.h" class W3DTreeDrawModuleData : public ModuleData diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.cpp b/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.cpp index 8f0a5323c..af722dd54 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.cpp +++ b/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtruckdraw.h" #include "aipathfind.h" #include "aiupdate.h" diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.h index 17b678770..9636cbda5 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dtruckdraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmodeldraw.h" class W3DTruckDrawModuleData : public W3DModelDrawModuleData diff --git a/src/platform/w3dengine/client/flatheightmap.cpp b/src/platform/w3dengine/client/flatheightmap.cpp index 03b06d61b..2e376e50a 100644 --- a/src/platform/w3dengine/client/flatheightmap.cpp +++ b/src/platform/w3dengine/client/flatheightmap.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "flatheightmap.h" #include "globaldata.h" #include "rinfo.h" diff --git a/src/platform/w3dengine/client/flatheightmap.h b/src/platform/w3dengine/client/flatheightmap.h index c9163c9f2..f3e4cc21f 100644 --- a/src/platform/w3dengine/client/flatheightmap.h +++ b/src/platform/w3dengine/client/flatheightmap.h @@ -13,8 +13,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "baseheightmap.h" + class W3DTerrainBackground; class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass diff --git a/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.cpp b/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.cpp index 9c58e87f9..3c85b0549 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dcheckbox.h" void W3D_Gadget_Check_Box_Draw(GameWindow *check_box, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.h b/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.h index 3157d075b..e9934dd1c 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dcheckbox.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Check_Box_Draw(GameWindow *check_box, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dcombobox.cpp b/src/platform/w3dengine/client/gui/gadget/w3dcombobox.cpp index a9a746376..5c36e4c37 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dcombobox.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dcombobox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dcombobox.h" void W3D_Gadget_Combo_Box_Draw(GameWindow *combo_box, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dcombobox.h b/src/platform/w3dengine/client/gui/gadget/w3dcombobox.h index 2343b4a67..3b50e1911 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dcombobox.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dcombobox.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Combo_Box_Draw(GameWindow *combo_box, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dhorizontalslider.cpp b/src/platform/w3dengine/client/gui/gadget/w3dhorizontalslider.cpp index 861efb06e..f679fb654 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dhorizontalslider.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dhorizontalslider.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dslider.h" void W3D_Gadget_Horizontal_Slider_Draw(GameWindow *slider, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dlistbox.cpp b/src/platform/w3dengine/client/gui/gadget/w3dlistbox.cpp index e4fbc8a83..1e59d763c 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dlistbox.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dlistbox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dlistbox.h" void W3D_Gadget_List_Box_Draw(GameWindow *list_box, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dlistbox.h b/src/platform/w3dengine/client/gui/gadget/w3dlistbox.h index 0bd58ec74..c0203d8b5 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dlistbox.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dlistbox.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_List_Box_Draw(GameWindow *list_box, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.cpp b/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.cpp index cf6944471..712aa1779 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dprogressbar.h" #include "display.h" #include "gadgetprogressbar.h" diff --git a/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.h b/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.h index 158298936..355e8ef1e 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dprogressbar.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Progress_Bar_Draw(GameWindow *progress_bar, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.cpp b/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.cpp index ac05d4d77..a4b6186c1 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dpushbutton.h" void W3D_Gadget_Push_Button_Draw(GameWindow *push_button, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.h b/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.h index a02a650df..32dcf0f64 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dpushbutton.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Push_Button_Draw(GameWindow *push_button, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.cpp b/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.cpp index 5d7dc6869..bfd925d57 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dradiobutton.h" void W3D_Gadget_Radio_Button_Draw(GameWindow *radio_button, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.h b/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.h index beea23d77..8d924b4a0 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dradiobutton.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Radio_Button_Draw(GameWindow *radio_button, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dslider.h b/src/platform/w3dengine/client/gui/gadget/w3dslider.h index 2ccb7eddf..97f23a553 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dslider.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dslider.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Horizontal_Slider_Draw(GameWindow *slider, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dstatictext.cpp b/src/platform/w3dengine/client/gui/gadget/w3dstatictext.cpp index 7dcd7e8c7..90d76ae0c 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dstatictext.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dstatictext.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dstatictext.h" #include "displaystring.h" #include "gadgetstatictext.h" diff --git a/src/platform/w3dengine/client/gui/gadget/w3dstatictext.h b/src/platform/w3dengine/client/gui/gadget/w3dstatictext.h index c393af3a0..51896e038 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dstatictext.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dstatictext.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Static_Text_Draw(GameWindow *static_text, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.cpp b/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.cpp index aec0f9e26..552da6465 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtabcontrol.h" void W3D_Gadget_Tab_Control_Draw(GameWindow *tab_control, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.h b/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.h index ef0331aa7..d7dfa7d49 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dtabcontrol.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Tab_Control_Draw(GameWindow *tab_control, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dtextentry.cpp b/src/platform/w3dengine/client/gui/gadget/w3dtextentry.cpp index 8cd10fff5..9bd7e876a 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dtextentry.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dtextentry.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtextentry.h" void W3D_Gadget_Text_Entry_Draw(GameWindow *text_entry, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/gadget/w3dtextentry.h b/src/platform/w3dengine/client/gui/gadget/w3dtextentry.h index 66b6b031d..0857ac313 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dtextentry.h +++ b/src/platform/w3dengine/client/gui/gadget/w3dtextentry.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Gadget_Text_Entry_Draw(GameWindow *text_entry, WinInstanceData *data); diff --git a/src/platform/w3dengine/client/gui/gadget/w3dverticalslider.cpp b/src/platform/w3dengine/client/gui/gadget/w3dverticalslider.cpp index 65947bf51..114fa5571 100644 --- a/src/platform/w3dengine/client/gui/gadget/w3dverticalslider.cpp +++ b/src/platform/w3dengine/client/gui/gadget/w3dverticalslider.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dslider.h" void W3D_Gadget_Vertical_Slider_Draw(GameWindow *slider, WinInstanceData *data) diff --git a/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.cpp b/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.cpp index 769db1a04..1bb5d5fe9 100644 --- a/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.cpp +++ b/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dcontrolbar.h" #include "controlbar.h" #include "controlbarscheme.h" diff --git a/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.h b/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.h index 1fcc53f44..36dceccb7 100644 --- a/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.h +++ b/src/platform/w3dengine/client/gui/guicallbacks/w3dcontrolbar.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" void W3D_Cameo_Movie_Draw(GameWindow *window, WinInstanceData *instance); diff --git a/src/platform/w3dengine/client/gui/w3dgamefont.cpp b/src/platform/w3dengine/client/gui/w3dgamefont.cpp index 8676bde84..9140e94c6 100644 --- a/src/platform/w3dengine/client/gui/w3dgamefont.cpp +++ b/src/platform/w3dengine/client/gui/w3dgamefont.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dgamefont.h" #include "assetmgr.h" #include "globallanguage.h" diff --git a/src/platform/w3dengine/client/gui/w3dgamewindow.cpp b/src/platform/w3dengine/client/gui/w3dgamewindow.cpp index 5b33f1a82..8ed70def8 100644 --- a/src/platform/w3dengine/client/gui/w3dgamewindow.cpp +++ b/src/platform/w3dengine/client/gui/w3dgamewindow.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dgamewindow.h" #include "displaystring.h" #include "gadgetlistbox.h" diff --git a/src/platform/w3dengine/client/gui/w3dgamewindow.h b/src/platform/w3dengine/client/gui/w3dgamewindow.h index 86bea02aa..48813b8e4 100644 --- a/src/platform/w3dengine/client/gui/w3dgamewindow.h +++ b/src/platform/w3dengine/client/gui/w3dgamewindow.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindow.h" #include "render2dsentence.h" diff --git a/src/platform/w3dengine/client/gui/w3dgamewindowmanager.cpp b/src/platform/w3dengine/client/gui/w3dgamewindowmanager.cpp index b8e11ea8c..14d20641f 100644 --- a/src/platform/w3dengine/client/gui/w3dgamewindowmanager.cpp +++ b/src/platform/w3dengine/client/gui/w3dgamewindowmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dgamewindowmanager.h" #include "display.h" #include "w3dcheckbox.h" diff --git a/src/platform/w3dengine/client/gui/w3dgamewindowmanager.h b/src/platform/w3dengine/client/gui/w3dgamewindowmanager.h index 88a623c3c..1839bee48 100644 --- a/src/platform/w3dengine/client/gui/w3dgamewindowmanager.h +++ b/src/platform/w3dengine/client/gui/w3dgamewindowmanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamewindowmanager.h" class W3DGameWindowManager : public GameWindowManager diff --git a/src/platform/w3dengine/client/heightmap.cpp b/src/platform/w3dengine/client/heightmap.cpp index 863a971db..4bc55db9c 100644 --- a/src/platform/w3dengine/client/heightmap.cpp +++ b/src/platform/w3dengine/client/heightmap.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "heightmap.h" #include "camera.h" #include "globaldata.h" diff --git a/src/platform/w3dengine/client/heightmap.h b/src/platform/w3dengine/client/heightmap.h index 2490b6306..fe5434844 100644 --- a/src/platform/w3dengine/client/heightmap.h +++ b/src/platform/w3dengine/client/heightmap.h @@ -14,8 +14,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "baseheightmap.h" + class W3DDynamicLight; class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass diff --git a/src/platform/w3dengine/client/shadow/w3dbuffermanager.cpp b/src/platform/w3dengine/client/shadow/w3dbuffermanager.cpp index 5b9c3d757..4ae8311d7 100644 --- a/src/platform/w3dengine/client/shadow/w3dbuffermanager.cpp +++ b/src/platform/w3dengine/client/shadow/w3dbuffermanager.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "w3dbuffermanager.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/platform/w3dengine/client/shadow/w3dbuffermanager.h b/src/platform/w3dengine/client/shadow/w3dbuffermanager.h index 591b06d2d..4f4b097d0 100644 --- a/src/platform/w3dengine/client/shadow/w3dbuffermanager.h +++ b/src/platform/w3dengine/client/shadow/w3dbuffermanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include class DX8VertexBufferClass; diff --git a/src/platform/w3dengine/client/shadow/w3dprojectedshadow.cpp b/src/platform/w3dengine/client/shadow/w3dprojectedshadow.cpp index d4b04aaf2..3ee836165 100644 --- a/src/platform/w3dengine/client/shadow/w3dprojectedshadow.cpp +++ b/src/platform/w3dengine/client/shadow/w3dprojectedshadow.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dprojectedshadow.h" #include "assetmgr.h" #include "baseheightmap.h" diff --git a/src/platform/w3dengine/client/shadow/w3dprojectedshadow.h b/src/platform/w3dengine/client/shadow/w3dprojectedshadow.h index db39c8008..d8a96c439 100644 --- a/src/platform/w3dengine/client/shadow/w3dprojectedshadow.h +++ b/src/platform/w3dengine/client/shadow/w3dprojectedshadow.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabox.h" #include "hash.h" #include "lightenv.h" diff --git a/src/platform/w3dengine/client/shadow/w3dshadow.cpp b/src/platform/w3dengine/client/shadow/w3dshadow.cpp index 3d019ed9e..98185ce80 100644 --- a/src/platform/w3dengine/client/shadow/w3dshadow.cpp +++ b/src/platform/w3dengine/client/shadow/w3dshadow.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dshadow.h" #include "camera.h" #ifdef BUILD_WITH_D3D8 diff --git a/src/platform/w3dengine/client/shadow/w3dshadow.h b/src/platform/w3dengine/client/shadow/w3dshadow.h index 40ad408b4..8f20282ab 100644 --- a/src/platform/w3dengine/client/shadow/w3dshadow.h +++ b/src/platform/w3dengine/client/shadow/w3dshadow.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" #include "gametype.h" #include "vector3.h" diff --git a/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.cpp b/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.cpp index a5332e2bc..fb9bce194 100644 --- a/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.cpp +++ b/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dvolumetricshadow.h" #include "baseheightmap.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.h b/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.h index 605b44fe1..c3e23ad99 100644 --- a/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.h +++ b/src/platform/w3dengine/client/shadow/w3dvolumetricshadow.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "aabox.h" #include "colmath.h" #include "drawmodule.h" diff --git a/src/platform/w3dengine/client/tiledata.cpp b/src/platform/w3dengine/client/tiledata.cpp index 1b3bb9968..48769d8bd 100644 --- a/src/platform/w3dengine/client/tiledata.cpp +++ b/src/platform/w3dengine/client/tiledata.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "tiledata.h" void TileData::Do_Mip(unsigned char *hi_res, int hi_row, unsigned char *lo_res) diff --git a/src/platform/w3dengine/client/tiledata.h b/src/platform/w3dengine/client/tiledata.h index 396026715..09b4eab05 100644 --- a/src/platform/w3dengine/client/tiledata.h +++ b/src/platform/w3dengine/client/tiledata.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "coord.h" #include "refcount.h" diff --git a/src/platform/w3dengine/client/w3dbibbuffer.cpp b/src/platform/w3dengine/client/w3dbibbuffer.cpp index 4a15777d3..f54cba3c2 100644 --- a/src/platform/w3dengine/client/w3dbibbuffer.cpp +++ b/src/platform/w3dengine/client/w3dbibbuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dbibbuffer.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/platform/w3dengine/client/w3dbibbuffer.h b/src/platform/w3dengine/client/w3dbibbuffer.h index 5e4c69837..5914113c5 100644 --- a/src/platform/w3dengine/client/w3dbibbuffer.h +++ b/src/platform/w3dengine/client/w3dbibbuffer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gametype.h" #include "vector3.h" #include diff --git a/src/platform/w3dengine/client/w3dbridgebuffer.cpp b/src/platform/w3dengine/client/w3dbridgebuffer.cpp index ea073ccf6..6e4a27efe 100644 --- a/src/platform/w3dengine/client/w3dbridgebuffer.cpp +++ b/src/platform/w3dengine/client/w3dbridgebuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dbridgebuffer.h" #include "assetmgr.h" #include "baseheightmap.h" @@ -28,6 +29,7 @@ #include "w3dshroud.h" #include "w3dterrainlogic.h" #include + using std::strcat; using std::strcpy; diff --git a/src/platform/w3dengine/client/w3dbridgebuffer.h b/src/platform/w3dengine/client/w3dbridgebuffer.h index f6c5d45a9..f0b4facce 100644 --- a/src/platform/w3dengine/client/w3dbridgebuffer.h +++ b/src/platform/w3dengine/client/w3dbridgebuffer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "gametype.h" #include "matrix3d.h" diff --git a/src/platform/w3dengine/client/w3ddebugdisplay.cpp b/src/platform/w3dengine/client/w3ddebugdisplay.cpp index da1885e98..258a97602 100644 --- a/src/platform/w3dengine/client/w3ddebugdisplay.cpp +++ b/src/platform/w3dengine/client/w3ddebugdisplay.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddebugdisplay.h" #include "colorspace.h" #include "displaystring.h" diff --git a/src/platform/w3dengine/client/w3ddebugdisplay.h b/src/platform/w3dengine/client/w3ddebugdisplay.h index dfaf5585b..a4ad62d99 100644 --- a/src/platform/w3dengine/client/w3ddebugdisplay.h +++ b/src/platform/w3dengine/client/w3ddebugdisplay.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "debugdisplay.h" #include diff --git a/src/platform/w3dengine/client/w3ddebugicons.cpp b/src/platform/w3dengine/client/w3ddebugicons.cpp index 673f237ed..6d90ca1ec 100644 --- a/src/platform/w3dengine/client/w3ddebugicons.cpp +++ b/src/platform/w3dengine/client/w3ddebugicons.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddebugicons.h" #include "gamelogic.h" #include "globaldata.h" diff --git a/src/platform/w3dengine/client/w3ddebugicons.h b/src/platform/w3dengine/client/w3ddebugicons.h index 37e3604a0..8b52259a7 100644 --- a/src/platform/w3dengine/client/w3ddebugicons.h +++ b/src/platform/w3dengine/client/w3ddebugicons.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "color.h" #include "coord.h" #include "rendobj.h" diff --git a/src/platform/w3dengine/client/w3ddisplay.cpp b/src/platform/w3dengine/client/w3ddisplay.cpp index 9f7b7f9dd..73c8326cc 100644 --- a/src/platform/w3dengine/client/w3ddisplay.cpp +++ b/src/platform/w3dengine/client/w3ddisplay.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "w3ddisplay.h" #include "baseheightmap.h" #include "colorspace.h" diff --git a/src/platform/w3dengine/client/w3ddisplaystring.cpp b/src/platform/w3dengine/client/w3ddisplaystring.cpp index 4998400e4..8875c5392 100644 --- a/src/platform/w3dengine/client/w3ddisplaystring.cpp +++ b/src/platform/w3dengine/client/w3ddisplaystring.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddisplaystring.h" #include "gameclient.h" #include "globallanguage.h" diff --git a/src/platform/w3dengine/client/w3ddisplaystring.h b/src/platform/w3dengine/client/w3ddisplaystring.h index 1905f4475..7ecc0595a 100644 --- a/src/platform/w3dengine/client/w3ddisplaystring.h +++ b/src/platform/w3dengine/client/w3ddisplaystring.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "displaystring.h" #include "render2dsentence.h" diff --git a/src/platform/w3dengine/client/w3ddisplaystringmanager.cpp b/src/platform/w3dengine/client/w3ddisplaystringmanager.cpp index cee82f93f..9ecbd00bf 100644 --- a/src/platform/w3dengine/client/w3ddisplaystringmanager.cpp +++ b/src/platform/w3dengine/client/w3ddisplaystringmanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddisplaystringmanager.h" #include "drawgroupinfo.h" #include "gameclient.h" diff --git a/src/platform/w3dengine/client/w3ddisplaystringmanager.h b/src/platform/w3dengine/client/w3ddisplaystringmanager.h index a66b405a1..034202001 100644 --- a/src/platform/w3dengine/client/w3ddisplaystringmanager.h +++ b/src/platform/w3dengine/client/w3ddisplaystringmanager.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "displaystringmanager.h" class W3DDisplayStringManager : public DisplayStringManager diff --git a/src/platform/w3dengine/client/w3ddynamiclight.cpp b/src/platform/w3dengine/client/w3ddynamiclight.cpp index bdfebf7f8..185193a06 100644 --- a/src/platform/w3dengine/client/w3ddynamiclight.cpp +++ b/src/platform/w3dengine/client/w3ddynamiclight.cpp @@ -12,7 +12,9 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3ddynamiclight.h" + void W3DDynamicLight::On_Frame_Update() { if (m_enabled) { diff --git a/src/platform/w3dengine/client/w3ddynamiclight.h b/src/platform/w3dengine/client/w3ddynamiclight.h index 4532ceb96..2ea3dd72e 100644 --- a/src/platform/w3dengine/client/w3ddynamiclight.h +++ b/src/platform/w3dengine/client/w3ddynamiclight.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "light.h" class W3DDynamicLight : public LightClass diff --git a/src/platform/w3dengine/client/w3dfilesystem.cpp b/src/platform/w3dengine/client/w3dfilesystem.cpp index a65f5cf64..8a9ac24a4 100644 --- a/src/platform/w3dengine/client/w3dfilesystem.cpp +++ b/src/platform/w3dengine/client/w3dfilesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dfilesystem.h" #include "asciistring.h" #include "filesystem.h" diff --git a/src/platform/w3dengine/client/w3dfilesystem.h b/src/platform/w3dengine/client/w3dfilesystem.h index 1b76de2d1..a17513329 100644 --- a/src/platform/w3dengine/client/w3dfilesystem.h +++ b/src/platform/w3dengine/client/w3dfilesystem.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "ffactory.h" #include "file.h" #include "wwfile.h" diff --git a/src/platform/w3dengine/client/w3dgameclient.cpp b/src/platform/w3dengine/client/w3dgameclient.cpp index 60e50900a..d54ec95e6 100644 --- a/src/platform/w3dengine/client/w3dgameclient.cpp +++ b/src/platform/w3dengine/client/w3dgameclient.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dgameclient.h" #include "baseheightmap.h" #include "binkvideoplayer.h" diff --git a/src/platform/w3dengine/client/w3dgameclient.h b/src/platform/w3dengine/client/w3dgameclient.h index 354ea8f11..b0227f4b4 100644 --- a/src/platform/w3dengine/client/w3dgameclient.h +++ b/src/platform/w3dengine/client/w3dgameclient.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gameclient.h" class W3DGameClient : public GameClient diff --git a/src/platform/w3dengine/client/w3dgamelogic.cpp b/src/platform/w3dengine/client/w3dgamelogic.cpp index 0ac347fca..2253cd8c8 100644 --- a/src/platform/w3dengine/client/w3dgamelogic.cpp +++ b/src/platform/w3dengine/client/w3dgamelogic.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dgamelogic.h" #include "w3dghostobject.h" #include "w3dterrainlogic.h" diff --git a/src/platform/w3dengine/client/w3dgamelogic.h b/src/platform/w3dengine/client/w3dgamelogic.h index f6e9e4b76..e669ac145 100644 --- a/src/platform/w3dengine/client/w3dgamelogic.h +++ b/src/platform/w3dengine/client/w3dgamelogic.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "gamelogic.h" class W3DGameLogic : public GameLogic diff --git a/src/platform/w3dengine/client/w3dingameui.cpp b/src/platform/w3dengine/client/w3dingameui.cpp index 8ea7a4d26..6acc3ec05 100644 --- a/src/platform/w3dengine/client/w3dingameui.cpp +++ b/src/platform/w3dengine/client/w3dingameui.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dingameui.h" #include "gameclient.h" #include "gamewindowmanager.h" diff --git a/src/platform/w3dengine/client/w3dingameui.h b/src/platform/w3dengine/client/w3dingameui.h index 431d8d250..7c56cb5ab 100644 --- a/src/platform/w3dengine/client/w3dingameui.h +++ b/src/platform/w3dengine/client/w3dingameui.h @@ -13,8 +13,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "ingameui.h" + class RenderObjClass; class HAnimClass; diff --git a/src/platform/w3dengine/client/w3dmouse.cpp b/src/platform/w3dengine/client/w3dmouse.cpp index 10148e489..bc29065aa 100644 --- a/src/platform/w3dengine/client/w3dmouse.cpp +++ b/src/platform/w3dengine/client/w3dmouse.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dmouse.h" #include "camera.h" #include "critsection.h" diff --git a/src/platform/w3dengine/client/w3dparticlesys.cpp b/src/platform/w3dengine/client/w3dparticlesys.cpp index 5b97e0b1b..e455e8467 100644 --- a/src/platform/w3dengine/client/w3dparticlesys.cpp +++ b/src/platform/w3dengine/client/w3dparticlesys.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dparticlesys.h" #include "camera.h" #include "globaldata.h" diff --git a/src/platform/w3dengine/client/w3dparticlesys.h b/src/platform/w3dengine/client/w3dparticlesys.h index 23fe3a59e..46cd12adc 100644 --- a/src/platform/w3dengine/client/w3dparticlesys.h +++ b/src/platform/w3dengine/client/w3dparticlesys.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "particlesysmanager.h" #include "sharebuf.h" #include "vector3.h" diff --git a/src/platform/w3dengine/client/w3dpropbuffer.cpp b/src/platform/w3dengine/client/w3dpropbuffer.cpp index 811a09698..1a0e8aa7a 100644 --- a/src/platform/w3dengine/client/w3dpropbuffer.cpp +++ b/src/platform/w3dengine/client/w3dpropbuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dpropbuffer.h" #include "assetmgr.h" #include "baseheightmap.h" diff --git a/src/platform/w3dengine/client/w3dpropbuffer.h b/src/platform/w3dengine/client/w3dpropbuffer.h index 44f094e77..3d3a17f59 100644 --- a/src/platform/w3dengine/client/w3dpropbuffer.h +++ b/src/platform/w3dengine/client/w3dpropbuffer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "partitionmanager.h" #include "sphere.h" diff --git a/src/platform/w3dengine/client/w3droadbuffer.cpp b/src/platform/w3dengine/client/w3droadbuffer.cpp index 535ffae74..a6c2b9e5c 100644 --- a/src/platform/w3dengine/client/w3droadbuffer.cpp +++ b/src/platform/w3dengine/client/w3droadbuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3droadbuffer.h" #include "assetmgr.h" #include "baseheightmap.h" diff --git a/src/platform/w3dengine/client/w3droadbuffer.h b/src/platform/w3dengine/client/w3droadbuffer.h index 482b8b4f1..17f1a3b0d 100644 --- a/src/platform/w3dengine/client/w3droadbuffer.h +++ b/src/platform/w3dengine/client/w3droadbuffer.h @@ -13,11 +13,12 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "multilist.h" #include "sphere.h" #include "vector2.h" + class TextureClass; class DX8VertexBufferClass; class DX8IndexBufferClass; diff --git a/src/platform/w3dengine/client/w3dscene.cpp b/src/platform/w3dengine/client/w3dscene.cpp index 8443db5e5..8689c342d 100644 --- a/src/platform/w3dengine/client/w3dscene.cpp +++ b/src/platform/w3dengine/client/w3dscene.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dscene.h" #include "baseheightmap.h" #include "camera.h" diff --git a/src/platform/w3dengine/client/w3dscene.h b/src/platform/w3dengine/client/w3dscene.h index 6fa937e82..d3013b51b 100644 --- a/src/platform/w3dengine/client/w3dscene.h +++ b/src/platform/w3dengine/client/w3dscene.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "lightenv.h" #include "scene.h" #include "shadermanager.h" diff --git a/src/platform/w3dengine/client/w3dshroud.cpp b/src/platform/w3dengine/client/w3dshroud.cpp index 2e724fdca..0989c4e6d 100644 --- a/src/platform/w3dengine/client/w3dshroud.cpp +++ b/src/platform/w3dengine/client/w3dshroud.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dshroud.h" #include "baseheightmap.h" #include "dx8wrapper.h" diff --git a/src/platform/w3dengine/client/w3dshroud.h b/src/platform/w3dengine/client/w3dshroud.h index adaa2a354..2f9b7a5a0 100644 --- a/src/platform/w3dengine/client/w3dshroud.h +++ b/src/platform/w3dengine/client/w3dshroud.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "matpass.h" #include "texture.h" #include "w3dtypes.h" diff --git a/src/platform/w3dengine/client/w3dsmudge.cpp b/src/platform/w3dengine/client/w3dsmudge.cpp index 0234037fd..99374ed80 100644 --- a/src/platform/w3dengine/client/w3dsmudge.cpp +++ b/src/platform/w3dengine/client/w3dsmudge.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dsmudge.h" #include "camera.h" #include "display.h" diff --git a/src/platform/w3dengine/client/w3dsmudge.h b/src/platform/w3dengine/client/w3dsmudge.h index f78f9ff17..77b7d156d 100644 --- a/src/platform/w3dengine/client/w3dsmudge.h +++ b/src/platform/w3dengine/client/w3dsmudge.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "smudge.h" class IndexBufferClass; diff --git a/src/platform/w3dengine/client/w3dsnow.cpp b/src/platform/w3dengine/client/w3dsnow.cpp index a80afbba7..49403eec8 100644 --- a/src/platform/w3dengine/client/w3dsnow.cpp +++ b/src/platform/w3dengine/client/w3dsnow.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "w3dsnow.h" #include "assetmgr.h" diff --git a/src/platform/w3dengine/client/w3dsnow.h b/src/platform/w3dengine/client/w3dsnow.h index 811252690..0547ee041 100644 --- a/src/platform/w3dengine/client/w3dsnow.h +++ b/src/platform/w3dengine/client/w3dsnow.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "snow.h" class MinMaxAABoxClass; diff --git a/src/platform/w3dengine/client/w3dstatuscircle.cpp b/src/platform/w3dengine/client/w3dstatuscircle.cpp index ce62b92c7..3fc69749c 100644 --- a/src/platform/w3dengine/client/w3dstatuscircle.cpp +++ b/src/platform/w3dengine/client/w3dstatuscircle.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dstatuscircle.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/platform/w3dengine/client/w3dstatuscircle.h b/src/platform/w3dengine/client/w3dstatuscircle.h index 30523bdd0..b03dda64e 100644 --- a/src/platform/w3dengine/client/w3dstatuscircle.h +++ b/src/platform/w3dengine/client/w3dstatuscircle.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "rendobj.h" #include "shader.h" diff --git a/src/platform/w3dengine/client/w3dterrainbackground.cpp b/src/platform/w3dengine/client/w3dterrainbackground.cpp index 89e2b096e..2deb39e1e 100644 --- a/src/platform/w3dengine/client/w3dterrainbackground.cpp +++ b/src/platform/w3dengine/client/w3dterrainbackground.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dterrainbackground.h" #include "baseheightmap.h" diff --git a/src/platform/w3dengine/client/w3dterrainbackground.h b/src/platform/w3dengine/client/w3dterrainbackground.h index 09ce9ebe5..ee00be331 100644 --- a/src/platform/w3dengine/client/w3dterrainbackground.h +++ b/src/platform/w3dengine/client/w3dterrainbackground.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabox.h" #include diff --git a/src/platform/w3dengine/client/w3dterraintracks.cpp b/src/platform/w3dengine/client/w3dterraintracks.cpp index 51fa2646e..00158f5e3 100644 --- a/src/platform/w3dengine/client/w3dterraintracks.cpp +++ b/src/platform/w3dengine/client/w3dterraintracks.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dterraintracks.h" #include "assetmgr.h" #include "drawable.h" diff --git a/src/platform/w3dengine/client/w3dterraintracks.h b/src/platform/w3dengine/client/w3dterraintracks.h index fb89735c0..f1d8c7e6a 100644 --- a/src/platform/w3dengine/client/w3dterraintracks.h +++ b/src/platform/w3dengine/client/w3dterraintracks.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabox.h" #include "rendobj.h" #include "shader.h" diff --git a/src/platform/w3dengine/client/w3dterrainvisual.cpp b/src/platform/w3dengine/client/w3dterrainvisual.cpp index 2149b8d85..23848274b 100644 --- a/src/platform/w3dengine/client/w3dterrainvisual.cpp +++ b/src/platform/w3dengine/client/w3dterrainvisual.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dterrainvisual.h" #include "cachedfileinputstream.h" #include "colorspace.h" diff --git a/src/platform/w3dengine/client/w3dterrainvisual.h b/src/platform/w3dengine/client/w3dterrainvisual.h index 74d7cf6e7..d868b16f5 100644 --- a/src/platform/w3dengine/client/w3dterrainvisual.h +++ b/src/platform/w3dengine/client/w3dterrainvisual.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "terrainvisual.h" class BaseHeightMapRenderObjClass; diff --git a/src/platform/w3dengine/client/w3dtreebuffer.cpp b/src/platform/w3dengine/client/w3dtreebuffer.cpp index 4c3cbc040..96f034df6 100644 --- a/src/platform/w3dengine/client/w3dtreebuffer.cpp +++ b/src/platform/w3dengine/client/w3dtreebuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dtreebuffer.h" #include "assetmgr.h" #include "baseheightmap.h" diff --git a/src/platform/w3dengine/client/w3dtreebuffer.h b/src/platform/w3dengine/client/w3dtreebuffer.h index 63198393f..01b3b19af 100644 --- a/src/platform/w3dengine/client/w3dtreebuffer.h +++ b/src/platform/w3dengine/client/w3dtreebuffer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coord.h" #include "globaldata.h" #include "matrix3d.h" diff --git a/src/platform/w3dengine/client/w3dview.cpp b/src/platform/w3dengine/client/w3dview.cpp index b649fb8b8..1cc1f1847 100644 --- a/src/platform/w3dengine/client/w3dview.cpp +++ b/src/platform/w3dengine/client/w3dview.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dview.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/platform/w3dengine/client/w3dview.h b/src/platform/w3dengine/client/w3dview.h index 4c0748e69..b90d56d4f 100644 --- a/src/platform/w3dengine/client/w3dview.h +++ b/src/platform/w3dengine/client/w3dview.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "parabolicease.h" #include "vector3.h" #include "view.h" diff --git a/src/platform/w3dengine/client/w3dwaypointbuffer.cpp b/src/platform/w3dengine/client/w3dwaypointbuffer.cpp index fd821ecbc..7f0678d88 100644 --- a/src/platform/w3dengine/client/w3dwaypointbuffer.cpp +++ b/src/platform/w3dengine/client/w3dwaypointbuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dwaypointbuffer.h" #include "aiupdate.h" #include "assetmgr.h" diff --git a/src/platform/w3dengine/client/w3dwaypointbuffer.h b/src/platform/w3dengine/client/w3dwaypointbuffer.h index be1085831..e2c2e5cf9 100644 --- a/src/platform/w3dengine/client/w3dwaypointbuffer.h +++ b/src/platform/w3dengine/client/w3dwaypointbuffer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include class RenderObjClass; diff --git a/src/platform/w3dengine/client/water/w3dwater.cpp b/src/platform/w3dengine/client/water/w3dwater.cpp index b66d2cedc..1d32b464d 100644 --- a/src/platform/w3dengine/client/water/w3dwater.cpp +++ b/src/platform/w3dengine/client/water/w3dwater.cpp @@ -13,6 +13,7 @@ * LICENSE */ // TODO figure out 0.0625, heightmap scale? +#include "always.h" #include "w3dwater.h" #include "baseheightmap.h" #include "camera.h" diff --git a/src/platform/w3dengine/client/water/w3dwater.h b/src/platform/w3dengine/client/water/w3dwater.h index 17bd25ca1..35d6ef56a 100644 --- a/src/platform/w3dengine/client/water/w3dwater.h +++ b/src/platform/w3dengine/client/water/w3dwater.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "asciistring.h" #include "gametype.h" #include "rendobj.h" diff --git a/src/platform/w3dengine/client/water/w3dwatertracks.cpp b/src/platform/w3dengine/client/water/w3dwatertracks.cpp index 41833195b..839a9effc 100644 --- a/src/platform/w3dengine/client/water/w3dwatertracks.cpp +++ b/src/platform/w3dengine/client/water/w3dwatertracks.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dwatertracks.h" #include "assetmgr.h" #include "baseheightmap.h" diff --git a/src/platform/w3dengine/client/water/w3dwatertracks.h b/src/platform/w3dengine/client/water/w3dwatertracks.h index ec341a286..09453ec25 100644 --- a/src/platform/w3dengine/client/water/w3dwatertracks.h +++ b/src/platform/w3dengine/client/water/w3dwatertracks.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabox.h" #include "shader.h" #include "sphere.h" diff --git a/src/platform/w3dengine/client/win32dikeyboard.cpp b/src/platform/w3dengine/client/win32dikeyboard.cpp index 20e64da73..34fa90cc1 100644 --- a/src/platform/w3dengine/client/win32dikeyboard.cpp +++ b/src/platform/w3dengine/client/win32dikeyboard.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "win32dikeyboard.h" #include "main.h" #include diff --git a/src/platform/w3dengine/client/win32dikeyboard.h b/src/platform/w3dengine/client/win32dikeyboard.h index d0f084c0b..90754386c 100644 --- a/src/platform/w3dengine/client/win32dikeyboard.h +++ b/src/platform/w3dengine/client/win32dikeyboard.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "keyboard.h" #include diff --git a/src/platform/w3dengine/client/win32mouse.cpp b/src/platform/w3dengine/client/win32mouse.cpp index 5494b8ce2..e9179ee38 100644 --- a/src/platform/w3dengine/client/win32mouse.cpp +++ b/src/platform/w3dengine/client/win32mouse.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "win32mouse.h" #include "editmain.h" #include "gameclient.h" diff --git a/src/platform/w3dengine/client/worldheightmap.cpp b/src/platform/w3dengine/client/worldheightmap.cpp index 398f3d072..b44660b26 100644 --- a/src/platform/w3dengine/client/worldheightmap.cpp +++ b/src/platform/w3dengine/client/worldheightmap.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "worldheightmap.h" #include "file.h" #include "filesystem.h" diff --git a/src/platform/w3dengine/client/worldheightmap.h b/src/platform/w3dengine/client/worldheightmap.h index 82b14f8c6..54caa26a3 100644 --- a/src/platform/w3dengine/client/worldheightmap.h +++ b/src/platform/w3dengine/client/worldheightmap.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "coord.h" #include "refcount.h" diff --git a/src/platform/w3dengine/common/system/w3dfunctionlexicon.cpp b/src/platform/w3dengine/common/system/w3dfunctionlexicon.cpp index d1962d77e..9316211dc 100644 --- a/src/platform/w3dengine/common/system/w3dfunctionlexicon.cpp +++ b/src/platform/w3dengine/common/system/w3dfunctionlexicon.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dfunctionlexicon.h" void W3DFunctionLexicon::Init() diff --git a/src/platform/w3dengine/common/thing/w3dmodulefactory.cpp b/src/platform/w3dengine/common/thing/w3dmodulefactory.cpp index d2c6309b8..20a687f1f 100644 --- a/src/platform/w3dengine/common/thing/w3dmodulefactory.cpp +++ b/src/platform/w3dengine/common/thing/w3dmodulefactory.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dmodulefactory.h" #include "moduleinfo.h" #include "w3ddebrisdraw.h" diff --git a/src/platform/w3dengine/common/thing/w3dmodulefactory.h b/src/platform/w3dengine/common/thing/w3dmodulefactory.h index 893c2a376..820e9b649 100644 --- a/src/platform/w3dengine/common/thing/w3dmodulefactory.h +++ b/src/platform/w3dengine/common/thing/w3dmodulefactory.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "modulefactory.h" class W3DModuleFactory : public ModuleFactory diff --git a/src/platform/w3dengine/common/win32bigfile.cpp b/src/platform/w3dengine/common/win32bigfile.cpp index 85200d01a..75f8e34a3 100644 --- a/src/platform/w3dengine/common/win32bigfile.cpp +++ b/src/platform/w3dengine/common/win32bigfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "win32bigfile.h" #include "localfilesystem.h" #include "ramfile.h" diff --git a/src/platform/w3dengine/common/win32bigfilesystem.cpp b/src/platform/w3dengine/common/win32bigfilesystem.cpp index 0902ddfb6..56ac3c2b0 100644 --- a/src/platform/w3dengine/common/win32bigfilesystem.cpp +++ b/src/platform/w3dengine/common/win32bigfilesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "win32bigfilesystem.h" #include "asciistring.h" #include "audiomanager.h" diff --git a/src/platform/w3dengine/common/win32gameengine.cpp b/src/platform/w3dengine/common/win32gameengine.cpp index a203ab996..8c4a4af4a 100644 --- a/src/platform/w3dengine/common/win32gameengine.cpp +++ b/src/platform/w3dengine/common/win32gameengine.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "win32gameengine.h" #include "audiomanager.h" #include "lanapiinterface.h" diff --git a/src/platform/w3dengine/common/win32localfile.cpp b/src/platform/w3dengine/common/win32localfile.cpp index 0173733a8..63687bf35 100644 --- a/src/platform/w3dengine/common/win32localfile.cpp +++ b/src/platform/w3dengine/common/win32localfile.cpp @@ -12,4 +12,5 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "win32localfile.h" diff --git a/src/platform/w3dengine/common/win32localfilesystem.cpp b/src/platform/w3dengine/common/win32localfilesystem.cpp index 55b204a92..800ba55f0 100644 --- a/src/platform/w3dengine/common/win32localfilesystem.cpp +++ b/src/platform/w3dengine/common/win32localfilesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "win32localfilesystem.h" #include "standardfile.h" #include "win32localfile.h" diff --git a/src/platform/w3dengine/logic/w3dghostobject.cpp b/src/platform/w3dengine/logic/w3dghostobject.cpp index 0a62a1aae..6fa957515 100644 --- a/src/platform/w3dengine/logic/w3dghostobject.cpp +++ b/src/platform/w3dengine/logic/w3dghostobject.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dghostobject.h" #include "gameclient.h" #include "gamelogic.h" diff --git a/src/platform/w3dengine/logic/w3dghostobject.h b/src/platform/w3dengine/logic/w3dghostobject.h index 5344c7fd9..3cbf57822 100644 --- a/src/platform/w3dengine/logic/w3dghostobject.h +++ b/src/platform/w3dengine/logic/w3dghostobject.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "drawable.h" #include "ghostobject.h" diff --git a/src/platform/w3dengine/logic/w3dterrainlogic.cpp b/src/platform/w3dengine/logic/w3dterrainlogic.cpp index ef7af0645..08aea4e70 100644 --- a/src/platform/w3dengine/logic/w3dterrainlogic.cpp +++ b/src/platform/w3dengine/logic/w3dterrainlogic.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dterrainlogic.h" #include "ai.h" #include "aipathfind.h" diff --git a/src/platform/w3dengine/logic/w3dterrainlogic.h b/src/platform/w3dengine/logic/w3dterrainlogic.h index 038ad63b9..b26a00d64 100644 --- a/src/platform/w3dengine/logic/w3dterrainlogic.h +++ b/src/platform/w3dengine/logic/w3dterrainlogic.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "terrainlogic.h" class W3DTerrainLogic : public TerrainLogic diff --git a/src/tools/compressor/compressor.cpp b/src/tools/compressor/compressor.cpp index 8b7e4772f..6be156933 100644 --- a/src/tools/compressor/compressor.cpp +++ b/src/tools/compressor/compressor.cpp @@ -1,3 +1,4 @@ +#include "always.h" #include "bufffile.h" #include "compressionmanager.h" #include "rtsutils.h" diff --git a/src/tools/w3dviewer/w3dafx.h b/src/tools/w3dviewer/w3dafx.h index 746cf5bfa..72ce7ac88 100644 --- a/src/tools/w3dviewer/w3dafx.h +++ b/src/tools/w3dviewer/w3dafx.h @@ -13,6 +13,7 @@ * LICENSE */ #pragma once + #include "always.h" // need to include these in a certain order diff --git a/src/w3d/lib/autopool.h b/src/w3d/lib/autopool.h index bb99eabac..4ac164974 100644 --- a/src/w3d/lib/autopool.h +++ b/src/w3d/lib/autopool.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "critsection.h" #include @@ -34,7 +33,7 @@ template class ObjectPoolClass while (block) { void *nextBlock = *(void **)block; - delete[](char *) block; + delete[] (char *)block; block = nextBlock; } } diff --git a/src/w3d/lib/buff.cpp b/src/w3d/lib/buff.cpp index b79d76624..e9feb64ee 100644 --- a/src/w3d/lib/buff.cpp +++ b/src/w3d/lib/buff.cpp @@ -12,7 +12,9 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "buff.h" + Buffer::Buffer(void *buffer, long size) : m_bufferPtr(buffer), m_size(size), m_isAllocated(false) {} Buffer::Buffer(char *buffer, long size) : m_bufferPtr(buffer), m_size(size), m_isAllocated(false) {} @@ -35,7 +37,7 @@ Buffer &Buffer::operator=(Buffer const &buffer) { if (buffer != this) { if (m_isAllocated) { - delete[](char *) m_bufferPtr; + delete[] (char *)m_bufferPtr; } m_isAllocated = false; @@ -54,7 +56,7 @@ Buffer::~Buffer() void Buffer::Reset() { if (m_isAllocated) { - delete[](char *) m_bufferPtr; + delete[] (char *)m_bufferPtr; } m_bufferPtr = NULL; diff --git a/src/w3d/lib/buff.h b/src/w3d/lib/buff.h index 48a59820c..b6041025c 100644 --- a/src/w3d/lib/buff.h +++ b/src/w3d/lib/buff.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + class Buffer { public: diff --git a/src/w3d/lib/bufffile.cpp b/src/w3d/lib/bufffile.cpp index 6025efd96..196179e4a 100644 --- a/src/w3d/lib/bufffile.cpp +++ b/src/w3d/lib/bufffile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bufffile.h" #include #include diff --git a/src/w3d/lib/bufffile.h b/src/w3d/lib/bufffile.h index 9c1a3ef7e..00a7b2607 100644 --- a/src/w3d/lib/bufffile.h +++ b/src/w3d/lib/bufffile.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rawfile.h" class BufferedFileClass : public RawFileClass diff --git a/src/w3d/lib/chunkio.cpp b/src/w3d/lib/chunkio.cpp index dd3cd424c..aea37349e 100644 --- a/src/w3d/lib/chunkio.cpp +++ b/src/w3d/lib/chunkio.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "chunkio.h" #include "wwfile.h" #include diff --git a/src/w3d/lib/chunkio.h b/src/w3d/lib/chunkio.h index bc955a28f..86c403d8e 100644 --- a/src/w3d/lib/chunkio.h +++ b/src/w3d/lib/chunkio.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class FileClass; struct IOVector2Struct diff --git a/src/w3d/lib/cpudetect.cpp b/src/w3d/lib/cpudetect.cpp index 6c5f77cbc..446bb3242 100644 --- a/src/w3d/lib/cpudetect.cpp +++ b/src/w3d/lib/cpudetect.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "cpudetect.h" #include "intrinsics.h" #include "systimer.h" @@ -1080,7 +1081,7 @@ void CPUDetectClass::Init_Processor_Family() ProcessorType = (signature >> 12) & 0x0F; ProcessorFamily = (signature >> 8) & 0x0F; ProcessorModel = (signature >> 4) & 0x0F; - ProcessorRevision = (signature)&0x0F; + ProcessorRevision = (signature) & 0x0F; IntelProcessor = INTEL_PROCESSOR_UNKNOWN; AMDProcessor = AMD_PROCESSOR_UNKNOWN; diff --git a/src/w3d/lib/cpudetect.h b/src/w3d/lib/cpudetect.h index ac2bd5d1d..c67e4de3e 100644 --- a/src/w3d/lib/cpudetect.h +++ b/src/w3d/lib/cpudetect.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "wwstring.h" class CPUDetectInitClass; diff --git a/src/w3d/lib/crcengine.cpp b/src/w3d/lib/crcengine.cpp index 25c11d7fd..b768d7101 100644 --- a/src/w3d/lib/crcengine.cpp +++ b/src/w3d/lib/crcengine.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "crcengine.h" template inline constexpr Array calculateCRC() diff --git a/src/w3d/lib/crcengine.h b/src/w3d/lib/crcengine.h index 935d0d2db..03d247812 100644 --- a/src/w3d/lib/crcengine.h +++ b/src/w3d/lib/crcengine.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "array.h" #include "bittype.h" diff --git a/src/w3d/lib/critsection.cpp b/src/w3d/lib/critsection.cpp index 2dabaaa1f..4639e2bb1 100644 --- a/src/w3d/lib/critsection.cpp +++ b/src/w3d/lib/critsection.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "critsection.h" #include "captainslog.h" diff --git a/src/w3d/lib/critsection.h b/src/w3d/lib/critsection.h index f3bbd35bb..51e23c71a 100644 --- a/src/w3d/lib/critsection.h +++ b/src/w3d/lib/critsection.h @@ -15,8 +15,6 @@ */ #pragma once -#include "always.h" - #ifndef GAME_DLL #include #endif diff --git a/src/w3d/lib/ffactory.cpp b/src/w3d/lib/ffactory.cpp index 36e35e55c..9e1333b03 100644 --- a/src/w3d/lib/ffactory.cpp +++ b/src/w3d/lib/ffactory.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ffactory.h" #include "bufffile.h" #include "captainslog.h" diff --git a/src/w3d/lib/filestraw.cpp b/src/w3d/lib/filestraw.cpp index 8b06c1cda..9f3bd9ec9 100644 --- a/src/w3d/lib/filestraw.cpp +++ b/src/w3d/lib/filestraw.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "filestraw.h" FileStraw::~FileStraw() diff --git a/src/w3d/lib/filestraw.h b/src/w3d/lib/filestraw.h index 60605261b..c85b2d665 100644 --- a/src/w3d/lib/filestraw.h +++ b/src/w3d/lib/filestraw.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "straw.h" #include "wwfile.h" diff --git a/src/w3d/lib/gcd_lcm.cpp b/src/w3d/lib/gcd_lcm.cpp index a04dc2627..e595deeb4 100644 --- a/src/w3d/lib/gcd_lcm.cpp +++ b/src/w3d/lib/gcd_lcm.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gcd_lcm.h" unsigned int Greatest_Common_Divisor(unsigned int a, unsigned int b) diff --git a/src/w3d/lib/gcd_lcm.h b/src/w3d/lib/gcd_lcm.h index dc12b6a19..ddc11fb48 100644 --- a/src/w3d/lib/gcd_lcm.h +++ b/src/w3d/lib/gcd_lcm.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" unsigned int Greatest_Common_Divisor(unsigned int a, unsigned int b); unsigned int Least_Common_Multiple(unsigned int a, unsigned int b); diff --git a/src/w3d/lib/hash.cpp b/src/w3d/lib/hash.cpp index 1307c5bf4..3596cef9c 100644 --- a/src/w3d/lib/hash.cpp +++ b/src/w3d/lib/hash.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hash.h" #include "realcrc.h" #include @@ -34,7 +35,7 @@ HashTableClass::HashTableClass(int size) HashTableClass::~HashTableClass() { if (m_hashTable) { - delete[](m_hashTable); + delete[] (m_hashTable); } m_hashTable = nullptr; } diff --git a/src/w3d/lib/hash.h b/src/w3d/lib/hash.h index ba57edde8..84b433c1b 100644 --- a/src/w3d/lib/hash.h +++ b/src/w3d/lib/hash.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "wwstring.h" class HashableClass diff --git a/src/w3d/lib/hashtemplate.h b/src/w3d/lib/hashtemplate.h index 4f4d0bece..1f7bd7e64 100644 --- a/src/w3d/lib/hashtemplate.h +++ b/src/w3d/lib/hashtemplate.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include #include diff --git a/src/w3d/lib/index.h b/src/w3d/lib/index.h index bb6e6bf77..d4baa3218 100644 --- a/src/w3d/lib/index.h +++ b/src/w3d/lib/index.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include #include diff --git a/src/w3d/lib/iniclass.cpp b/src/w3d/lib/iniclass.cpp index a348ef5ac..2a379e8bd 100644 --- a/src/w3d/lib/iniclass.cpp +++ b/src/w3d/lib/iniclass.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "iniclass.h" #include "filestraw.h" #include "nstrdup.h" diff --git a/src/w3d/lib/iniclass.h b/src/w3d/lib/iniclass.h index 1fb8a63f2..01da1b251 100644 --- a/src/w3d/lib/iniclass.h +++ b/src/w3d/lib/iniclass.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "crcengine.h" #include "index.h" #include "listnode.h" diff --git a/src/w3d/lib/listnode.h b/src/w3d/lib/listnode.h index aa1bf8695..84bc80d10 100644 --- a/src/w3d/lib/listnode.h +++ b/src/w3d/lib/listnode.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include class GenericList; diff --git a/src/w3d/lib/mpu.cpp b/src/w3d/lib/mpu.cpp index 1c4fc11d5..5633e1d0e 100644 --- a/src/w3d/lib/mpu.cpp +++ b/src/w3d/lib/mpu.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mpu.h" #include "intrinsics.h" diff --git a/src/w3d/lib/mpu.h b/src/w3d/lib/mpu.h index 0d9ddd7ff..a28d14a56 100644 --- a/src/w3d/lib/mpu.h +++ b/src/w3d/lib/mpu.h @@ -13,5 +13,5 @@ * LICENSE */ #pragma once -#include "always.h" + unsigned long Get_CPU_Clock(unsigned long &high); diff --git a/src/w3d/lib/multilist.cpp b/src/w3d/lib/multilist.cpp index ce8d55a46..5dd1601f3 100644 --- a/src/w3d/lib/multilist.cpp +++ b/src/w3d/lib/multilist.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "multilist.h" /** diff --git a/src/w3d/lib/multilist.h b/src/w3d/lib/multilist.h index 8a8bd6eea..776b647a7 100644 --- a/src/w3d/lib/multilist.h +++ b/src/w3d/lib/multilist.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "autopool.h" #include diff --git a/src/w3d/lib/mutex.cpp b/src/w3d/lib/mutex.cpp index b6ac8f98b..70e3897b3 100644 --- a/src/w3d/lib/mutex.cpp +++ b/src/w3d/lib/mutex.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mutex.h" #ifdef HAVE_UNISTD_H diff --git a/src/w3d/lib/mutex.h b/src/w3d/lib/mutex.h index 9b59fda2f..b49550c85 100644 --- a/src/w3d/lib/mutex.h +++ b/src/w3d/lib/mutex.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - #ifndef GAME_DLL #include #endif diff --git a/src/w3d/lib/nstrdup.cpp b/src/w3d/lib/nstrdup.cpp index f945d6f30..2b45ee965 100644 --- a/src/w3d/lib/nstrdup.cpp +++ b/src/w3d/lib/nstrdup.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "nstrdup.h" #include diff --git a/src/w3d/lib/random.cpp b/src/w3d/lib/random.cpp index 8c17b329f..74e6d8b8a 100644 --- a/src/w3d/lib/random.cpp +++ b/src/w3d/lib/random.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "random.h" RandomClass::RandomClass(unsigned seed) : m_seed(seed) {} diff --git a/src/w3d/lib/random.h b/src/w3d/lib/random.h index cbd0a7324..323d27d9c 100644 --- a/src/w3d/lib/random.h +++ b/src/w3d/lib/random.h @@ -15,8 +15,6 @@ */ #pragma once -#include "always.h" - class RandomClass { public: diff --git a/src/w3d/lib/rawfile.cpp b/src/w3d/lib/rawfile.cpp index 324b2776c..8cbb0ea6f 100644 --- a/src/w3d/lib/rawfile.cpp +++ b/src/w3d/lib/rawfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rawfile.h" #include #include @@ -27,16 +28,16 @@ #include #include // Make lseek 64bit on windows to match other platforms behaviour? -//#ifdef lseek +// #ifdef lseek // #undef lseek -//#endif +// #endif -//#ifdef off_t -// #undef off_t -//#endif +// #ifdef off_t +// #undef off_t +// #endif -//#define lseek _lseeki64 -// typedef __int64 off_t; +// #define lseek _lseeki64 +// typedef __int64 off_t; #endif #ifdef HAVE_UNISTD_H diff --git a/src/w3d/lib/rcfile.cpp b/src/w3d/lib/rcfile.cpp index 7e800daba..c39f61bf5 100644 --- a/src/w3d/lib/rcfile.cpp +++ b/src/w3d/lib/rcfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rcfile.h" #ifdef PLATFORM_WINDOWS diff --git a/src/w3d/lib/rcfile.h b/src/w3d/lib/rcfile.h index a493b5852..ff7f89b5f 100644 --- a/src/w3d/lib/rcfile.h +++ b/src/w3d/lib/rcfile.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "wwfile.h" #ifdef PLATFORM_WINDOWS diff --git a/src/w3d/lib/readline.cpp b/src/w3d/lib/readline.cpp index 15285987e..ef1f8fe9e 100644 --- a/src/w3d/lib/readline.cpp +++ b/src/w3d/lib/readline.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "readline.h" #include "filestraw.h" #include diff --git a/src/w3d/lib/readline.h b/src/w3d/lib/readline.h index f83368fa9..cfb05f79a 100644 --- a/src/w3d/lib/readline.h +++ b/src/w3d/lib/readline.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "straw.h" #include "wwfile.h" diff --git a/src/w3d/lib/realcrc.cpp b/src/w3d/lib/realcrc.cpp index 50c91b4b6..e968583fa 100644 --- a/src/w3d/lib/realcrc.cpp +++ b/src/w3d/lib/realcrc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "realcrc.h" #include diff --git a/src/w3d/lib/realcrc.h b/src/w3d/lib/realcrc.h index fbb880feb..dc24550d3 100644 --- a/src/w3d/lib/realcrc.h +++ b/src/w3d/lib/realcrc.h @@ -14,8 +14,8 @@ */ #pragma once -#include "always.h" #include "array.h" + uint32_t CRC_Memory(void const *data, size_t bytes, uint32_t crc); uint32_t CRC_String(const char *string, uint32_t crc); uint32_t CRC_Stringi(const char *string, uint32_t crc); diff --git a/src/w3d/lib/refcount.cpp b/src/w3d/lib/refcount.cpp index eea636957..d38ca503a 100644 --- a/src/w3d/lib/refcount.cpp +++ b/src/w3d/lib/refcount.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "refcount.h" int RefCountClass::m_totalRefs = 0; diff --git a/src/w3d/lib/refcount.h b/src/w3d/lib/refcount.h index 4b947c163..92457ed64 100644 --- a/src/w3d/lib/refcount.h +++ b/src/w3d/lib/refcount.h @@ -16,8 +16,6 @@ */ #pragma once -#include "always.h" - class RefCountClass { public: diff --git a/src/w3d/lib/rtsutilsw3d.h b/src/w3d/lib/rtsutilsw3d.h index 5b63918c1..37e121ff3 100644 --- a/src/w3d/lib/rtsutilsw3d.h +++ b/src/w3d/lib/rtsutilsw3d.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "endiantype.h" #include diff --git a/src/w3d/lib/sharebuf.h b/src/w3d/lib/sharebuf.h index 704f9413a..55cdffeaa 100644 --- a/src/w3d/lib/sharebuf.h +++ b/src/w3d/lib/sharebuf.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "refcount.h" #include "w3dmpo.h" #include diff --git a/src/w3d/lib/simplevec.h b/src/w3d/lib/simplevec.h index 9c824f327..a7445a4d7 100644 --- a/src/w3d/lib/simplevec.h +++ b/src/w3d/lib/simplevec.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include #include #include diff --git a/src/w3d/lib/slist.h b/src/w3d/lib/slist.h index 9b174d3ef..ff4c1689d 100644 --- a/src/w3d/lib/slist.h +++ b/src/w3d/lib/slist.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "autopool.h" template class SList; diff --git a/src/w3d/lib/straw.cpp b/src/w3d/lib/straw.cpp index 0f37c2256..0bba61080 100644 --- a/src/w3d/lib/straw.cpp +++ b/src/w3d/lib/straw.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "straw.h" Straw::~Straw() diff --git a/src/w3d/lib/straw.h b/src/w3d/lib/straw.h index b13600f02..ffe3d194e 100644 --- a/src/w3d/lib/straw.h +++ b/src/w3d/lib/straw.h @@ -15,8 +15,6 @@ */ #pragma once -#include "always.h" - enum StrawControl { STRAW_DECODE = 1, diff --git a/src/w3d/lib/systimer.cpp b/src/w3d/lib/systimer.cpp index 617ca1305..0009b12a4 100644 --- a/src/w3d/lib/systimer.cpp +++ b/src/w3d/lib/systimer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "systimer.h" #include "rtsutilsw3d.h" diff --git a/src/w3d/lib/systimer.h b/src/w3d/lib/systimer.h index 37cdfce69..ba48a2344 100644 --- a/src/w3d/lib/systimer.h +++ b/src/w3d/lib/systimer.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - #ifdef PLATFORM_WINDOWS #include #else diff --git a/src/w3d/lib/targa.cpp b/src/w3d/lib/targa.cpp index f84ac359f..06961cd85 100644 --- a/src/w3d/lib/targa.cpp +++ b/src/w3d/lib/targa.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "targa.h" #include "ffactory.h" #include diff --git a/src/w3d/lib/targa.h b/src/w3d/lib/targa.h index a704f570f..62cc2be24 100644 --- a/src/w3d/lib/targa.h +++ b/src/w3d/lib/targa.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "endiantype.h" #include "wwfile.h" diff --git a/src/w3d/lib/thread.cpp b/src/w3d/lib/thread.cpp index 5d1718623..1215b840d 100644 --- a/src/w3d/lib/thread.cpp +++ b/src/w3d/lib/thread.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "thread.h" #include "rtsutilsw3d.h" #include "systimer.h" diff --git a/src/w3d/lib/thread.h b/src/w3d/lib/thread.h index 7d8873a51..1aa6b89e6 100644 --- a/src/w3d/lib/thread.h +++ b/src/w3d/lib/thread.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - #ifdef HAVE_PTHREAD_H #include typedef void _EXCEPTION_POINTERS; // TODO set this to something appropriate, void for now so it compiles diff --git a/src/w3d/lib/threadtrack.cpp b/src/w3d/lib/threadtrack.cpp index cff2812b0..6fafc5203 100644 --- a/src/w3d/lib/threadtrack.cpp +++ b/src/w3d/lib/threadtrack.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "threadtrack.h" #include diff --git a/src/w3d/lib/threadtrack.h b/src/w3d/lib/threadtrack.h index a3dfc90ce..e2b4ce00a 100644 --- a/src/w3d/lib/threadtrack.h +++ b/src/w3d/lib/threadtrack.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector.h" struct ThreadTracker diff --git a/src/w3d/lib/vector.h b/src/w3d/lib/vector.h index 8fdf882d5..caf730c89 100644 --- a/src/w3d/lib/vector.h +++ b/src/w3d/lib/vector.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include #include #include diff --git a/src/w3d/lib/w3dmpo.h b/src/w3d/lib/w3dmpo.h index c7f78414d..edc62bf4a 100644 --- a/src/w3d/lib/w3dmpo.h +++ b/src/w3d/lib/w3dmpo.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include #include @@ -35,7 +34,10 @@ class W3DMPO #ifdef __SANITIZE_ADDRESS__ #define IMPLEMENT_NAMED_W3D_POOL(classname, poolname) \ public: \ - virtual int glueEnforcer() { return 4; }; \ + virtual int glueEnforcer() \ + { \ + return 4; \ + }; \ \ private: #else @@ -48,11 +50,23 @@ private: \ } \ \ public: \ - void *operator new(size_t size) { return Allocate_From_W3D_Mem_Pool(Get_Class_Pool(), sizeof(classname)); } \ - void *operator new(size_t size, void *where) { return where; } \ + void *operator new(size_t size) \ + { \ + return Allocate_From_W3D_Mem_Pool(Get_Class_Pool(), sizeof(classname)); \ + } \ + void *operator new(size_t size, void *where) \ + { \ + return where; \ + } \ void operator delete(void *p, void *where) {} \ - void operator delete(void *ptr) { Free_From_W3D_Mem_Pool(Get_Class_Pool(), ptr); } \ - virtual int glueEnforcer() { return 4; }; \ + void operator delete(void *ptr) \ + { \ + Free_From_W3D_Mem_Pool(Get_Class_Pool(), ptr); \ + } \ + virtual int glueEnforcer() \ + { \ + return 4; \ + }; \ \ private: #endif diff --git a/src/w3d/lib/wwfile.cpp b/src/w3d/lib/wwfile.cpp index ad6bda4e5..9545d3fd1 100644 --- a/src/w3d/lib/wwfile.cpp +++ b/src/w3d/lib/wwfile.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "wwfile.h" off_t FileClass::Tell() diff --git a/src/w3d/lib/wwfile.h b/src/w3d/lib/wwfile.h index 243452b3f..52d7638e0 100644 --- a/src/w3d/lib/wwfile.h +++ b/src/w3d/lib/wwfile.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #ifdef PLATFORM_WINDOWS #include #endif diff --git a/src/w3d/lib/wwstring.cpp b/src/w3d/lib/wwstring.cpp index 4d3623ea4..c32c55773 100644 --- a/src/w3d/lib/wwstring.cpp +++ b/src/w3d/lib/wwstring.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "wwstring.h" #include #if defined PLATFORM_WINDOWS diff --git a/src/w3d/lib/wwstring.h b/src/w3d/lib/wwstring.h index 87f62310e..cc0a1f4dd 100644 --- a/src/w3d/lib/wwstring.h +++ b/src/w3d/lib/wwstring.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "critsection.h" #include #include diff --git a/src/w3d/lib/xstraw.cpp b/src/w3d/lib/xstraw.cpp index be68f5a56..abeb02c94 100644 --- a/src/w3d/lib/xstraw.cpp +++ b/src/w3d/lib/xstraw.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "xstraw.h" #include diff --git a/src/w3d/lib/xstraw.h b/src/w3d/lib/xstraw.h index 976ab3300..9f0b6e466 100644 --- a/src/w3d/lib/xstraw.h +++ b/src/w3d/lib/xstraw.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "buff.h" #include "straw.h" diff --git a/src/w3d/math/aabox.cpp b/src/w3d/math/aabox.cpp index 059fd7852..ecdfc1b98 100644 --- a/src/w3d/math/aabox.cpp +++ b/src/w3d/math/aabox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabox.h" void AABoxClass::Init_Random(float min_center, float max_center, float min_extent, float max_extent) diff --git a/src/w3d/math/aabox.h b/src/w3d/math/aabox.h index 40f759037..a8190fbf5 100644 --- a/src/w3d/math/aabox.h +++ b/src/w3d/math/aabox.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "lineseg.h" class MinMaxAABoxClass; diff --git a/src/w3d/math/aaplane.h b/src/w3d/math/aaplane.h index 3681ae908..db346d059 100644 --- a/src/w3d/math/aaplane.h +++ b/src/w3d/math/aaplane.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector3.h" class AAPlaneClass diff --git a/src/w3d/math/castres.h b/src/w3d/math/castres.h index 0db99ada8..570787a40 100644 --- a/src/w3d/math/castres.h +++ b/src/w3d/math/castres.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector3.h" #include "w3d_file.h" diff --git a/src/w3d/math/colmath.cpp b/src/w3d/math/colmath.cpp index cec1f873a..92a73fa82 100644 --- a/src/w3d/math/colmath.cpp +++ b/src/w3d/math/colmath.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "colmath.h" const float CollisionMath::COINCIDENCE_EPSILON = .000001f; diff --git a/src/w3d/math/colmath.h b/src/w3d/math/colmath.h index 210fbba71..69131c8a2 100644 --- a/src/w3d/math/colmath.h +++ b/src/w3d/math/colmath.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "castres.h" #include "vector3.h" diff --git a/src/w3d/math/colmathaabox.cpp b/src/w3d/math/colmathaabox.cpp index f722b852d..95cf170b4 100644 --- a/src/w3d/math/colmathaabox.cpp +++ b/src/w3d/math/colmathaabox.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabox.h" #include "colmath.h" #include diff --git a/src/w3d/math/colmathaabtri.cpp b/src/w3d/math/colmathaabtri.cpp index 4d98d291f..ba414c160 100644 --- a/src/w3d/math/colmathaabtri.cpp +++ b/src/w3d/math/colmathaabtri.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabox.h" #include "colmath.h" #include "tri.h" diff --git a/src/w3d/math/colmathline.cpp b/src/w3d/math/colmathline.cpp index 93fd6ea12..a2df406ca 100644 --- a/src/w3d/math/colmathline.cpp +++ b/src/w3d/math/colmathline.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabox.h" #include "colmath.h" #include "lineseg.h" diff --git a/src/w3d/math/colmathobbobb.cpp b/src/w3d/math/colmathobbobb.cpp index d61e5b723..10ae246ed 100644 --- a/src/w3d/math/colmathobbobb.cpp +++ b/src/w3d/math/colmathobbobb.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabox.h" #include "castres.h" #include "colmath.h" diff --git a/src/w3d/math/colmathobbtri.cpp b/src/w3d/math/colmathobbtri.cpp index 563f2b2f2..59c64b2a7 100644 --- a/src/w3d/math/colmathobbtri.cpp +++ b/src/w3d/math/colmathobbtri.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "colmath.h" #include "obbox.h" #include "tri.h" diff --git a/src/w3d/math/cullsys.cpp b/src/w3d/math/cullsys.cpp index 744741bc5..ad78f35d0 100644 --- a/src/w3d/math/cullsys.cpp +++ b/src/w3d/math/cullsys.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "cullsys.h" CullableClass::CullableClass() : m_cullLink(nullptr), m_nextCollected(nullptr) diff --git a/src/w3d/math/cullsys.h b/src/w3d/math/cullsys.h index 24632a6f8..f9bf6f072 100644 --- a/src/w3d/math/cullsys.h +++ b/src/w3d/math/cullsys.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "aabox.h" #include "refcount.h" diff --git a/src/w3d/math/frustum.cpp b/src/w3d/math/frustum.cpp index fc79720cb..2ab9434e1 100644 --- a/src/w3d/math/frustum.cpp +++ b/src/w3d/math/frustum.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "frustum.h" void FrustumClass::Init(const Matrix3D &camera, const Vector2 &vpmin, const Vector2 &vpmax, float znear, float zfar) diff --git a/src/w3d/math/gamemath.cpp b/src/w3d/math/gamemath.cpp index e552053f0..dc8ade6c6 100644 --- a/src/w3d/math/gamemath.cpp +++ b/src/w3d/math/gamemath.cpp @@ -14,6 +14,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "gamemath.h" #ifdef GAME_DLL #include "hooker.h" diff --git a/src/w3d/math/gamemath.h b/src/w3d/math/gamemath.h index a51ecc2b1..1b2b63a0c 100644 --- a/src/w3d/math/gamemath.h +++ b/src/w3d/math/gamemath.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "array.h" #include #include @@ -458,11 +457,11 @@ inline int Float_To_Long(float f) // Do we want any double math? // inline long Float_To_Long(double f) //{ -//#ifdef PROCESSOR_X86 +// #ifdef PROCESSOR_X86 // return _mm_cvttsd_si32(_mm_load_pd(&f)); -//#else +// #else // return (int)(f); -//#endif +// #endif //} inline uint8_t Unit_Float_To_Byte(float f) diff --git a/src/w3d/math/lineseg.cpp b/src/w3d/math/lineseg.cpp index 2f14889fc..06de00149 100644 --- a/src/w3d/math/lineseg.cpp +++ b/src/w3d/math/lineseg.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "lineseg.h" void LineSegClass::Set(const LineSegClass &object, const Matrix3D &transform) diff --git a/src/w3d/math/lineseg.h b/src/w3d/math/lineseg.h index 368e32c00..4b0e828f0 100644 --- a/src/w3d/math/lineseg.h +++ b/src/w3d/math/lineseg.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "matrix3d.h" #include "vector3.h" diff --git a/src/w3d/math/matrix3.cpp b/src/w3d/math/matrix3.cpp index 473c26381..d846d334d 100644 --- a/src/w3d/math/matrix3.cpp +++ b/src/w3d/math/matrix3.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "matrix3.h" #include "quat.h" diff --git a/src/w3d/math/matrix3.h b/src/w3d/math/matrix3.h index 03a3255ae..4cb661840 100644 --- a/src/w3d/math/matrix3.h +++ b/src/w3d/math/matrix3.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "matrix3d.h" #include "matrix4.h" #include "vector3.h" diff --git a/src/w3d/math/matrix3d.cpp b/src/w3d/math/matrix3d.cpp index c5405a46a..738825054 100644 --- a/src/w3d/math/matrix3d.cpp +++ b/src/w3d/math/matrix3d.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "matrix3d.h" #include "gamemath.h" #include "matrix3.h" diff --git a/src/w3d/math/matrix4.cpp b/src/w3d/math/matrix4.cpp index 679244e81..cb324d0bb 100644 --- a/src/w3d/math/matrix4.cpp +++ b/src/w3d/math/matrix4.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "matrix4.h" #include "plane.h" diff --git a/src/w3d/math/obbox.h b/src/w3d/math/obbox.h index 429d76853..d2d19d04e 100644 --- a/src/w3d/math/obbox.h +++ b/src/w3d/math/obbox.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "gamemath.h" #include "matrix3.h" #include "matrix3d.h" diff --git a/src/w3d/math/quat.cpp b/src/w3d/math/quat.cpp index 12c986b31..fd1899985 100644 --- a/src/w3d/math/quat.cpp +++ b/src/w3d/math/quat.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "quat.h" #include "gamemath.h" #include "matrix3.h" diff --git a/src/w3d/math/rect.h b/src/w3d/math/rect.h index ad5e229d0..723558979 100644 --- a/src/w3d/math/rect.h +++ b/src/w3d/math/rect.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "vector2.h" #include diff --git a/src/w3d/math/tri.cpp b/src/w3d/math/tri.cpp index 9668d10c2..e1cacffee 100644 --- a/src/w3d/math/tri.cpp +++ b/src/w3d/math/tri.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "tri.h" void TriClass::Find_Dominant_Plane(int *axis1, int *axis2) const diff --git a/src/w3d/math/tri.h b/src/w3d/math/tri.h index 05ea5f00a..d79017606 100644 --- a/src/w3d/math/tri.h +++ b/src/w3d/math/tri.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector2.h" #include "vector3.h" #include "vector4.h" diff --git a/src/w3d/math/v3_rnd.cpp b/src/w3d/math/v3_rnd.cpp index 7e90e726e..a9162ba91 100644 --- a/src/w3d/math/v3_rnd.cpp +++ b/src/w3d/math/v3_rnd.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "v3_rnd.h" #include "vector2.h" diff --git a/src/w3d/math/v3_rnd.h b/src/w3d/math/v3_rnd.h index bc5d6ce31..6c8c4ff00 100644 --- a/src/w3d/math/v3_rnd.h +++ b/src/w3d/math/v3_rnd.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "random.h" #include "vector3.h" diff --git a/src/w3d/math/vector2.h b/src/w3d/math/vector2.h index 2312574c8..0589f3ac9 100644 --- a/src/w3d/math/vector2.h +++ b/src/w3d/math/vector2.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "gamemath.h" #include diff --git a/src/w3d/math/vector2i.h b/src/w3d/math/vector2i.h index 583de3eb1..7159ef469 100644 --- a/src/w3d/math/vector2i.h +++ b/src/w3d/math/vector2i.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "gamemath.h" #include diff --git a/src/w3d/math/vector3.h b/src/w3d/math/vector3.h index 7fe51fd15..b847b2788 100644 --- a/src/w3d/math/vector3.h +++ b/src/w3d/math/vector3.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "gamemath.h" #include diff --git a/src/w3d/math/vector3i.h b/src/w3d/math/vector3i.h index c0b354f34..9d689d759 100644 --- a/src/w3d/math/vector3i.h +++ b/src/w3d/math/vector3i.h @@ -15,8 +15,6 @@ */ #pragma once -#include "always.h" - class Vector3i { public: diff --git a/src/w3d/math/vector4.cpp b/src/w3d/math/vector4.cpp index 290d7e345..70cd78313 100644 --- a/src/w3d/math/vector4.cpp +++ b/src/w3d/math/vector4.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "vector4.h" #include "vector3.h" diff --git a/src/w3d/math/vector4.h b/src/w3d/math/vector4.h index c591bd891..398fb91b5 100644 --- a/src/w3d/math/vector4.h +++ b/src/w3d/math/vector4.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "gamemath.h" #include diff --git a/src/w3d/math/vp.cpp b/src/w3d/math/vp.cpp index 22eea4046..9ff823623 100644 --- a/src/w3d/math/vp.cpp +++ b/src/w3d/math/vp.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "vp.h" #include "gamemath.h" #include "matrix3d.h" diff --git a/src/w3d/math/vp.h b/src/w3d/math/vp.h index ac0ac9efc..b91141e08 100644 --- a/src/w3d/math/vp.h +++ b/src/w3d/math/vp.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - class Vector2; class Vector3; class Vector4; diff --git a/src/w3d/renderer/aabtree.cpp b/src/w3d/renderer/aabtree.cpp index 600b22740..4d3bb331e 100644 --- a/src/w3d/renderer/aabtree.cpp +++ b/src/w3d/renderer/aabtree.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabtree.h" #include "aabtreebuilder.h" #include "camera.h" diff --git a/src/w3d/renderer/aabtree.h b/src/w3d/renderer/aabtree.h index 3cd56be3a..b91f8eb59 100644 --- a/src/w3d/renderer/aabtree.h +++ b/src/w3d/renderer/aabtree.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabtreebuilder.h" #include "aaplane.h" #include "bittype.h" diff --git a/src/w3d/renderer/aabtreebuilder.cpp b/src/w3d/renderer/aabtreebuilder.cpp index 32c471599..065240a57 100644 --- a/src/w3d/renderer/aabtreebuilder.cpp +++ b/src/w3d/renderer/aabtreebuilder.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "aabtreebuilder.h" #include "chunkio.h" #include "w3d_file.h" diff --git a/src/w3d/renderer/aabtreebuilder.h b/src/w3d/renderer/aabtreebuilder.h index b03b40b8c..48ca34347 100644 --- a/src/w3d/renderer/aabtreebuilder.h +++ b/src/w3d/renderer/aabtreebuilder.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aaplane.h" #include "bittype.h" #include "meshgeometry.h" diff --git a/src/w3d/renderer/animobj.cpp b/src/w3d/renderer/animobj.cpp index c878708bf..346705991 100644 --- a/src/w3d/renderer/animobj.cpp +++ b/src/w3d/renderer/animobj.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "animobj.h" #include "assetmgr.h" #include "hrawanim.h" diff --git a/src/w3d/renderer/animobj.h b/src/w3d/renderer/animobj.h index 808635859..3bd4c3540 100644 --- a/src/w3d/renderer/animobj.h +++ b/src/w3d/renderer/animobj.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "composite.h" #include "htree.h" diff --git a/src/w3d/renderer/assetmgr.cpp b/src/w3d/renderer/assetmgr.cpp index 0d3008237..1f7ea97bd 100644 --- a/src/w3d/renderer/assetmgr.cpp +++ b/src/w3d/renderer/assetmgr.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "assetmgr.h" #include "boxrobj.h" #include "chunkio.h" diff --git a/src/w3d/renderer/assetmgr.h b/src/w3d/renderer/assetmgr.h index 7e6df1452..d47237378 100644 --- a/src/w3d/renderer/assetmgr.h +++ b/src/w3d/renderer/assetmgr.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "hanimmgr.h" #include "htreemgr.h" #include "nullrobj.h" diff --git a/src/w3d/renderer/bitmaphandler.cpp b/src/w3d/renderer/bitmaphandler.cpp index d8af15cde..6016a5c38 100644 --- a/src/w3d/renderer/bitmaphandler.cpp +++ b/src/w3d/renderer/bitmaphandler.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bitmaphandler.h" #include "colorspace.h" diff --git a/src/w3d/renderer/bitmaphandler.h b/src/w3d/renderer/bitmaphandler.h index 3a4e75163..0445aa63c 100644 --- a/src/w3d/renderer/bitmaphandler.h +++ b/src/w3d/renderer/bitmaphandler.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "w3dformat.h" class Vector3; diff --git a/src/w3d/renderer/bmp2d.cpp b/src/w3d/renderer/bmp2d.cpp index 47d77684c..e95d7ccda 100644 --- a/src/w3d/renderer/bmp2d.cpp +++ b/src/w3d/renderer/bmp2d.cpp @@ -12,8 +12,10 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bmp2d.h" #include "pot.h" + Bitmap2D::Bitmap2D( TextureClass *texture, float x, float y, bool adjust_xy, bool additive, bool create_material, bool opaque) : DynamicScreenMeshClass(2, 4, 1.0f) diff --git a/src/w3d/renderer/bmp2d.h b/src/w3d/renderer/bmp2d.h index 0d5a1bad2..d3d2b01b5 100644 --- a/src/w3d/renderer/bmp2d.h +++ b/src/w3d/renderer/bmp2d.h @@ -13,8 +13,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "dynamesh.h" + class Bitmap2D : public DynamicScreenMeshClass { public: diff --git a/src/w3d/renderer/boxrobj.cpp b/src/w3d/renderer/boxrobj.cpp index 3680168bb..3b392eff2 100644 --- a/src/w3d/renderer/boxrobj.cpp +++ b/src/w3d/renderer/boxrobj.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "boxrobj.h" #include "coltest.h" #include "dx8indexbuffer.h" diff --git a/src/w3d/renderer/bwrender.cpp b/src/w3d/renderer/bwrender.cpp index 38d00f6fc..8c893ec44 100644 --- a/src/w3d/renderer/bwrender.cpp +++ b/src/w3d/renderer/bwrender.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "bwrender.h" #include "vp.h" #include diff --git a/src/w3d/renderer/bwrender.h b/src/w3d/renderer/bwrender.h index 58d9f5f86..67de03514 100644 --- a/src/w3d/renderer/bwrender.h +++ b/src/w3d/renderer/bwrender.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector2.h" #include "vector3.h" #include "vector3i.h" diff --git a/src/w3d/renderer/camera.cpp b/src/w3d/renderer/camera.cpp index 61968ae30..451624781 100644 --- a/src/w3d/renderer/camera.cpp +++ b/src/w3d/renderer/camera.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "camera.h" #include "dx8wrapper.h" #include "gamemath.h" diff --git a/src/w3d/renderer/camera.h b/src/w3d/renderer/camera.h index 58bacd2c7..15de214db 100644 --- a/src/w3d/renderer/camera.h +++ b/src/w3d/renderer/camera.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "colmath.h" #include "frustum.h" #include "matrix4.h" diff --git a/src/w3d/renderer/colorspace.cpp b/src/w3d/renderer/colorspace.cpp index 3451bc51b..73ba2166d 100644 --- a/src/w3d/renderer/colorspace.cpp +++ b/src/w3d/renderer/colorspace.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 "gamemath.h" #include diff --git a/src/w3d/renderer/colorspace.h b/src/w3d/renderer/colorspace.h index 6249e3ade..d5da77e15 100644 --- a/src/w3d/renderer/colorspace.h +++ b/src/w3d/renderer/colorspace.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector3.h" #include "vector4.h" diff --git a/src/w3d/renderer/coltest.cpp b/src/w3d/renderer/coltest.cpp index 76548f40a..8a8969efd 100644 --- a/src/w3d/renderer/coltest.cpp +++ b/src/w3d/renderer/coltest.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "coltest.h" AABoxCollisionTestClass::AABoxCollisionTestClass(const AABoxCollisionTestClass &that) : diff --git a/src/w3d/renderer/coltest.h b/src/w3d/renderer/coltest.h index ea45736e6..29f49e2f6 100644 --- a/src/w3d/renderer/coltest.h +++ b/src/w3d/renderer/coltest.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabox.h" #include "castres.h" #include "colmath.h" diff --git a/src/w3d/renderer/composite.cpp b/src/w3d/renderer/composite.cpp index 8c2c2ba51..7eefef684 100644 --- a/src/w3d/renderer/composite.cpp +++ b/src/w3d/renderer/composite.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "composite.h" CompositeRenderObjClass::CompositeRenderObjClass() {} diff --git a/src/w3d/renderer/composite.h b/src/w3d/renderer/composite.h index 136295b79..501780563 100644 --- a/src/w3d/renderer/composite.h +++ b/src/w3d/renderer/composite.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "rendobj.h" #include "wwstring.h" diff --git a/src/w3d/renderer/dazzle.cpp b/src/w3d/renderer/dazzle.cpp index b1a173d5a..5d49c9ad9 100644 --- a/src/w3d/renderer/dazzle.cpp +++ b/src/w3d/renderer/dazzle.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dazzle.h" #include "captainslog.h" diff --git a/src/w3d/renderer/dazzle.h b/src/w3d/renderer/dazzle.h index b8950773a..f368e327f 100644 --- a/src/w3d/renderer/dazzle.h +++ b/src/w3d/renderer/dazzle.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "proto.h" #include "w3d_file.h" diff --git a/src/w3d/renderer/ddsfile.cpp b/src/w3d/renderer/ddsfile.cpp index 7a7390ec5..10c5b8f7b 100644 --- a/src/w3d/renderer/ddsfile.cpp +++ b/src/w3d/renderer/ddsfile.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "ddsfile.h" #include "colorspace.h" #include "ffactory.h" diff --git a/src/w3d/renderer/ddsfile.h b/src/w3d/renderer/ddsfile.h index 243c67beb..c1a47fd61 100644 --- a/src/w3d/renderer/ddsfile.h +++ b/src/w3d/renderer/ddsfile.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector3.h" #include "w3dformat.h" #include "w3dtypes.h" diff --git a/src/w3d/renderer/decalmsh.h b/src/w3d/renderer/decalmsh.h index 3181a713e..1399d7539 100644 --- a/src/w3d/renderer/decalmsh.h +++ b/src/w3d/renderer/decalmsh.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "refcount.h" #include "simplevec.h" #include "vector.h" diff --git a/src/w3d/renderer/dllist.h b/src/w3d/renderer/dllist.h index b46da7976..7e570f097 100644 --- a/src/w3d/renderer/dllist.h +++ b/src/w3d/renderer/dllist.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "w3dmpo.h" template class DLNodeClass; diff --git a/src/w3d/renderer/dx8caps.cpp b/src/w3d/renderer/dx8caps.cpp index a59d8d583..3a251f527 100644 --- a/src/w3d/renderer/dx8caps.cpp +++ b/src/w3d/renderer/dx8caps.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8caps.h" #include "dx8wrapper.h" #include diff --git a/src/w3d/renderer/dx8caps.h b/src/w3d/renderer/dx8caps.h index 8fccb9a15..5f0bcc7b2 100644 --- a/src/w3d/renderer/dx8caps.h +++ b/src/w3d/renderer/dx8caps.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "w3dformat.h" #include "w3dtypes.h" #include "wwstring.h" diff --git a/src/w3d/renderer/dx8fvf.cpp b/src/w3d/renderer/dx8fvf.cpp index 039afb1d2..78ae80890 100644 --- a/src/w3d/renderer/dx8fvf.cpp +++ b/src/w3d/renderer/dx8fvf.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8fvf.h" #ifdef BUILD_WITH_D3D8 #include diff --git a/src/w3d/renderer/dx8fvf.h b/src/w3d/renderer/dx8fvf.h index 2fafe4a03..551ece8b4 100644 --- a/src/w3d/renderer/dx8fvf.h +++ b/src/w3d/renderer/dx8fvf.h @@ -14,7 +14,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dmpo.h" #include "wwstring.h" diff --git a/src/w3d/renderer/dx8indexbuffer.cpp b/src/w3d/renderer/dx8indexbuffer.cpp index fe203a212..72df6427e 100644 --- a/src/w3d/renderer/dx8indexbuffer.cpp +++ b/src/w3d/renderer/dx8indexbuffer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8indexbuffer.h" #include "dx8caps.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/dx8indexbuffer.h b/src/w3d/renderer/dx8indexbuffer.h index 950574ea8..4dfa4b5aa 100644 --- a/src/w3d/renderer/dx8indexbuffer.h +++ b/src/w3d/renderer/dx8indexbuffer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "refcount.h" #include "w3dmpo.h" #include "w3dtypes.h" diff --git a/src/w3d/renderer/dx8polygonrenderer.cpp b/src/w3d/renderer/dx8polygonrenderer.cpp index 2d73f6e4d..447e5460b 100644 --- a/src/w3d/renderer/dx8polygonrenderer.cpp +++ b/src/w3d/renderer/dx8polygonrenderer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8polygonrenderer.h" #include "dx8renderer.h" #include "meshmdl.h" diff --git a/src/w3d/renderer/dx8polygonrenderer.h b/src/w3d/renderer/dx8polygonrenderer.h index 2159d0c59..8a9643c57 100644 --- a/src/w3d/renderer/dx8polygonrenderer.h +++ b/src/w3d/renderer/dx8polygonrenderer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "dx8wrapper.h" #include "multilist.h" #include "sortingrenderer.h" diff --git a/src/w3d/renderer/dx8renderer.cpp b/src/w3d/renderer/dx8renderer.cpp index 15bac662a..8f285e364 100644 --- a/src/w3d/renderer/dx8renderer.cpp +++ b/src/w3d/renderer/dx8renderer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8renderer.h" #include "camera.h" #include "decalmsh.h" diff --git a/src/w3d/renderer/dx8renderer.h b/src/w3d/renderer/dx8renderer.h index d5df59622..50700d186 100644 --- a/src/w3d/renderer/dx8renderer.h +++ b/src/w3d/renderer/dx8renderer.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "autopool.h" #include "meshmatdesc.h" #include "meshmdl.h" diff --git a/src/w3d/renderer/dx8texman.cpp b/src/w3d/renderer/dx8texman.cpp index 8d439728a..e0954d263 100644 --- a/src/w3d/renderer/dx8texman.cpp +++ b/src/w3d/renderer/dx8texman.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8texman.h" #include "dx8wrapper.h" #include diff --git a/src/w3d/renderer/dx8texman.h b/src/w3d/renderer/dx8texman.h index 8d62f495d..9bf868845 100644 --- a/src/w3d/renderer/dx8texman.h +++ b/src/w3d/renderer/dx8texman.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "multilist.h" #include "texturebase.h" #include "w3dformat.h" diff --git a/src/w3d/renderer/dx8vertexbuffer.cpp b/src/w3d/renderer/dx8vertexbuffer.cpp index 2844d3306..ac4d89e6c 100644 --- a/src/w3d/renderer/dx8vertexbuffer.cpp +++ b/src/w3d/renderer/dx8vertexbuffer.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8vertexbuffer.h" #include "dx8caps.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/dx8vertexbuffer.h b/src/w3d/renderer/dx8vertexbuffer.h index 3db895555..5ce1ba397 100644 --- a/src/w3d/renderer/dx8vertexbuffer.h +++ b/src/w3d/renderer/dx8vertexbuffer.h @@ -14,7 +14,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "dx8fvf.h" #include "refcount.h" #include "vector2.h" diff --git a/src/w3d/renderer/dx8wrapper.cpp b/src/w3d/renderer/dx8wrapper.cpp index 6436f944a..a0d8ae219 100644 --- a/src/w3d/renderer/dx8wrapper.cpp +++ b/src/w3d/renderer/dx8wrapper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dx8wrapper.h" #include "boxrobj.h" #include "dx8indexbuffer.h" diff --git a/src/w3d/renderer/dx8wrapper.h b/src/w3d/renderer/dx8wrapper.h index fb7d08aca..b99f9c603 100644 --- a/src/w3d/renderer/dx8wrapper.h +++ b/src/w3d/renderer/dx8wrapper.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "dx8caps.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/w3d/renderer/dynamesh.cpp b/src/w3d/renderer/dynamesh.cpp index 7560aaf0f..77d4a7156 100644 --- a/src/w3d/renderer/dynamesh.cpp +++ b/src/w3d/renderer/dynamesh.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "dynamesh.h" #include "camera.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/dynamesh.h b/src/w3d/renderer/dynamesh.h index 3d6688c4c..593023601 100644 --- a/src/w3d/renderer/dynamesh.h +++ b/src/w3d/renderer/dynamesh.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "matinfo.h" #include "meshgeometry.h" #include "meshmatdesc.h" diff --git a/src/w3d/renderer/hanim.h b/src/w3d/renderer/hanim.h index 29e4c141f..a8eb8077a 100644 --- a/src/w3d/renderer/hanim.h +++ b/src/w3d/renderer/hanim.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "hash.h" #include "refcount.h" diff --git a/src/w3d/renderer/hanimmgr.cpp b/src/w3d/renderer/hanimmgr.cpp index aaa4aa49d..4cb29dfd4 100644 --- a/src/w3d/renderer/hanimmgr.cpp +++ b/src/w3d/renderer/hanimmgr.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "hanimmgr.h" #include "hanim.h" #include "hash.h" diff --git a/src/w3d/renderer/hanimmgr.h b/src/w3d/renderer/hanimmgr.h index 0bd229101..c00b8e8dd 100644 --- a/src/w3d/renderer/hanimmgr.h +++ b/src/w3d/renderer/hanimmgr.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "chunkio.h" #include "hash.h" #include "vector.h" diff --git a/src/w3d/renderer/hcanim.cpp b/src/w3d/renderer/hcanim.cpp index 2dae46ef9..8e9ffc901 100644 --- a/src/w3d/renderer/hcanim.cpp +++ b/src/w3d/renderer/hcanim.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hcanim.h" #include "assetmgr.h" #include diff --git a/src/w3d/renderer/hcanim.h b/src/w3d/renderer/hcanim.h index e36a8a6a2..75fcc0e4c 100644 --- a/src/w3d/renderer/hcanim.h +++ b/src/w3d/renderer/hcanim.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "hanim.h" #include "motchan.h" #include "w3d_file.h" diff --git a/src/w3d/renderer/hlod.cpp b/src/w3d/renderer/hlod.cpp index 8c3fa4532..42082f270 100644 --- a/src/w3d/renderer/hlod.cpp +++ b/src/w3d/renderer/hlod.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hlod.h" #include "assetmgr.h" #include "boxrobj.h" diff --git a/src/w3d/renderer/hlod.h b/src/w3d/renderer/hlod.h index 0d990484e..5572aea58 100644 --- a/src/w3d/renderer/hlod.h +++ b/src/w3d/renderer/hlod.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "animobj.h" #include "proto.h" #include "refcount.h" diff --git a/src/w3d/renderer/hrawanim.cpp b/src/w3d/renderer/hrawanim.cpp index d7d454626..6d6a84cb0 100644 --- a/src/w3d/renderer/hrawanim.cpp +++ b/src/w3d/renderer/hrawanim.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "hrawanim.h" #include "assetmgr.h" #include diff --git a/src/w3d/renderer/hrawanim.h b/src/w3d/renderer/hrawanim.h index 404876038..81c40a55e 100644 --- a/src/w3d/renderer/hrawanim.h +++ b/src/w3d/renderer/hrawanim.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "hanim.h" #include "motchan.h" #include "w3d_file.h" diff --git a/src/w3d/renderer/htree.cpp b/src/w3d/renderer/htree.cpp index 87d3c7e77..aaf62416a 100644 --- a/src/w3d/renderer/htree.cpp +++ b/src/w3d/renderer/htree.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "htree.h" #include "chunkio.h" #include "hanim.h" diff --git a/src/w3d/renderer/htree.h b/src/w3d/renderer/htree.h index 79d27f720..f77a57d70 100644 --- a/src/w3d/renderer/htree.h +++ b/src/w3d/renderer/htree.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "matrix3d.h" #include "pivot.h" #include "w3dmpo.h" diff --git a/src/w3d/renderer/htreemgr.cpp b/src/w3d/renderer/htreemgr.cpp index 99dc9d3e4..e8229df2d 100644 --- a/src/w3d/renderer/htreemgr.cpp +++ b/src/w3d/renderer/htreemgr.cpp @@ -12,7 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ - +#include "always.h" #include "htreemgr.h" #include "chunkio.h" #include "w3dexclusionlist.h" diff --git a/src/w3d/renderer/htreemgr.h b/src/w3d/renderer/htreemgr.h index 04f6baf0e..48cfaaecd 100644 --- a/src/w3d/renderer/htreemgr.h +++ b/src/w3d/renderer/htreemgr.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "hashtemplate.h" #include "htree.h" #include "wwstring.h" diff --git a/src/w3d/renderer/intersec.cpp b/src/w3d/renderer/intersec.cpp index ced7a18e3..8c59e6a04 100644 --- a/src/w3d/renderer/intersec.cpp +++ b/src/w3d/renderer/intersec.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "intersec.h" Vector3 IntersectionClass::s_rayLocation(0, 0, 0); diff --git a/src/w3d/renderer/intersec.h b/src/w3d/renderer/intersec.h index b09a3ecd7..812a16ecd 100644 --- a/src/w3d/renderer/intersec.h +++ b/src/w3d/renderer/intersec.h @@ -14,11 +14,11 @@ */ #pragma once -#include "always.h" #include "coltype.h" #include "matrix3d.h" #include "sphere.h" #include "vector3.h" + class RenderObjClass; typedef unsigned short POLYGONINDEX; diff --git a/src/w3d/renderer/inttest.h b/src/w3d/renderer/inttest.h index 37f4dfcc1..c7dde75f0 100644 --- a/src/w3d/renderer/inttest.h +++ b/src/w3d/renderer/inttest.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "aabox.h" #include "colmath.h" #include "coltype.h" diff --git a/src/w3d/renderer/light.cpp b/src/w3d/renderer/light.cpp index e52015785..368f575a8 100644 --- a/src/w3d/renderer/light.cpp +++ b/src/w3d/renderer/light.cpp @@ -1,3 +1,18 @@ +/** + * @file + * + * @author tomsons26 + * + * @brief + * + * @copyright Thyme is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version + * 2 of the License, or (at your option) any later version. + * A full copy of the GNU General Public License can be found in + * LICENSE + */ +#include "always.h" #include "light.h" #include "scene.h" #include diff --git a/src/w3d/renderer/light.h b/src/w3d/renderer/light.h index b12ce8854..befa08a04 100644 --- a/src/w3d/renderer/light.h +++ b/src/w3d/renderer/light.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rendobj.h" #include "w3derr.h" diff --git a/src/w3d/renderer/lightenv.cpp b/src/w3d/renderer/lightenv.cpp index 00a9bc7fe..49c9a2cd8 100644 --- a/src/w3d/renderer/lightenv.cpp +++ b/src/w3d/renderer/lightenv.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "lightenv.h" #include "colorspace.h" #include "light.h" diff --git a/src/w3d/renderer/line3d.cpp b/src/w3d/renderer/line3d.cpp index 42ba3b38e..991f33087 100644 --- a/src/w3d/renderer/line3d.cpp +++ b/src/w3d/renderer/line3d.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "line3d.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/w3d/renderer/line3d.h b/src/w3d/renderer/line3d.h index 545ff80c4..3059143b9 100644 --- a/src/w3d/renderer/line3d.h +++ b/src/w3d/renderer/line3d.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "rendobj.h" #include "shader.h" #include "w3dmpo.h" diff --git a/src/w3d/renderer/linegrp.cpp b/src/w3d/renderer/linegrp.cpp index b9ad64d05..a5aaa8b78 100644 --- a/src/w3d/renderer/linegrp.cpp +++ b/src/w3d/renderer/linegrp.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "linegrp.h" #include "camera.h" diff --git a/src/w3d/renderer/linegrp.h b/src/w3d/renderer/linegrp.h index 76d613b04..d21e09a68 100644 --- a/src/w3d/renderer/linegrp.h +++ b/src/w3d/renderer/linegrp.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "shader.h" #include "sharebuf.h" #include "vector3.h" diff --git a/src/w3d/renderer/loaders.cpp b/src/w3d/renderer/loaders.cpp index a73c7fbd8..bb0944547 100644 --- a/src/w3d/renderer/loaders.cpp +++ b/src/w3d/renderer/loaders.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "loaders.h" #include diff --git a/src/w3d/renderer/loaders.h b/src/w3d/renderer/loaders.h index 82e5dacc9..236f0fe8b 100644 --- a/src/w3d/renderer/loaders.h +++ b/src/w3d/renderer/loaders.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "proto.h" #include "w3d_file.h" diff --git a/src/w3d/renderer/mapper.cpp b/src/w3d/renderer/mapper.cpp index dfe1a3efc..d474217a1 100644 --- a/src/w3d/renderer/mapper.cpp +++ b/src/w3d/renderer/mapper.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mapper.h" #include "dx8wrapper.h" #include "gamemath.h" diff --git a/src/w3d/renderer/mapper.h b/src/w3d/renderer/mapper.h index ca978b4de..86639f238 100644 --- a/src/w3d/renderer/mapper.h +++ b/src/w3d/renderer/mapper.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "refcount.h" #include "vector2.h" #include "vector3.h" diff --git a/src/w3d/renderer/matinfo.cpp b/src/w3d/renderer/matinfo.cpp index 5f3bcd53c..729c34145 100644 --- a/src/w3d/renderer/matinfo.cpp +++ b/src/w3d/renderer/matinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "matinfo.h" #include "meshmatdesc.h" #include "meshmdl.h" diff --git a/src/w3d/renderer/matinfo.h b/src/w3d/renderer/matinfo.h index 44102ca5b..6fb4fb3ef 100644 --- a/src/w3d/renderer/matinfo.h +++ b/src/w3d/renderer/matinfo.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "shader.h" #include "texture.h" #include "vector.h" diff --git a/src/w3d/renderer/matpass.cpp b/src/w3d/renderer/matpass.cpp index 2d5dd3283..8a9642ea3 100644 --- a/src/w3d/renderer/matpass.cpp +++ b/src/w3d/renderer/matpass.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "matpass.h" #include "dx8wrapper.h" #include "texture.h" diff --git a/src/w3d/renderer/matrixmapper.cpp b/src/w3d/renderer/matrixmapper.cpp index 08143b182..d936371ea 100644 --- a/src/w3d/renderer/matrixmapper.cpp +++ b/src/w3d/renderer/matrixmapper.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "matrixmapper.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/matrixmapper.h b/src/w3d/renderer/matrixmapper.h index a7205fa27..ea6d4aab1 100644 --- a/src/w3d/renderer/matrixmapper.h +++ b/src/w3d/renderer/matrixmapper.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "mapper.h" #include "matrix4.h" diff --git a/src/w3d/renderer/mesh.cpp b/src/w3d/renderer/mesh.cpp index fc868a194..3fd8b593b 100644 --- a/src/w3d/renderer/mesh.cpp +++ b/src/w3d/renderer/mesh.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "mesh.h" #include "aabtree.h" #include "aaplane.h" diff --git a/src/w3d/renderer/mesh.h b/src/w3d/renderer/mesh.h index 190ef1c42..61eb1acf7 100644 --- a/src/w3d/renderer/mesh.h +++ b/src/w3d/renderer/mesh.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "dx8polygonrenderer.h" #include "lightenv.h" #include "proto.h" diff --git a/src/w3d/renderer/meshgeometry.cpp b/src/w3d/renderer/meshgeometry.cpp index e9b41f290..3e609c28c 100644 --- a/src/w3d/renderer/meshgeometry.cpp +++ b/src/w3d/renderer/meshgeometry.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "meshgeometry.h" #include "aabox.h" #include "aabtree.h" diff --git a/src/w3d/renderer/meshgeometry.h b/src/w3d/renderer/meshgeometry.h index ba24a6f8a..ac6cb705f 100644 --- a/src/w3d/renderer/meshgeometry.h +++ b/src/w3d/renderer/meshgeometry.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "coltest.h" #include "inttest.h" #include "multilist.h" diff --git a/src/w3d/renderer/meshmatdesc.cpp b/src/w3d/renderer/meshmatdesc.cpp index 29ee24c89..5e24d2688 100644 --- a/src/w3d/renderer/meshmatdesc.cpp +++ b/src/w3d/renderer/meshmatdesc.cpp @@ -14,6 +14,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "meshmatdesc.h" #include "dx8caps.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/meshmatdesc.h b/src/w3d/renderer/meshmatdesc.h index 6cbb9d42a..0ebf6b83f 100644 --- a/src/w3d/renderer/meshmatdesc.h +++ b/src/w3d/renderer/meshmatdesc.h @@ -14,7 +14,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "shader.h" #include "sharebuf.h" #include "vector2.h" diff --git a/src/w3d/renderer/meshmdl.cpp b/src/w3d/renderer/meshmdl.cpp index cc55c0940..d542081b3 100644 --- a/src/w3d/renderer/meshmdl.cpp +++ b/src/w3d/renderer/meshmdl.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "meshmdl.h" #include "aabtree.h" #include "assetmgr.h" diff --git a/src/w3d/renderer/meshmdl.h b/src/w3d/renderer/meshmdl.h index 355e36bf5..a06adc7f3 100644 --- a/src/w3d/renderer/meshmdl.h +++ b/src/w3d/renderer/meshmdl.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "bittype.h" #include "colmath.h" #include "meshgeometry.h" diff --git a/src/w3d/renderer/missingtexture.cpp b/src/w3d/renderer/missingtexture.cpp index 4a9464236..324b19b3f 100644 --- a/src/w3d/renderer/missingtexture.cpp +++ b/src/w3d/renderer/missingtexture.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "missingtexture.h" #include "dx8wrapper.h" #include "w3dformat.h" diff --git a/src/w3d/renderer/missingtexture.h b/src/w3d/renderer/missingtexture.h index 7cfd8f057..c7cb91184 100644 --- a/src/w3d/renderer/missingtexture.h +++ b/src/w3d/renderer/missingtexture.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "hash.h" #include "w3dtypes.h" #include "wwstring.h" diff --git a/src/w3d/renderer/motchan.cpp b/src/w3d/renderer/motchan.cpp index dfe7a21cf..0d0491917 100644 --- a/src/w3d/renderer/motchan.cpp +++ b/src/w3d/renderer/motchan.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "motchan.h" #include "gamemath.h" #include diff --git a/src/w3d/renderer/motchan.h b/src/w3d/renderer/motchan.h index 7a507be4a..f73df34be 100644 --- a/src/w3d/renderer/motchan.h +++ b/src/w3d/renderer/motchan.h @@ -13,10 +13,11 @@ * LICENSE */ #pragma once -#include "always.h" + #include "quat.h" #include "w3d_file.h" #include "w3dmpo.h" + class ChunkLoadClass; class MotionChannelClass : public W3DMPO diff --git a/src/w3d/renderer/nullrobj.cpp b/src/w3d/renderer/nullrobj.cpp index e1316660b..f3cade878 100644 --- a/src/w3d/renderer/nullrobj.cpp +++ b/src/w3d/renderer/nullrobj.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "nullrobj.h" #include diff --git a/src/w3d/renderer/nullrobj.h b/src/w3d/renderer/nullrobj.h index c13add5f1..1bfa7c42c 100644 --- a/src/w3d/renderer/nullrobj.h +++ b/src/w3d/renderer/nullrobj.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "proto.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/src/w3d/renderer/part_buf.cpp b/src/w3d/renderer/part_buf.cpp index 6038c869b..d502a43db 100644 --- a/src/w3d/renderer/part_buf.cpp +++ b/src/w3d/renderer/part_buf.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "part_buf.h" #include "camera.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/part_emt.cpp b/src/w3d/renderer/part_emt.cpp index de3159ee0..0b813eff0 100644 --- a/src/w3d/renderer/part_emt.cpp +++ b/src/w3d/renderer/part_emt.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "part_emt.h" #include "assetmgr.h" #include "part_ldr.h" diff --git a/src/w3d/renderer/part_ldr.cpp b/src/w3d/renderer/part_ldr.cpp index 2014d06ba..73a92aa1a 100644 --- a/src/w3d/renderer/part_ldr.cpp +++ b/src/w3d/renderer/part_ldr.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "part_ldr.h" #include "assetmgr.h" #include "chunkio.h" diff --git a/src/w3d/renderer/pivot.cpp b/src/w3d/renderer/pivot.cpp index 5be12ceb2..344fcd576 100644 --- a/src/w3d/renderer/pivot.cpp +++ b/src/w3d/renderer/pivot.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "pivot.h" PivotClass::PivotClass() : diff --git a/src/w3d/renderer/pivot.h b/src/w3d/renderer/pivot.h index 3f284d61b..9cfe3365e 100644 --- a/src/w3d/renderer/pivot.h +++ b/src/w3d/renderer/pivot.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "matrix3d.h" struct PivotClass diff --git a/src/w3d/renderer/pointgr.cpp b/src/w3d/renderer/pointgr.cpp index 821b0f1c5..83bafe511 100644 --- a/src/w3d/renderer/pointgr.cpp +++ b/src/w3d/renderer/pointgr.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "pointgr.h" #include "aabox.h" #include "camera.h" diff --git a/src/w3d/renderer/pointgr.h b/src/w3d/renderer/pointgr.h index 8ab54cd7c..0a6cc91cd 100644 --- a/src/w3d/renderer/pointgr.h +++ b/src/w3d/renderer/pointgr.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "shader.h" #include "sharebuf.h" #include "vector.h" diff --git a/src/w3d/renderer/pot.cpp b/src/w3d/renderer/pot.cpp index 6db1270e1..612e0fb0d 100644 --- a/src/w3d/renderer/pot.cpp +++ b/src/w3d/renderer/pot.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "pot.h" int Find_POT(int i) diff --git a/src/w3d/renderer/pot.h b/src/w3d/renderer/pot.h index 39766c8de..57e64b5ce 100644 --- a/src/w3d/renderer/pot.h +++ b/src/w3d/renderer/pot.h @@ -13,6 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" + int Find_POT(int i); unsigned Find_POT_Log2(unsigned i); diff --git a/src/w3d/renderer/projector.cpp b/src/w3d/renderer/projector.cpp index f5fc8f130..b72242e79 100644 --- a/src/w3d/renderer/projector.cpp +++ b/src/w3d/renderer/projector.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "projector.h" #include "matrixmapper.h" diff --git a/src/w3d/renderer/projector.h b/src/w3d/renderer/projector.h index 0e0bf58c9..9169c9662 100644 --- a/src/w3d/renderer/projector.h +++ b/src/w3d/renderer/projector.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "aabox.h" #include "matrix3d.h" #include "matrix4.h" diff --git a/src/w3d/renderer/rddesc.h b/src/w3d/renderer/rddesc.h index 29a5fd6c6..e4b8dd7b4 100644 --- a/src/w3d/renderer/rddesc.h +++ b/src/w3d/renderer/rddesc.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "vector.h" #include "w3dtypes.h" #include "wwstring.h" diff --git a/src/w3d/renderer/render2d.cpp b/src/w3d/renderer/render2d.cpp index fb71c76b2..d2082e001 100644 --- a/src/w3d/renderer/render2d.cpp +++ b/src/w3d/renderer/render2d.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "render2d.h" #include "assetmgr.h" #include "dx8indexbuffer.h" diff --git a/src/w3d/renderer/render2d.h b/src/w3d/renderer/render2d.h index 6aafa514f..509db261d 100644 --- a/src/w3d/renderer/render2d.h +++ b/src/w3d/renderer/render2d.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "rect.h" #include "shader.h" #include "vector.h" diff --git a/src/w3d/renderer/render2dsentence.cpp b/src/w3d/renderer/render2dsentence.cpp index a1fd686cb..539a01351 100644 --- a/src/w3d/renderer/render2dsentence.cpp +++ b/src/w3d/renderer/render2dsentence.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "render2dsentence.h" #include "dx8wrapper.h" #include "render2d.h" diff --git a/src/w3d/renderer/render2dsentence.h b/src/w3d/renderer/render2dsentence.h index 4524635f6..ff328eaf7 100644 --- a/src/w3d/renderer/render2dsentence.h +++ b/src/w3d/renderer/render2dsentence.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "rect.h" #include "refcount.h" #include "shader.h" diff --git a/src/w3d/renderer/rendobj.cpp b/src/w3d/renderer/rendobj.cpp index 394251306..cb37624c4 100644 --- a/src/w3d/renderer/rendobj.cpp +++ b/src/w3d/renderer/rendobj.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rendobj.h" #include "camera.h" #include "coltest.h" diff --git a/src/w3d/renderer/rendobj.h b/src/w3d/renderer/rendobj.h index cbe0001aa..e93a1db4d 100644 --- a/src/w3d/renderer/rendobj.h +++ b/src/w3d/renderer/rendobj.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "aabox.h" #include "coltype.h" #include "multilist.h" diff --git a/src/w3d/renderer/rinfo.cpp b/src/w3d/renderer/rinfo.cpp index eb4b4da2f..dc0d08582 100644 --- a/src/w3d/renderer/rinfo.cpp +++ b/src/w3d/renderer/rinfo.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "rinfo.h" #include "matpass.h" #include diff --git a/src/w3d/renderer/rinfo.h b/src/w3d/renderer/rinfo.h index 4d38b413c..6ea6fb2c6 100644 --- a/src/w3d/renderer/rinfo.h +++ b/src/w3d/renderer/rinfo.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" class CameraClass; class MaterialPassClass; diff --git a/src/w3d/renderer/scene.cpp b/src/w3d/renderer/scene.cpp index eb63d95f7..2c440b7cd 100644 --- a/src/w3d/renderer/scene.cpp +++ b/src/w3d/renderer/scene.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "scene.h" #include "camera.h" #include "chunkio.h" diff --git a/src/w3d/renderer/scene.h b/src/w3d/renderer/scene.h index 475ed5dfe..9bd8f1eb5 100644 --- a/src/w3d/renderer/scene.h +++ b/src/w3d/renderer/scene.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "refcount.h" #include "rendobj.h" #include "vector3.h" diff --git a/src/w3d/renderer/segline.cpp b/src/w3d/renderer/segline.cpp index 5ea6bd8ca..302c99862 100644 --- a/src/w3d/renderer/segline.cpp +++ b/src/w3d/renderer/segline.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "segline.h" #include "coltest.h" diff --git a/src/w3d/renderer/segline.h b/src/w3d/renderer/segline.h index 98323fd45..8d9e22b37 100644 --- a/src/w3d/renderer/segline.h +++ b/src/w3d/renderer/segline.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "rendobj.h" #include "seglinerenderer.h" #include "shader.h" diff --git a/src/w3d/renderer/seglinerenderer.cpp b/src/w3d/renderer/seglinerenderer.cpp index ec09c7fc1..c045d8836 100644 --- a/src/w3d/renderer/seglinerenderer.cpp +++ b/src/w3d/renderer/seglinerenderer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "seglinerenderer.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/w3d/renderer/seglinerenderer.h b/src/w3d/renderer/seglinerenderer.h index 3c5043896..9cbc790a1 100644 --- a/src/w3d/renderer/seglinerenderer.h +++ b/src/w3d/renderer/seglinerenderer.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "matrix3d.h" #include "shader.h" #include "texture.h" diff --git a/src/w3d/renderer/shader.cpp b/src/w3d/renderer/shader.cpp index 3be0616cf..6660e6b16 100644 --- a/src/w3d/renderer/shader.cpp +++ b/src/w3d/renderer/shader.cpp @@ -14,6 +14,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "shader.h" #include "dx8wrapper.h" #include "w3d.h" diff --git a/src/w3d/renderer/shader.h b/src/w3d/renderer/shader.h index 418e41aff..796a95aed 100644 --- a/src/w3d/renderer/shader.h +++ b/src/w3d/renderer/shader.h @@ -16,8 +16,6 @@ */ #pragma once -#include "always.h" - class StringClass; struct W3dMaterial3Struct; diff --git a/src/w3d/renderer/sortingrenderer.cpp b/src/w3d/renderer/sortingrenderer.cpp index 2953e665b..5b68ab4eb 100644 --- a/src/w3d/renderer/sortingrenderer.cpp +++ b/src/w3d/renderer/sortingrenderer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "sortingrenderer.h" #include "dllist.h" #include "dx8indexbuffer.h" diff --git a/src/w3d/renderer/sortingrenderer.h b/src/w3d/renderer/sortingrenderer.h index fde9c7f63..585f45d0b 100644 --- a/src/w3d/renderer/sortingrenderer.h +++ b/src/w3d/renderer/sortingrenderer.h @@ -13,8 +13,9 @@ * LICENSE */ #pragma once -#include "always.h" + #include "w3dtypes.h" + struct SortingNodeStruct; class SphereClass; diff --git a/src/w3d/renderer/streak.cpp b/src/w3d/renderer/streak.cpp index 7c34fd5ae..da5d28cbd 100644 --- a/src/w3d/renderer/streak.cpp +++ b/src/w3d/renderer/streak.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "streak.h" #include "coltest.h" #include "w3d.h" diff --git a/src/w3d/renderer/streak.h b/src/w3d/renderer/streak.h index 38a83d881..5ecdc12a1 100644 --- a/src/w3d/renderer/streak.h +++ b/src/w3d/renderer/streak.h @@ -14,7 +14,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "rendobj.h" #include "seglinerenderer.h" #include "simplevec.h" diff --git a/src/w3d/renderer/streakrender.cpp b/src/w3d/renderer/streakrender.cpp index e9b4c8931..23b67a2bd 100644 --- a/src/w3d/renderer/streakrender.cpp +++ b/src/w3d/renderer/streakrender.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "streakrender.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" diff --git a/src/w3d/renderer/streakrender.h b/src/w3d/renderer/streakrender.h index 5ba9de5df..762c37b14 100644 --- a/src/w3d/renderer/streakrender.h +++ b/src/w3d/renderer/streakrender.h @@ -14,7 +14,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "matrix3d.h" #include "shader.h" #include "sphere.h" diff --git a/src/w3d/renderer/surfaceclass.cpp b/src/w3d/renderer/surfaceclass.cpp index 22fd45991..d3d5cbdcc 100644 --- a/src/w3d/renderer/surfaceclass.cpp +++ b/src/w3d/renderer/surfaceclass.cpp @@ -14,6 +14,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "surfaceclass.h" #include "dx8wrapper.h" #include "vector2i.h" diff --git a/src/w3d/renderer/surfaceclass.h b/src/w3d/renderer/surfaceclass.h index f6c9f2b97..2d6e0b489 100644 --- a/src/w3d/renderer/surfaceclass.h +++ b/src/w3d/renderer/surfaceclass.h @@ -16,7 +16,6 @@ */ #pragma once -#include "always.h" #include "refcount.h" #include "w3dformat.h" #include "w3dmpo.h" diff --git a/src/w3d/renderer/synctextureloadtasklist.cpp b/src/w3d/renderer/synctextureloadtasklist.cpp index a47c7b30e..2599d0d44 100644 --- a/src/w3d/renderer/synctextureloadtasklist.cpp +++ b/src/w3d/renderer/synctextureloadtasklist.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "synctextureloadtasklist.h" #ifndef GAME_DLL diff --git a/src/w3d/renderer/synctextureloadtasklist.h b/src/w3d/renderer/synctextureloadtasklist.h index f6bf0c95e..7fd4c1ab4 100644 --- a/src/w3d/renderer/synctextureloadtasklist.h +++ b/src/w3d/renderer/synctextureloadtasklist.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "critsection.h" #include "textureloadtasklist.h" diff --git a/src/w3d/renderer/texproject.cpp b/src/w3d/renderer/texproject.cpp index bc7e26977..ce878647c 100644 --- a/src/w3d/renderer/texproject.cpp +++ b/src/w3d/renderer/texproject.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "texproject.h" #include "assetmgr.h" #include "bwrender.h" diff --git a/src/w3d/renderer/texproject.h b/src/w3d/renderer/texproject.h index 808e20c8b..ae8be28d1 100644 --- a/src/w3d/renderer/texproject.h +++ b/src/w3d/renderer/texproject.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "cullsys.h" #include "matpass.h" #include "matrix3d.h" diff --git a/src/w3d/renderer/texture.cpp b/src/w3d/renderer/texture.cpp index dfa2b3b56..6f1ed271f 100644 --- a/src/w3d/renderer/texture.cpp +++ b/src/w3d/renderer/texture.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "texture.h" #include "dx8texman.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/texture.h b/src/w3d/renderer/texture.h index 1664bec19..002c1b3af 100644 --- a/src/w3d/renderer/texture.h +++ b/src/w3d/renderer/texture.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "surfaceclass.h" #include "texturebase.h" #include "w3dformat.h" diff --git a/src/w3d/renderer/texturebase.cpp b/src/w3d/renderer/texturebase.cpp index 6b12cd4ad..b4ec24bc6 100644 --- a/src/w3d/renderer/texturebase.cpp +++ b/src/w3d/renderer/texturebase.cpp @@ -14,6 +14,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "texturebase.h" #include "assetmgr.h" #include "dx8texman.h" diff --git a/src/w3d/renderer/texturebase.h b/src/w3d/renderer/texturebase.h index a30449f54..07e560b1a 100644 --- a/src/w3d/renderer/texturebase.h +++ b/src/w3d/renderer/texturebase.h @@ -16,7 +16,6 @@ */ #pragma once -#include "always.h" #include "refcount.h" #include "vector3.h" #include "w3dtypes.h" diff --git a/src/w3d/renderer/textureloader.cpp b/src/w3d/renderer/textureloader.cpp index 3e199981f..53dc39ffd 100644 --- a/src/w3d/renderer/textureloader.cpp +++ b/src/w3d/renderer/textureloader.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "textureloader.h" #include "bitmaphandler.h" #include "critsection.h" diff --git a/src/w3d/renderer/textureloader.h b/src/w3d/renderer/textureloader.h index 775009f1d..dd44a487f 100644 --- a/src/w3d/renderer/textureloader.h +++ b/src/w3d/renderer/textureloader.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "thread.h" #include "w3dformat.h" #include "w3dtypes.h" diff --git a/src/w3d/renderer/textureloadtask.cpp b/src/w3d/renderer/textureloadtask.cpp index 16e0ca41f..3f561434b 100644 --- a/src/w3d/renderer/textureloadtask.cpp +++ b/src/w3d/renderer/textureloadtask.cpp @@ -14,6 +14,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "textureloadtask.h" #include "bitmaphandler.h" #include "ddsfile.h" diff --git a/src/w3d/renderer/textureloadtask.h b/src/w3d/renderer/textureloadtask.h index 77709663a..5fcb3e250 100644 --- a/src/w3d/renderer/textureloadtask.h +++ b/src/w3d/renderer/textureloadtask.h @@ -16,7 +16,6 @@ */ #pragma once -#include "always.h" #include "texturebase.h" #include "vector3.h" #include "w3dformat.h" diff --git a/src/w3d/renderer/textureloadtasklist.cpp b/src/w3d/renderer/textureloadtasklist.cpp index 45a27c89b..690d20c16 100644 --- a/src/w3d/renderer/textureloadtasklist.cpp +++ b/src/w3d/renderer/textureloadtasklist.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "textureloadtasklist.h" #include "textureloadtask.h" diff --git a/src/w3d/renderer/textureloadtasklist.h b/src/w3d/renderer/textureloadtasklist.h index 35ca8ea1a..d302f2522 100644 --- a/src/w3d/renderer/textureloadtasklist.h +++ b/src/w3d/renderer/textureloadtasklist.h @@ -15,8 +15,6 @@ */ #pragma once -#include "always.h" - class TextureLoadTaskClass; struct TextureLoadTaskListNode; diff --git a/src/w3d/renderer/thumbnail.cpp b/src/w3d/renderer/thumbnail.cpp index 66020aa81..b55d69af5 100644 --- a/src/w3d/renderer/thumbnail.cpp +++ b/src/w3d/renderer/thumbnail.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "thumbnail.h" #include "bitmaphandler.h" #include "ddsfile.h" diff --git a/src/w3d/renderer/thumbnail.h b/src/w3d/renderer/thumbnail.h index a2f07efdd..1dbe9fb55 100644 --- a/src/w3d/renderer/thumbnail.h +++ b/src/w3d/renderer/thumbnail.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "w3dformat.h" #include "wwstring.h" #include diff --git a/src/w3d/renderer/thumbnailmanager.cpp b/src/w3d/renderer/thumbnailmanager.cpp index ec9d9cbd2..d1836aabd 100644 --- a/src/w3d/renderer/thumbnailmanager.cpp +++ b/src/w3d/renderer/thumbnailmanager.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "thumbnailmanager.h" #include "thumbnail.h" diff --git a/src/w3d/renderer/thumbnailmanager.h b/src/w3d/renderer/thumbnailmanager.h index c91034b88..95c5fdf6c 100644 --- a/src/w3d/renderer/thumbnailmanager.h +++ b/src/w3d/renderer/thumbnailmanager.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "dllist.h" #include "hashtemplate.h" #include "wwstring.h" diff --git a/src/w3d/renderer/vertmaterial.cpp b/src/w3d/renderer/vertmaterial.cpp index a386cfed6..d66885958 100644 --- a/src/w3d/renderer/vertmaterial.cpp +++ b/src/w3d/renderer/vertmaterial.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "vertmaterial.h" #include "chunkio.h" #include "dx8wrapper.h" diff --git a/src/w3d/renderer/vertmaterial.h b/src/w3d/renderer/vertmaterial.h index 9cf9f9184..f337ad780 100644 --- a/src/w3d/renderer/vertmaterial.h +++ b/src/w3d/renderer/vertmaterial.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "mapper.h" #include "refcount.h" #include "vector3.h" diff --git a/src/w3d/renderer/w3d.cpp b/src/w3d/renderer/w3d.cpp index d4ac34d49..6be05add3 100644 --- a/src/w3d/renderer/w3d.cpp +++ b/src/w3d/renderer/w3d.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3d.h" #include "assetmgr.h" #include "boxrobj.h" diff --git a/src/w3d/renderer/w3d.h b/src/w3d/renderer/w3d.h index f2c7d6513..0986039dc 100644 --- a/src/w3d/renderer/w3d.h +++ b/src/w3d/renderer/w3d.h @@ -15,7 +15,6 @@ */ #pragma once -#include "always.h" #include "texture.h" #include "vector3.h" #include "w3derr.h" diff --git a/src/w3d/renderer/w3d_file.h b/src/w3d/renderer/w3d_file.h index 6c353ee1e..9e295cfd9 100644 --- a/src/w3d/renderer/w3d_file.h +++ b/src/w3d/renderer/w3d_file.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "chunkio.h" // clang-format off diff --git a/src/w3d/renderer/w3d_util.cpp b/src/w3d/renderer/w3d_util.cpp index 222fb22d1..1ad6585d7 100644 --- a/src/w3d/renderer/w3d_util.cpp +++ b/src/w3d/renderer/w3d_util.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3d_util.h" #include "shader.h" #include "vector3.h" diff --git a/src/w3d/renderer/w3d_util.h b/src/w3d/renderer/w3d_util.h index 88014171a..b31c6f82b 100644 --- a/src/w3d/renderer/w3d_util.h +++ b/src/w3d/renderer/w3d_util.h @@ -13,7 +13,6 @@ * LICENSE */ #pragma once -#include "always.h" struct IOVector3Struct; class ShaderClass; diff --git a/src/w3d/renderer/w3dexclusionlist.cpp b/src/w3d/renderer/w3dexclusionlist.cpp index b53e1734b..1c373fbbb 100644 --- a/src/w3d/renderer/w3dexclusionlist.cpp +++ b/src/w3d/renderer/w3dexclusionlist.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dexclusionlist.h" #include "hanim.h" #include "htree.h" diff --git a/src/w3d/renderer/w3dexclusionlist.h b/src/w3d/renderer/w3dexclusionlist.h index 9b27ea04b..245694c6b 100644 --- a/src/w3d/renderer/w3dexclusionlist.h +++ b/src/w3d/renderer/w3dexclusionlist.h @@ -13,7 +13,7 @@ * LICENSE */ #pragma once -#include "always.h" + #include "hashtemplate.h" #include "vector.h" #include "wwstring.h" diff --git a/src/w3d/renderer/w3dformat.cpp b/src/w3d/renderer/w3dformat.cpp index ef5665ec7..304d4b0a5 100644 --- a/src/w3d/renderer/w3dformat.cpp +++ b/src/w3d/renderer/w3dformat.cpp @@ -13,6 +13,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include "always.h" #include "w3dformat.h" #include "dx8wrapper.h" #include "rtsutilsw3d.h" diff --git a/src/w3d/renderer/w3dformat.h b/src/w3d/renderer/w3dformat.h index 5e186912f..600ebbadd 100644 --- a/src/w3d/renderer/w3dformat.h +++ b/src/w3d/renderer/w3dformat.h @@ -15,8 +15,6 @@ */ #pragma once -#include "always.h" - class StringClass; class TargaImage; diff --git a/src/w3d/renderer/w3dtypes.h b/src/w3d/renderer/w3dtypes.h index 0b818e1e2..586006bf3 100644 --- a/src/w3d/renderer/w3dtypes.h +++ b/src/w3d/renderer/w3dtypes.h @@ -14,8 +14,6 @@ */ #pragma once -#include "always.h" - #ifdef BUILD_WITH_D3D8 #include #include diff --git a/tests/globals.cpp b/tests/globals.cpp index 9932d0862..9142da55c 100644 --- a/tests/globals.cpp +++ b/tests/globals.cpp @@ -1,4 +1,4 @@ -#include "always.h" +#include #ifdef PLATFORM_WINDOWS #include diff --git a/tests/main.cpp b/tests/main.cpp index f955522af..432c6af25 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/tests/test_audiofilecache.cpp b/tests/test_audiofilecache.cpp index aa0b00c3f..ddd2e7b6e 100644 --- a/tests/test_audiofilecache.cpp +++ b/tests/test_audiofilecache.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include #include diff --git a/tests/test_audiomanager.cpp b/tests/test_audiomanager.cpp index c20fc8f74..f903f44a4 100644 --- a/tests/test_audiomanager.cpp +++ b/tests/test_audiomanager.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include #include diff --git a/tests/test_compr.cpp b/tests/test_compr.cpp index 71c911314..3073e77b3 100644 --- a/tests/test_compr.cpp +++ b/tests/test_compr.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include #include diff --git a/tests/test_crc.cpp b/tests/test_crc.cpp index bb9d843a0..0b19bf07c 100644 --- a/tests/test_crc.cpp +++ b/tests/test_crc.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include diff --git a/tests/test_filesystem.cpp b/tests/test_filesystem.cpp index 957a06df8..200c4a88f 100644 --- a/tests/test_filesystem.cpp +++ b/tests/test_filesystem.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include #include diff --git a/tests/test_text.cpp b/tests/test_text.cpp index 6fc3f9259..6cb317a83 100644 --- a/tests/test_text.cpp +++ b/tests/test_text.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include diff --git a/tests/test_videoplayer.cpp b/tests/test_videoplayer.cpp index faec07252..c4da424bb 100644 --- a/tests/test_videoplayer.cpp +++ b/tests/test_videoplayer.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include #include diff --git a/tests/test_w3d_load.cpp b/tests/test_w3d_load.cpp index abc9ccaf4..374b959a3 100644 --- a/tests/test_w3d_load.cpp +++ b/tests/test_w3d_load.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include diff --git a/tests/test_w3d_math.cpp b/tests/test_w3d_math.cpp index 46ee0b10b..cc2fb8dc9 100644 --- a/tests/test_w3d_math.cpp +++ b/tests/test_w3d_math.cpp @@ -12,6 +12,7 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ +#include #include #include #include