diff --git a/src/C4Include.h b/src/C4Include.h index a727bdcb4..d4b01612c 100644 --- a/src/C4Include.h +++ b/src/C4Include.h @@ -64,16 +64,16 @@ constexpr bool SOLIDMASK_DEBUG = false; #include #include -#include "lib/Standard.h" #include "C4Prototypes.h" +#include "lib/C4Log.h" #include "lib/C4Real.h" +#include "lib/Standard.h" #include "lib/StdBuf.h" #include "platform/StdFile.h" -#include "c4group/C4Language.h" -#include "lib/C4Log.h" -#include "config/C4Reloc.h" -#include "config/C4Config.h" +#include "c4group/C4Language.h" +#include "config/C4Config.h" +#include "config/C4Reloc.h" #include "game/C4Game.h" #endif // INC_C4Include diff --git a/src/C4Prototypes.h b/src/C4Prototypes.h index 297efbe22..6b92df36a 100644 --- a/src/C4Prototypes.h +++ b/src/C4Prototypes.h @@ -158,6 +158,7 @@ class StdMeshMatManager; class StdMeshMatrix; class StdMeshSkeletonLoader; class StdMeshUpdate; +class StdStrBuf; namespace C4GameLobby { diff --git a/src/c4group/C4Extra.cpp b/src/c4group/C4Extra.cpp index 7114ae02e..90c5ecc83 100644 --- a/src/c4group/C4Extra.cpp +++ b/src/c4group/C4Extra.cpp @@ -18,10 +18,7 @@ #include "C4Include.h" #include "c4group/C4Extra.h" -#include "config/C4Config.h" #include "c4group/C4Components.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" C4Extra::C4Extra() = default; diff --git a/src/c4group/C4Group.h b/src/c4group/C4Group.h index d3daf8eb8..95c1681af 100644 --- a/src/c4group/C4Group.h +++ b/src/c4group/C4Group.h @@ -24,7 +24,6 @@ #include #endif #include "c4group/CStdFile.h" -#include "lib/StdBuf.h" // C4Group-Rewind-warning: // The current C4Group-implementation cannot handle random file access very well, diff --git a/src/c4group/C4GroupSet.cpp b/src/c4group/C4GroupSet.cpp index 8c81a3d91..1326e3661 100644 --- a/src/c4group/C4GroupSet.cpp +++ b/src/c4group/C4GroupSet.cpp @@ -21,8 +21,6 @@ #include "c4group/C4Components.h" #include "c4group/C4Group.h" -#include "lib/C4Log.h" -#include "c4group/C4Language.h" C4GroupSetNode::C4GroupSetNode(C4GroupSet &rParent, C4GroupSetNode *pPrev, C4Group &rGroup, bool fGrpOwned, int32_t id) { diff --git a/src/c4group/C4LangStringTable.cpp b/src/c4group/C4LangStringTable.cpp index fb9c2bec7..bb5169c88 100644 --- a/src/c4group/C4LangStringTable.cpp +++ b/src/c4group/C4LangStringTable.cpp @@ -16,11 +16,8 @@ // Loads StringTbl* and replaces $..$-strings by localized versions #include "C4Include.h" - -#include -#include - #include "c4group/C4LangStringTable.h" + #include "lib/C4InputValidation.h" C4LangStringTable::C4LangStringTable() : ref_count(1) {} diff --git a/src/c4group/C4LangStringTable.h b/src/c4group/C4LangStringTable.h index 89a64906e..85ea9ee13 100644 --- a/src/c4group/C4LangStringTable.h +++ b/src/c4group/C4LangStringTable.h @@ -20,10 +20,6 @@ #include "c4group/C4ComponentHost.h" -#include -#include -#include - class C4LangStringTable : public C4ComponentHost { // Contains the localization string->string mapping. Populated lazily from PopulateStringTable, thus mutable. diff --git a/src/c4group/C4Language.cpp b/src/c4group/C4Language.cpp index d4e5a5644..d5ad4bf6a 100644 --- a/src/c4group/C4Language.cpp +++ b/src/c4group/C4Language.cpp @@ -27,9 +27,6 @@ #include "game/C4Application.h" #include "c4group/C4Components.h" -#include "lib/C4Log.h" -#include "config/C4Config.h" -#include "game/C4Game.h" template static bool GetRelativePath(const char *strPath, const char *strRelativeTo, char(&strBuffer)[iBufferSize]) diff --git a/src/c4group/C4Update.cpp b/src/c4group/C4Update.cpp index d0666e56f..b9a2a6aca 100644 --- a/src/c4group/C4Update.cpp +++ b/src/c4group/C4Update.cpp @@ -15,10 +15,10 @@ */ #include "C4Include.h" #include "c4group/C4Update.h" + #include "C4Version.h" #include "c4group/C4Components.h" #include "c4group/C4Group.h" -#include "lib/C4Log.h" C4Config *GetCfg(); diff --git a/src/c4group/C4Update.h b/src/c4group/C4Update.h index 806eee5f9..99b288a8b 100644 --- a/src/c4group/C4Update.h +++ b/src/c4group/C4Update.h @@ -16,7 +16,6 @@ /* Update package support */ #ifndef INC_C4GroupEx - #define INC_C4GroupEx #include "lib/C4InputValidation.h" diff --git a/src/c4group/CStdFile.cpp b/src/c4group/CStdFile.cpp index 89d81d16b..f0c10b94f 100644 --- a/src/c4group/CStdFile.cpp +++ b/src/c4group/CStdFile.cpp @@ -18,20 +18,16 @@ /* A handy wrapper class to gzio files */ #include "C4Include.h" -#ifdef _WIN32 -# include "platform/C4windowswrapper.h" -#endif -#include "platform/StdFile.h" #include "c4group/CStdFile.h" +#ifdef _WIN32 +#include "platform/C4windowswrapper.h" +#endif #include "lib/SHA1.h" #include #include "zlib/gzio.h" -#include #include -#include -#include CStdFile::CStdFile() { diff --git a/src/c4group/CStdFile.h b/src/c4group/CStdFile.h index d24bc7f26..e2f99b08b 100644 --- a/src/c4group/CStdFile.h +++ b/src/c4group/CStdFile.h @@ -20,7 +20,6 @@ #ifndef INC_CSTDFILE #define INC_CSTDFILE -#include #include "platform/StdSync.h" // for StdThreadCheck #include // for gzFile diff --git a/src/c4group/gunzip4c4group.cpp b/src/c4group/gunzip4c4group.cpp index 144f0125b..15f9e6ec6 100644 --- a/src/c4group/gunzip4c4group.cpp +++ b/src/c4group/gunzip4c4group.cpp @@ -14,7 +14,6 @@ #include "C4Include.h" #include "c4group/CStdFile.h" -#include bool EraseItemSafe(const char *szFilename) { diff --git a/src/config/C4Config.cpp b/src/config/C4Config.cpp index c5552c3fc..3f6daab20 100644 --- a/src/config/C4Config.cpp +++ b/src/config/C4Config.cpp @@ -21,13 +21,9 @@ #include "config/C4Config.h" #include "C4Version.h" -#include "lib/C4Log.h" #include "c4group/C4Components.h" #include "network/C4Network2.h" -#include "c4group/C4Language.h" -#include -#include "platform/StdFile.h" #include "platform/C4Window.h" #include "platform/StdRegistry.h" diff --git a/src/config/C4Config.h b/src/config/C4Config.h index fb4ba7f7d..32141a030 100644 --- a/src/config/C4Config.h +++ b/src/config/C4Config.h @@ -23,7 +23,6 @@ #include "config/C4Constants.h" #include "lib/C4InputValidation.h" #include "control/C4PlayerControl.h" -#include #define C4DEFAULT_FONT_NAME "Endeavour" enum { CFG_MaxString = 1024, CFG_MaxEditorMRU = 8 }; diff --git a/src/config/C4Reloc.cpp b/src/config/C4Reloc.cpp index dd2fde34f..9e18a4c99 100644 --- a/src/config/C4Reloc.cpp +++ b/src/config/C4Reloc.cpp @@ -16,7 +16,6 @@ #include "C4Include.h" #include "config/C4Reloc.h" -#include "config/C4Config.h" #include "game/C4Application.h" C4Reloc Reloc; // singleton diff --git a/src/config/C4Reloc.h b/src/config/C4Reloc.h index 0ab716872..a1aef033d 100644 --- a/src/config/C4Reloc.h +++ b/src/config/C4Reloc.h @@ -16,8 +16,6 @@ #ifndef C4RELOC_H #define C4RELOC_H -#include - class C4Reloc { public: diff --git a/src/control/C4Control.cpp b/src/control/C4Control.cpp index 05545afb7..9d1ca1625 100644 --- a/src/control/C4Control.cpp +++ b/src/control/C4Control.cpp @@ -20,38 +20,34 @@ #include "C4Include.h" #include "control/C4Control.h" -#include "script/C4AulExec.h" -#include "object/C4Object.h" -#include "control/C4GameSave.h" -#include "gui/C4GameLobby.h" -#include "network/C4Network2Dialogs.h" -#include "lib/C4Random.h" -#include "editor/C4Console.h" -#include "lib/C4Log.h" -#include "game/C4GraphicsSystem.h" -#include "player/C4Player.h" -#include "player/C4RankSystem.h" -#include "control/C4RoundResults.h" -#include "landscape/C4PXS.h" -#include "landscape/C4MassMover.h" -#include "gui/C4GameMessage.h" -#include "landscape/C4Landscape.h" -#include "game/C4Game.h" -#include "game/C4GameScript.h" -#include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" #include "control/C4GameControl.h" -#include "gui/C4ScriptGuiWindow.h" +#include "control/C4GameSave.h" +#include "control/C4RoundResults.h" +#include "editor/C4Console.h" +#include "game/C4GameScript.h" +#include "game/C4GraphicsSystem.h" +#include "gui/C4GameLobby.h" +#include "gui/C4GameMessage.h" #include "gui/C4MessageInput.h" +#include "gui/C4ScriptGuiWindow.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4MassMover.h" +#include "landscape/C4PXS.h" +#include "lib/C4Random.h" +#include "network/C4Network2Dialogs.h" #include "object/C4Def.h" #include "object/C4DefList.h" +#include "object/C4GameObjects.h" +#include "object/C4Object.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" +#include "player/C4RankSystem.h" +#include "script/C4AulExec.h" #ifndef NOAULDEBUG #include "script/C4AulDebug.h" #endif -#include "script/C4AulExec.h" - // *** C4ControlPacket C4ControlPacket::C4ControlPacket() : iByClient(::Control.ClientID()) diff --git a/src/control/C4Control.h b/src/control/C4Control.h index 77cec36ad..811ad86c2 100644 --- a/src/control/C4Control.h +++ b/src/control/C4Control.h @@ -20,11 +20,11 @@ #ifndef INC_C4Control #define INC_C4Control -#include "object/C4Id.h" -#include "network/C4PacketBase.h" #include "control/C4PlayerInfo.h" -#include "network/C4Client.h" #include "gui/C4KeyboardInput.h" +#include "network/C4PacketBase.h" +#include "network/C4Client.h" +#include "object/C4Id.h" #include "object/C4ObjectList.h" // *** control base classes diff --git a/src/control/C4GameControl.cpp b/src/control/C4GameControl.cpp index 5c5e20f78..5fc92dd48 100644 --- a/src/control/C4GameControl.cpp +++ b/src/control/C4GameControl.cpp @@ -16,15 +16,13 @@ /* control management */ #include "C4Include.h" - -#include "game/C4Application.h" -#include "game/C4Game.h" #include "control/C4GameControl.h" -#include "gui/C4GameOverDlg.h" + #include "control/C4Record.h" -#include "lib/C4Log.h" -#include "network/C4Network2Stats.h" +#include "game/C4Application.h" +#include "gui/C4GameOverDlg.h" #include "gui/C4MouseControl.h" +#include "network/C4Network2Stats.h" #include "platform/C4GamePadCon.h" #include "player/C4PlayerList.h" #include "player/C4Player.h" diff --git a/src/control/C4GameParameters.cpp b/src/control/C4GameParameters.cpp index d0f2b3ed7..df93f8300 100644 --- a/src/control/C4GameParameters.cpp +++ b/src/control/C4GameParameters.cpp @@ -16,11 +16,9 @@ #include "C4Include.h" #include "control/C4GameParameters.h" -#include "lib/C4Log.h" #include "c4group/C4Components.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "game/C4Game.h" #include "game/C4Application.h" #include "network/C4Network2.h" diff --git a/src/control/C4GameParameters.h b/src/control/C4GameParameters.h index 73df4bb8e..d5ccec8e1 100644 --- a/src/control/C4GameParameters.h +++ b/src/control/C4GameParameters.h @@ -18,9 +18,9 @@ #ifndef C4GAMEPARAMETERS_H #define C4GAMEPARAMETERS_H -#include "object/C4IDList.h" #include "control/C4PlayerInfo.h" #include "control/C4Teams.h" +#include "object/C4IDList.h" #include "object/C4InfoCore.h" class C4GameRes diff --git a/src/control/C4GameSave.cpp b/src/control/C4GameSave.cpp index e188a4002..5d6cab8fd 100644 --- a/src/control/C4GameSave.cpp +++ b/src/control/C4GameSave.cpp @@ -18,19 +18,17 @@ #include "C4Include.h" #include "control/C4GameSave.h" -#include "c4group/C4Components.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" -#include "landscape/C4Landscape.h" -#include "landscape/C4PXS.h" -#include "landscape/C4MassMover.h" -#include "player/C4PlayerList.h" -#include "control/C4RoundResults.h" -#include "control/C4Record.h" #include "C4Version.h" +#include "c4group/C4Components.h" #include "control/C4GameParameters.h" -#include "script/C4Value.h" +#include "control/C4Record.h" +#include "control/C4RoundResults.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4MassMover.h" +#include "landscape/C4PXS.h" +#include "player/C4PlayerList.h" #include "network/C4Network2.h" +#include "script/C4Value.h" // *** C4GameSave main class diff --git a/src/control/C4PlayerControl.cpp b/src/control/C4PlayerControl.cpp index 97999a7b3..dc33ec03c 100644 --- a/src/control/C4PlayerControl.cpp +++ b/src/control/C4PlayerControl.cpp @@ -19,26 +19,21 @@ #include "C4ForbidLibraryCompilation.h" #include "control/C4PlayerControl.h" -#include "object/C4DefList.h" #include "c4group/C4LangStringTable.h" -#include "player/C4Player.h" -#include "player/C4PlayerList.h" #include "control/C4Control.h" -#include "game/C4Game.h" -#include "platform/C4GamePadCon.h" -#include "lib/C4Log.h" -#include "graphics/C4GraphicsResource.h" -#include "gui/C4MouseControl.h" +#include "control/C4Record.h" #include "game/C4GraphicsSystem.h" #include "game/C4Viewport.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" +#include "object/C4DefList.h" #include "object/C4Object.h" #include "object/C4ObjectMenu.h" +#include "platform/C4GamePadCon.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" #include "script/C4Aul.h" -#include - -#include "control/C4Record.h" - /* C4PlayerControlDef */ void C4PlayerControlDef::CompileFunc(StdCompiler *pComp) diff --git a/src/control/C4PlayerControl.h b/src/control/C4PlayerControl.h index 2d294edc9..b94e4b094 100644 --- a/src/control/C4PlayerControl.h +++ b/src/control/C4PlayerControl.h @@ -23,8 +23,6 @@ #include "object/C4Id.h" #include "platform/C4TimeMilliseconds.h" -#include - const float C4GFX_ZoomStep = 1.1040895f; // one control definition, e.g. "Left", "Throw", etc. diff --git a/src/control/C4PlayerInfo.cpp b/src/control/C4PlayerInfo.cpp index ea0e4cdb7..61f8f4fb2 100644 --- a/src/control/C4PlayerInfo.cpp +++ b/src/control/C4PlayerInfo.cpp @@ -20,14 +20,11 @@ #include "C4Include.h" #include "control/C4PlayerInfo.h" -#include "game/C4Game.h" -#include "config/C4Config.h" -#include "lib/C4Log.h" -#include "player/C4Player.h" -#include "game/C4FullScreen.h" -#include "player/C4PlayerList.h" -#include "control/C4GameControl.h" #include "c4group/C4Components.h" +#include "control/C4GameControl.h" +#include "game/C4FullScreen.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" // *** C4PlayerInfo diff --git a/src/control/C4PlayerInfo.h b/src/control/C4PlayerInfo.h index 4ce7e6fba..f485325ac 100644 --- a/src/control/C4PlayerInfo.h +++ b/src/control/C4PlayerInfo.h @@ -32,10 +32,10 @@ #ifndef INC_C4PlayerInfo #define INC_C4PlayerInfo -#include "network/C4PacketBase.h" -#include "network/C4Network2Res.h" #include "config/C4Constants.h" #include "lib/C4InputValidation.h" +#include "network/C4PacketBase.h" +#include "network/C4Network2Res.h" #include "object/C4Id.h" // information about one player at a client diff --git a/src/control/C4PlayerInfoConflicts.cpp b/src/control/C4PlayerInfoConflicts.cpp index 95597f3c3..746fa083f 100644 --- a/src/control/C4PlayerInfoConflicts.cpp +++ b/src/control/C4PlayerInfoConflicts.cpp @@ -19,7 +19,6 @@ #include "C4Include.h" #include "control/C4PlayerInfo.h" -#include "game/C4Game.h" #include "control/C4Teams.h" #include "lib/StdColors.h" #include "lib/C4Random.h" diff --git a/src/control/C4Record.cpp b/src/control/C4Record.cpp index 650ef7a04..60689869e 100644 --- a/src/control/C4Record.cpp +++ b/src/control/C4Record.cpp @@ -18,15 +18,11 @@ #include "C4Include.h" #include "control/C4Record.h" -#include "editor/C4Console.h" -#include "control/C4PlayerInfo.h" -#include "control/C4GameSave.h" -#include "lib/C4Log.h" -#include "player/C4Player.h" -#include "game/C4Game.h" #include "control/C4GameControl.h" - -#include "platform/StdFile.h" +#include "control/C4GameSave.h" +#include "control/C4PlayerInfo.h" +#include "editor/C4Console.h" +#include "player/C4Player.h" #define IMMEDIATEREC diff --git a/src/control/C4RoundResults.cpp b/src/control/C4RoundResults.cpp index 54842405e..068a2353e 100644 --- a/src/control/C4RoundResults.cpp +++ b/src/control/C4RoundResults.cpp @@ -18,13 +18,12 @@ #include "C4Include.h" #include "control/C4RoundResults.h" -#include "player/C4Player.h" -#include "game/C4Game.h" #include "object/C4Def.h" -#include "object/C4Object.h" -#include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" #include "object/C4DefList.h" +#include "object/C4GameObjects.h" +#include "object/C4Object.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" // *** C4RoundResultsPlayer diff --git a/src/control/C4RoundResults.h b/src/control/C4RoundResults.h index 7b5808cef..6a651e034 100644 --- a/src/control/C4RoundResults.h +++ b/src/control/C4RoundResults.h @@ -24,9 +24,9 @@ #define INC_C4RoundResults #include "c4group/C4Components.h" -#include "object/C4IDList.h" -#include "network/C4PacketBase.h" #include "graphics/C4FacetEx.h" +#include "network/C4PacketBase.h" +#include "object/C4IDList.h" // Contains additional data not present in C4PlayerInfo class C4RoundResultsPlayer diff --git a/src/control/C4Teams.cpp b/src/control/C4Teams.cpp index ad81ca7a9..d43dc8085 100644 --- a/src/control/C4Teams.cpp +++ b/src/control/C4Teams.cpp @@ -18,12 +18,11 @@ #include "C4Include.h" #include "control/C4Teams.h" -#include "game/C4Game.h" -#include "lib/C4Random.h" #include "c4group/C4Components.h" +#include "control/C4GameControl.h" +#include "lib/C4Random.h" #include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "control/C4GameControl.h" // --------------------------------------------------------------- // C4Team diff --git a/src/editor/C4Console.cpp b/src/editor/C4Console.cpp index 832b85f54..31b53738d 100644 --- a/src/editor/C4Console.cpp +++ b/src/editor/C4Console.cpp @@ -20,22 +20,19 @@ #include "C4Include.h" #include "editor/C4Console.h" -#include "game/C4Application.h" -#include "object/C4Def.h" -#include "control/C4GameSave.h" -#include "game/C4Game.h" -#include "gui/C4MessageInput.h" #include "C4Version.h" -#include "c4group/C4Language.h" -#include "player/C4Player.h" -#include "landscape/C4Landscape.h" +#include "control/C4GameControl.h" +#include "control/C4GameSave.h" +#include "game/C4Application.h" #include "game/C4GraphicsSystem.h" #include "game/C4Viewport.h" -#include "script/C4ScriptHost.h" +#include "gui/C4MessageInput.h" +#include "landscape/C4Landscape.h" +#include "object/C4Def.h" +#include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "control/C4GameControl.h" +#include "script/C4ScriptHost.h" -#include "platform/StdFile.h" #include "platform/StdRegistry.h" #define FILE_SELECT_FILTER_FOR_C4S "OpenClonk Scenario\0" \ diff --git a/src/editor/C4Console.h b/src/editor/C4Console.h index 75a995042..813aab584 100644 --- a/src/editor/C4Console.h +++ b/src/editor/C4Console.h @@ -21,9 +21,9 @@ #define INC_C4Console #include "editor/C4ConsoleGUI.h" -#include "editor/C4ToolsDlg.h" -#include "editor/C4ObjectListDlg.h" #include "editor/C4EditCursor.h" +#include "editor/C4ObjectListDlg.h" +#include "editor/C4ToolsDlg.h" #include "platform/C4Window.h" diff --git a/src/editor/C4ConsoleCocoa.mm b/src/editor/C4ConsoleCocoa.mm index 3f0ec4867..32bce4999 100644 --- a/src/editor/C4ConsoleCocoa.mm +++ b/src/editor/C4ConsoleCocoa.mm @@ -17,13 +17,11 @@ #include "C4Include.h" #include "editor/C4Console.h" -#include "game/C4Application.h" +#include "game/C4Application.h" #include "control/C4GameSave.h" -#include "game/C4Game.h" #include "gui/C4MessageInput.h" #include "C4Version.h" -#include "c4group/C4Language.h" #include "player/C4Player.h" #include "landscape/C4Landscape.h" #include "landscape/C4Sky.h" @@ -32,7 +30,6 @@ #include "control/C4GameControl.h" #include "landscape/C4Texture.h" -#include "platform/StdFile.h" #include "platform/StdRegistry.h" #import diff --git a/src/editor/C4ConsoleGUI.h b/src/editor/C4ConsoleGUI.h index 095259c33..bf6d2e770 100644 --- a/src/editor/C4ConsoleGUI.h +++ b/src/editor/C4ConsoleGUI.h @@ -17,10 +17,9 @@ #ifndef C4CONSOLEGUI_INC #define C4CONSOLEGUI_INC +#include "control/C4GameControl.h" #include "game/C4Application.h" #include "player/C4Player.h" -#include "control/C4GameControl.h" -#include "lib/StdBuf.h" namespace OpenFileFlags { diff --git a/src/editor/C4ConsoleQt.h b/src/editor/C4ConsoleQt.h index 64c974d29..dd297e4ef 100644 --- a/src/editor/C4ConsoleQt.h +++ b/src/editor/C4ConsoleQt.h @@ -34,7 +34,6 @@ #include #include #include -#include // TODO: If we remove the other editors, state and consolegui can be merged and the relevant header go into this file // For now, just use this to include Qt diff --git a/src/editor/C4EditCursor.cpp b/src/editor/C4EditCursor.cpp index afe162f6a..6fa1ba9f4 100644 --- a/src/editor/C4EditCursor.cpp +++ b/src/editor/C4EditCursor.cpp @@ -29,7 +29,6 @@ #include "landscape/C4Landscape.h" #include "landscape/C4Texture.h" #include "graphics/C4GraphicsResource.h" -#include "game/C4Game.h" #include "object/C4GameObjects.h" #include "control/C4GameControl.h" #include "script/C4AulExec.h" diff --git a/src/editor/C4EditCursor.h b/src/editor/C4EditCursor.h index 48a81b02c..56eb423d5 100644 --- a/src/editor/C4EditCursor.h +++ b/src/editor/C4EditCursor.h @@ -20,12 +20,11 @@ #ifndef INC_C4EditCursor #define INC_C4EditCursor -#include "object/C4ObjectList.h" #include "control/C4Control.h" #include "lib/C4Rect.h" -#include "script/C4Value.h" -#include #include "object/C4DefGraphics.h" +#include "object/C4ObjectList.h" +#include "script/C4Value.h" // Currently selected elements in editcursor. May be objects and other prop lists. diff --git a/src/editor/C4EditorWindowController.mm b/src/editor/C4EditorWindowController.mm index 9c413a074..c32ec064c 100644 --- a/src/editor/C4EditorWindowController.mm +++ b/src/editor/C4EditorWindowController.mm @@ -19,7 +19,6 @@ #include "editor/C4Console.h" #include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "game/C4Game.h" #import #import "editor/C4EditorWindowController.h" diff --git a/src/editor/C4ToolsDlg.cpp b/src/editor/C4ToolsDlg.cpp index 6349e4e5e..dd625dc70 100644 --- a/src/editor/C4ToolsDlg.cpp +++ b/src/editor/C4ToolsDlg.cpp @@ -19,10 +19,11 @@ #include "C4Include.h" #include "editor/C4ToolsDlg.h" + +#include "control/C4GameControl.h" #include "editor/C4Console.h" #include "landscape/C4Texture.h" #include "landscape/C4Landscape.h" -#include "control/C4GameControl.h" bool C4ToolsDlg::Open() { diff --git a/src/game/C4Application.cpp b/src/game/C4Application.cpp index a25d40b7b..049d61dc2 100644 --- a/src/game/C4Application.cpp +++ b/src/game/C4Application.cpp @@ -22,26 +22,23 @@ #include "game/C4Application.h" #include "C4Version.h" +#include "editor/C4Console.h" +#include "game/C4FullScreen.h" +#include "game/C4GraphicsSystem.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "graphics/StdPNG.h" +#include "gui/C4GameLobby.h" +#include "gui/C4GfxErrorDlg.h" +#include "gui/C4MessageInput.h" #ifdef _WIN32 #include "gui/C4UpdateDlg.h" #endif -#include "game/C4Game.h" -#include "gui/C4GfxErrorDlg.h" -#include "game/C4GraphicsSystem.h" -#include "graphics/C4GraphicsResource.h" -#include "gui/C4MessageInput.h" -#include "game/C4FullScreen.h" -#include "c4group/C4Language.h" -#include "editor/C4Console.h" #include "gui/C4Startup.h" -#include "lib/C4Log.h" -#include "platform/C4GamePadCon.h" -#include "gui/C4GameLobby.h" +#include "landscape/C4Particles.h" #include "network/C4Network2.h" #include "network/C4Network2IRC.h" -#include "landscape/C4Particles.h" -#include "graphics/StdPNG.h" -#include "graphics/C4Draw.h" +#include "platform/C4GamePadCon.h" #include diff --git a/src/game/C4Application.h b/src/game/C4Application.h index 5df3bd099..08ca8b917 100644 --- a/src/game/C4Application.h +++ b/src/game/C4Application.h @@ -18,12 +18,12 @@ #ifndef INC_C4Application #define INC_C4Application -#include "c4group/C4Group.h" -#include "platform/C4MusicSystem.h" -#include "platform/C4SoundSystem.h" #include "c4group/C4Components.h" +#include "c4group/C4Group.h" #include "network/C4InteractiveThread.h" #include "platform/C4App.h" +#include "platform/C4MusicSystem.h" +#include "platform/C4SoundSystem.h" class C4ApplicationGameTimer; diff --git a/src/game/C4FullScreen.cpp b/src/game/C4FullScreen.cpp index 5a4efe8b6..421ccee1b 100644 --- a/src/game/C4FullScreen.cpp +++ b/src/game/C4FullScreen.cpp @@ -20,18 +20,16 @@ #include "C4Include.h" #include "game/C4FullScreen.h" -#include "game/C4Game.h" -#include "game/C4Application.h" -#include "game/C4Viewport.h" -#include "c4group/C4Language.h" -#include "gui/C4Gui.h" -#include "gui/C4GameDialogs.h" -#include "player/C4Player.h" -#include "gui/C4GameOverDlg.h" -#include "game/C4GraphicsSystem.h" -#include "gui/C4MouseControl.h" -#include "player/C4PlayerList.h" #include "C4Version.h" +#include "game/C4Application.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "gui/C4GameDialogs.h" +#include "gui/C4GameOverDlg.h" +#include "gui/C4Gui.h" +#include "gui/C4MouseControl.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" void C4FullScreen::CharIn(const char * c) { ::pGUI->CharIn(c); } diff --git a/src/game/C4Game.cpp b/src/game/C4Game.cpp index 98d6c9491..5f68cf8b2 100644 --- a/src/game/C4Game.cpp +++ b/src/game/C4Game.cpp @@ -21,64 +21,62 @@ #include "C4ForbidLibraryCompilation.h" #include "game/C4Game.h" -#include "script/C4AulDebug.h" +#include "C4Version.h" +#include "control/C4GameControl.h" +#include "control/C4GameParameters.h" +#include "control/C4GameSave.h" +#include "control/C4PlayerControl.h" +#include "control/C4PlayerInfo.h" +#include "control/C4Record.h" +#include "control/C4RoundResults.h" +#include "editor/C4Console.h" +#include "game/C4Application.h" +#include "game/C4FullScreen.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4ChatDlg.h" +#include "gui/C4GameLobby.h" +#include "gui/C4GameMessage.h" +#include "gui/C4GameOverDlg.h" +#include "gui/C4LoaderScreen.h" +#include "gui/C4MessageInput.h" +#include "gui/C4MouseControl.h" +#include "gui/C4ScriptGuiWindow.h" +#include "gui/C4Startup.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4MapScript.h" +#include "landscape/C4MassMover.h" +#include "landscape/C4Material.h" +#include "landscape/C4PXS.h" +#include "landscape/C4Particles.h" +#include "landscape/C4Sky.h" +#include "landscape/C4SolidMask.h" +#include "landscape/C4Texture.h" +#include "landscape/C4Weather.h" +#include "landscape/fow/C4FoW.h" +#include "lib/C4Random.h" +#include "lib/C4Stat.h" +#include "lib/StdMesh.h" +#include "network/C4League.h" +#include "network/C4Network2Dialogs.h" +#include "network/C4Network2Reference.h" +#include "network/C4Network2Stats.h" +#include "object/C4Command.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "script/C4Effect.h" -#include "platform/C4FileMonitor.h" -#include "control/C4GameSave.h" -#include "control/C4Record.h" -#include "game/C4Application.h" -#include "object/C4Object.h" -#include "object/C4ObjectInfo.h" -#include "lib/C4Random.h" -#include "object/C4ObjectCom.h" -#include "game/C4FullScreen.h" -#include "gui/C4Startup.h" -#include "game/C4Viewport.h" -#include "object/C4Command.h" -#include "lib/C4Stat.h" -#include "network/C4League.h" -#include "control/C4PlayerInfo.h" -#include "gui/C4LoaderScreen.h" -#include "network/C4Network2Dialogs.h" -#include "editor/C4Console.h" -#include "network/C4Network2Stats.h" -#include "lib/C4Log.h" -#include "player/C4Player.h" -#include "gui/C4GameOverDlg.h" -#include "control/C4GameParameters.h" -#include "object/C4ObjectMenu.h" -#include "gui/C4GameLobby.h" -#include "gui/C4ChatDlg.h" -#include "control/C4PlayerControl.h" -#include "gui/C4MouseControl.h" -#include "landscape/C4PXS.h" -#include "gui/C4MessageInput.h" -#include "landscape/C4MassMover.h" -#include "player/C4RankSystem.h" -#include "control/C4RoundResults.h" -#include "gui/C4GameMessage.h" -#include "gui/C4ScriptGuiWindow.h" -#include "landscape/C4Material.h" -#include "network/C4Network2Reference.h" -#include "landscape/C4Weather.h" -#include "graphics/C4GraphicsResource.h" -#include "game/C4GraphicsSystem.h" -#include "landscape/C4Texture.h" -#include "landscape/C4Landscape.h" -#include "landscape/C4Sky.h" -#include "player/C4PlayerList.h" #include "object/C4GameObjects.h" -#include "control/C4GameControl.h" -#include "C4Version.h" +#include "object/C4Object.h" +#include "object/C4ObjectCom.h" +#include "object/C4ObjectInfo.h" +#include "object/C4ObjectMenu.h" +#include "platform/C4FileMonitor.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" +#include "player/C4RankSystem.h" +#include "script/C4AulDebug.h" #include "script/C4AulExec.h" -#include "platform/StdFile.h" -#include "landscape/C4MapScript.h" -#include "landscape/C4SolidMask.h" -#include "landscape/fow/C4FoW.h" -#include "landscape/C4Particles.h" -#include "lib/StdMesh.h" +#include "script/C4Effect.h" #include diff --git a/src/game/C4Game.h b/src/game/C4Game.h index 0aed964a7..ba8def99d 100644 --- a/src/game/C4Game.h +++ b/src/game/C4Game.h @@ -20,15 +20,13 @@ #ifndef INC_C4Game #define INC_C4Game -#include "landscape/C4Scenario.h" -#include "landscape/C4PathFinder.h" #include "c4group/C4Extra.h" -#include "gui/C4Scoreboard.h" #include "control/C4PlayerControl.h" +#include "gui/C4Scoreboard.h" +#include "landscape/C4PathFinder.h" +#include "landscape/C4Scenario.h" #include "landscape/C4TransferZone.h" -#include - class C4ScriptGuiWindow; class C4Game diff --git a/src/game/C4GameScript.cpp b/src/game/C4GameScript.cpp index 733c4b0cf..bf0e3c7a0 100644 --- a/src/game/C4GameScript.cpp +++ b/src/game/C4GameScript.cpp @@ -21,34 +21,32 @@ #include "C4ForbidLibraryCompilation.h" #include "game/C4GameScript.h" -#include "game/C4Application.h" -#include "script/C4AulDefFunc.h" -#include "object/C4Command.h" -#include "object/C4DefList.h" -#include "editor/C4Console.h" -#include "game/C4Game.h" -#include "object/C4GameObjects.h" #include "control/C4GameControl.h" -#include "gui/C4GameMessage.h" -#include "platform/C4GamePadCon.h" -#include "game/C4GraphicsSystem.h" -#include "lib/C4Log.h" -#include "gui/C4MessageInput.h" -#include "gui/C4ScriptGuiWindow.h" -#include "gui/C4MouseControl.h" -#include "player/C4Player.h" -#include "player/C4PlayerList.h" -#include "landscape/C4PXS.h" #include "control/C4RoundResults.h" -#include "landscape/C4Texture.h" -#include "landscape/C4Weather.h" +#include "editor/C4Console.h" +#include "game/C4Application.h" +#include "game/C4GraphicsSystem.h" #include "game/C4Viewport.h" -#include "landscape/fow/C4FoW.h" -#include "landscape/C4Landscape.h" -#include "landscape/C4Sky.h" -#include "landscape/C4Particles.h" #include "graphics/C4GraphicsResource.h" #include "graphics/C4Shader.h" +#include "gui/C4GameMessage.h" +#include "gui/C4MessageInput.h" +#include "gui/C4MouseControl.h" +#include "gui/C4ScriptGuiWindow.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4PXS.h" +#include "landscape/C4Particles.h" +#include "landscape/C4Sky.h" +#include "landscape/C4Texture.h" +#include "landscape/C4Weather.h" +#include "landscape/fow/C4FoW.h" +#include "object/C4Command.h" +#include "object/C4DefList.h" +#include "object/C4GameObjects.h" +#include "platform/C4GamePadCon.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" +#include "script/C4AulDefFunc.h" C4Effect ** FnGetEffectsFor(C4PropList * pTarget) { diff --git a/src/game/C4GraphicsSystem.cpp b/src/game/C4GraphicsSystem.cpp index 1e94bf009..b45f6a180 100644 --- a/src/game/C4GraphicsSystem.cpp +++ b/src/game/C4GraphicsSystem.cpp @@ -21,20 +21,19 @@ #include "C4ForbidLibraryCompilation.h" #include "game/C4GraphicsSystem.h" -#include "game/C4Viewport.h" -#include "game/C4Application.h" #include "editor/C4Console.h" +#include "game/C4Application.h" #include "game/C4FullScreen.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "graphics/StdPNG.h" #include "gui/C4Gui.h" #include "gui/C4LoaderScreen.h" -#include "graphics/C4GraphicsResource.h" #include "landscape/C4Landscape.h" #include "landscape/C4Sky.h" #include "network/C4Network2.h" -#include "game/C4Game.h" #include "object/C4GameObjects.h" -#include "graphics/StdPNG.h" -#include "graphics/C4Draw.h" static const int MAX_BACKGROUND_FPS = 5; diff --git a/src/game/C4GraphicsSystem.h b/src/game/C4GraphicsSystem.h index 962b5099a..443dee771 100644 --- a/src/game/C4GraphicsSystem.h +++ b/src/game/C4GraphicsSystem.h @@ -23,8 +23,6 @@ #include "gui/C4MessageBoard.h" #include "gui/C4UpperBoard.h" -#include - class C4GraphicsSystem { public: diff --git a/src/game/C4Physics.h b/src/game/C4Physics.h index d1a01fe2d..99ebc3b75 100644 --- a/src/game/C4Physics.h +++ b/src/game/C4Physics.h @@ -20,8 +20,6 @@ #ifndef INC_C4Physics #define INC_C4Physics -#include "lib/C4Real.h" - const int StableRange=10; const int AttachRange=5; const int CornerRange=AttachRange+2; diff --git a/src/game/C4Viewport.cpp b/src/game/C4Viewport.cpp index 5670997fa..aa7f53315 100644 --- a/src/game/C4Viewport.cpp +++ b/src/game/C4Viewport.cpp @@ -21,28 +21,28 @@ #include "C4ForbidLibraryCompilation.h" #include "game/C4Viewport.h" -#include "editor/C4ViewportWindow.h" #include "editor/C4Console.h" -#include "object/C4Def.h" -#include "object/C4Object.h" +#include "editor/C4ViewportWindow.h" #include "game/C4FullScreen.h" -#include "lib/C4Stat.h" -#include "player/C4Player.h" -#include "object/C4ObjectMenu.h" -#include "gui/C4MouseControl.h" -#include "landscape/C4PXS.h" -#include "gui/C4GameMessage.h" -#include "gui/C4ScriptGuiWindow.h" -#include "graphics/C4GraphicsResource.h" #include "game/C4GraphicsSystem.h" -#include "landscape/C4Landscape.h" -#include "landscape/C4Sky.h" -#include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" -#include "network/C4Network2.h" -#include "landscape/fow/C4FoWRegion.h" -#include "landscape/C4Particles.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4GameMessage.h" +#include "gui/C4MouseControl.h" +#include "gui/C4ScriptGuiWindow.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4PXS.h" +#include "landscape/C4Particles.h" +#include "landscape/C4Sky.h" +#include "landscape/fow/C4FoWRegion.h" +#include "lib/C4Stat.h" +#include "network/C4Network2.h" +#include "object/C4Def.h" +#include "object/C4GameObjects.h" +#include "object/C4Object.h" +#include "object/C4ObjectMenu.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" void C4Viewport::DropFile(const char* fileName, float x, float y) { diff --git a/src/game/ClonkMain.cpp b/src/game/ClonkMain.cpp index 6a4a2ecf4..a7c69dd6a 100644 --- a/src/game/ClonkMain.cpp +++ b/src/game/ClonkMain.cpp @@ -20,8 +20,6 @@ #include "C4Include.h" #include "game/C4Application.h" -#include "lib/C4Log.h" -#include "game/C4Game.h" #include "C4Version.h" #include "network/C4Network2.h" diff --git a/src/graphics/C4Draw.cpp b/src/graphics/C4Draw.cpp index 567423c04..00f47cd92 100644 --- a/src/graphics/C4Draw.cpp +++ b/src/graphics/C4Draw.cpp @@ -20,19 +20,16 @@ #include "C4ForbidLibraryCompilation.h" #include "graphics/C4Draw.h" -#include "platform/C4App.h" -#include "graphics/C4FontLoader.h" -#include "platform/C4Window.h" #include "graphics/C4DrawGL.h" #include "graphics/C4DrawT.h" +#include "graphics/C4FontLoader.h" +#include "graphics/CSurface8.h" #include "lib/C4Markup.h" #include "lib/C4Rect.h" -#include "config/C4Config.h" -#include "lib/StdMesh.h" -#include "graphics/CSurface8.h" #include "lib/StdColors.h" - -#include +#include "lib/StdMesh.h" +#include "platform/C4App.h" +#include "platform/C4Window.h" // Instruct Optimus laptops to use nVidia GPU instead of integrated GPU #if defined(_WIN32) && !defined(USE_CONSOLE) diff --git a/src/graphics/C4Draw.h b/src/graphics/C4Draw.h index ab93acae8..fa6e836ee 100644 --- a/src/graphics/C4Draw.h +++ b/src/graphics/C4Draw.h @@ -19,9 +19,9 @@ #ifndef INC_STDDDRAW2 #define INC_STDDDRAW2 +#include "lib/StdMeshMaterial.h" #include "graphics/C4Surface.h" #include "graphics/C4BltTransform.h" -#include "lib/StdMeshMaterial.h" // Global Draw access pointer extern C4Draw *pDraw; diff --git a/src/graphics/C4DrawGL.cpp b/src/graphics/C4DrawGL.cpp index 2792eb971..51c54e2eb 100644 --- a/src/graphics/C4DrawGL.cpp +++ b/src/graphics/C4DrawGL.cpp @@ -20,24 +20,15 @@ #include "C4ForbidLibraryCompilation.h" #include "graphics/C4DrawGL.h" +#include "game/C4Application.h" #include "graphics/C4Surface.h" -#include "platform/C4Window.h" #include "landscape/fow/C4FoWRegion.h" #include "lib/C4Rect.h" -#include "config/C4Config.h" -#include "game/C4Application.h" #include "lib/StdColors.h" +#include "platform/C4Window.h" #ifndef USE_CONSOLE -// MSVC doesn't define M_PI in math.h unless requested -#ifdef _MSC_VER -#define _USE_MATH_DEFINES -#endif /* _MSC_VER */ - -#include -#include - namespace { const char *MsgSourceToStr(GLenum source) diff --git a/src/graphics/C4DrawGLCtx.cpp b/src/graphics/C4DrawGLCtx.cpp index 83a54bd8c..b6f6ff063 100644 --- a/src/graphics/C4DrawGLCtx.cpp +++ b/src/graphics/C4DrawGLCtx.cpp @@ -20,8 +20,8 @@ #include "C4ForbidLibraryCompilation.h" #include "graphics/C4DrawGL.h" -#include "platform/C4Window.h" #include "platform/C4App.h" +#include "platform/C4Window.h" #ifndef USE_CONSOLE diff --git a/src/graphics/C4DrawMeshGL.cpp b/src/graphics/C4DrawMeshGL.cpp index 4bd45cdf3..913d20ff7 100644 --- a/src/graphics/C4DrawMeshGL.cpp +++ b/src/graphics/C4DrawMeshGL.cpp @@ -18,16 +18,16 @@ #include "C4Include.h" #include "C4ForbidLibraryCompilation.h" -#include "object/C4Object.h" + #include "graphics/C4DrawGL.h" +#include "graphics/C4GraphicsResource.h" #include "landscape/fow/C4FoWRegion.h" #include "lib/SHA1.h" +#include "lib/StdMesh.h" +#include "object/C4Object.h" #include "object/C4MeshDenumerator.h" -#include "lib/StdMesh.h" -#include "graphics/C4GraphicsResource.h" #include -#include #ifndef USE_CONSOLE diff --git a/src/graphics/C4FontLoader.cpp b/src/graphics/C4FontLoader.cpp index 2d52f5a1f..601bb8985 100644 --- a/src/graphics/C4FontLoader.cpp +++ b/src/graphics/C4FontLoader.cpp @@ -22,16 +22,10 @@ #ifndef USE_CONSOLE #include "c4group/C4Components.h" -#include "config/C4Config.h" -#include "graphics/C4Draw.h" -#include "c4group/C4Language.h" -#include "lib/C4Log.h" #include "lib/C4Markup.h" -#include "graphics/C4Surface.h" #include "lib/StdColors.h" - -#include -#include +#include "graphics/C4Draw.h" +#include "graphics/C4Surface.h" #ifdef _WIN32 #include "platform/C4windowswrapper.h" diff --git a/src/graphics/C4FontLoader.h b/src/graphics/C4FontLoader.h index d76d06cef..c4e26de0d 100644 --- a/src/graphics/C4FontLoader.h +++ b/src/graphics/C4FontLoader.h @@ -23,9 +23,6 @@ #include "graphics/C4Facet.h" #include "graphics/C4Surface.h" #include "graphics/C4FontLoaderCustomImages.h" -#include "lib/StdBuf.h" -#include -#include // Font rendering flags #define STDFONT_CENTERED 0x0001 diff --git a/src/graphics/C4GraphicsResource.cpp b/src/graphics/C4GraphicsResource.cpp index 37bb3507f..27f301eed 100644 --- a/src/graphics/C4GraphicsResource.cpp +++ b/src/graphics/C4GraphicsResource.cpp @@ -21,12 +21,10 @@ #include "C4ForbidLibraryCompilation.h" #include "graphics/C4GraphicsResource.h" -#include "object/C4DefList.h" -#include "graphics/C4FontLoader.h" -#include "lib/C4Log.h" -#include "game/C4Game.h" #include "c4group/C4Components.h" +#include "graphics/C4FontLoader.h" #include "graphics/C4DrawGL.h" +#include "object/C4DefList.h" /* C4GraphicsResource */ diff --git a/src/graphics/C4Shader.h b/src/graphics/C4Shader.h index 893323cf6..af60850ce 100644 --- a/src/graphics/C4Shader.h +++ b/src/graphics/C4Shader.h @@ -19,7 +19,6 @@ #define INC_C4Shader #include "C4ForbidLibraryCompilation.h" -#include "lib/StdBuf.h" #include "lib/StdMeshMath.h" #include "graphics/C4Surface.h" diff --git a/src/graphics/C4Surface.cpp b/src/graphics/C4Surface.cpp index bd7bb482d..d7bb80987 100644 --- a/src/graphics/C4Surface.cpp +++ b/src/graphics/C4Surface.cpp @@ -20,30 +20,20 @@ #include "C4ForbidLibraryCompilation.h" #include "graphics/C4Surface.h" -#include "platform/StdFile.h" #include "c4group/CStdFile.h" -#include "platform/C4App.h" +#include "graphics/Bitmap256.h" +#include "graphics/C4Draw.h" #include "graphics/C4DrawGL.h" +#include "graphics/StdPNG.h" +#include "lib/StdColors.h" +#include "platform/C4App.h" #include "platform/C4Window.h" #include "platform/StdRegistry.h" -#include "graphics/C4Draw.h" -#include "graphics/Bitmap256.h" -#include "graphics/StdPNG.h" -#include "config/C4Config.h" -#include "lib/StdColors.h" - #ifdef HAVE_IO_H #include #endif -#include -#include -#include -#include -#include -#include - C4Surface::C4Surface() : fIsBackground(false) { Default(); diff --git a/src/graphics/C4Surface.h b/src/graphics/C4Surface.h index 53aec9ab2..ff14135e8 100644 --- a/src/graphics/C4Surface.h +++ b/src/graphics/C4Surface.h @@ -21,8 +21,6 @@ #include "C4ForbidLibraryCompilation.h" #include "lib/C4Rect.h" -#include - // blitting modes #define C4GFXBLIT_NORMAL 0 // regular blit #define C4GFXBLIT_ADDITIVE 1 // all blits additive diff --git a/src/graphics/C4SurfaceLoaders.cpp b/src/graphics/C4SurfaceLoaders.cpp index 6cb60839f..4afdd9303 100644 --- a/src/graphics/C4SurfaceLoaders.cpp +++ b/src/graphics/C4SurfaceLoaders.cpp @@ -22,7 +22,6 @@ #include "c4group/C4GroupSet.h" #include "c4group/C4Group.h" -#include "lib/C4Log.h" #include "graphics/StdPNG.h" #include "lib/StdColors.h" diff --git a/src/gui/C4ChatDlg.cpp b/src/gui/C4ChatDlg.cpp index 30d6321ae..fcf04dae0 100644 --- a/src/gui/C4ChatDlg.cpp +++ b/src/gui/C4ChatDlg.cpp @@ -19,10 +19,10 @@ #include "gui/C4ChatDlg.h" #include "game/C4Application.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MessageInput.h" #include "lib/C4InputValidation.h" #include "network/C4Network2IRC.h" -#include "gui/C4MessageInput.h" -#include "graphics/C4GraphicsResource.h" /* C4ChatControl::ChatSheet::NickItem */ diff --git a/src/gui/C4DownloadDlg.cpp b/src/gui/C4DownloadDlg.cpp index 18c0e67d1..69d4810a6 100644 --- a/src/gui/C4DownloadDlg.cpp +++ b/src/gui/C4DownloadDlg.cpp @@ -18,7 +18,6 @@ #include "C4Include.h" #include "gui/C4DownloadDlg.h" -#include "lib/C4Log.h" #include "graphics/C4GraphicsResource.h" C4Network2HTTPClient HTTPClient; diff --git a/src/gui/C4FileSelDlg.cpp b/src/gui/C4FileSelDlg.cpp index f296b0569..e5625d14c 100644 --- a/src/gui/C4FileSelDlg.cpp +++ b/src/gui/C4FileSelDlg.cpp @@ -18,9 +18,9 @@ #include "C4Include.h" #include "gui/C4FileSelDlg.h" -#include "graphics/C4GraphicsResource.h" // only for single use of ::GraphicsResource.fctOKCancel below... #include "C4Version.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" // only for single use of ::GraphicsResource.fctOKCancel below... #ifdef _WIN32 #ifndef _WIN32_IE diff --git a/src/gui/C4GameDialogs.cpp b/src/gui/C4GameDialogs.cpp index 53e452a3a..e654ddb15 100644 --- a/src/gui/C4GameDialogs.cpp +++ b/src/gui/C4GameDialogs.cpp @@ -18,7 +18,6 @@ #include "C4Include.h" #include "gui/C4GameDialogs.h" -#include "game/C4Game.h" #include "network/C4Network2.h" bool C4AbortGameDialog::is_shown = false; diff --git a/src/gui/C4GameLobby.cpp b/src/gui/C4GameLobby.cpp index b363b375e..ee6ac1086 100644 --- a/src/gui/C4GameLobby.cpp +++ b/src/gui/C4GameLobby.cpp @@ -19,17 +19,16 @@ #include "C4ForbidLibraryCompilation.h" #include "gui/C4GameLobby.h" -#include "game/C4Application.h" #include "c4group/C4Components.h" -#include "network/C4Network2Dialogs.h" -#include "gui/C4GameOptions.h" -#include "gui/C4ChatDlg.h" -#include "gui/C4PlayerInfoListBox.h" -#include "gui/C4MessageInput.h" -#include "game/C4Game.h" -#include "network/C4Network2.h" -#include "graphics/C4GraphicsResource.h" #include "control/C4GameControl.h" +#include "game/C4Application.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4ChatDlg.h" +#include "gui/C4GameOptions.h" +#include "gui/C4MessageInput.h" +#include "gui/C4PlayerInfoListBox.h" +#include "network/C4Network2.h" +#include "network/C4Network2Dialogs.h" namespace C4GameLobby { diff --git a/src/gui/C4GameMessage.cpp b/src/gui/C4GameMessage.cpp index 24e8d6011..ebad49325 100644 --- a/src/gui/C4GameMessage.cpp +++ b/src/gui/C4GameMessage.cpp @@ -20,12 +20,12 @@ #include "C4Include.h" #include "gui/C4GameMessage.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" #include "object/C4Def.h" #include "object/C4Object.h" -#include "graphics/C4GraphicsResource.h" #include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "graphics/C4Draw.h" const int32_t ObjectMsgDelayFactor = 2, GlobalMsgDelayFactor = 3; // frames per char message display time diff --git a/src/gui/C4GameOptions.cpp b/src/gui/C4GameOptions.cpp index 4d58790ca..105d46223 100644 --- a/src/gui/C4GameOptions.cpp +++ b/src/gui/C4GameOptions.cpp @@ -18,9 +18,8 @@ #include "C4Include.h" #include "gui/C4GameOptions.h" -#include "game/C4Application.h" -#include "game/C4Game.h" #include "control/C4GameControl.h" +#include "game/C4Application.h" #include "graphics/C4GraphicsResource.h" #include "gui/C4GameLobby.h" #include "gui/C4Startup.h" diff --git a/src/gui/C4GameOverDlg.cpp b/src/gui/C4GameOverDlg.cpp index 4913c9cf2..06592f416 100644 --- a/src/gui/C4GameOverDlg.cpp +++ b/src/gui/C4GameOverDlg.cpp @@ -18,18 +18,16 @@ #include "C4Include.h" #include "gui/C4GameOverDlg.h" +#include "control/C4GameControl.h" #include "game/C4Application.h" +#include "game/C4FullScreen.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4PlayerInfoListBox.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "game/C4Game.h" -#include "game/C4FullScreen.h" -#include "player/C4Player.h" -#include "gui/C4PlayerInfoListBox.h" -#include "player/C4PlayerList.h" #include "object/C4GameObjects.h" -#include "control/C4GameControl.h" -#include "graphics/C4GraphicsResource.h" - +#include "player/C4Player.h" +#include "player/C4PlayerList.h" // --------------------------------------------------- // C4GoalDisplay diff --git a/src/gui/C4Gui.cpp b/src/gui/C4Gui.cpp index 9a1942dfc..25ff97f29 100644 --- a/src/gui/C4Gui.cpp +++ b/src/gui/C4Gui.cpp @@ -19,16 +19,15 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "game/C4FullScreen.h" -#include "gui/C4LoaderScreen.h" #include "game/C4Application.h" -#include "game/C4Viewport.h" -#include "lib/C4Log.h" -#include "platform/C4GamePadCon.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" +#include "game/C4FullScreen.h" #include "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4LoaderScreen.h" +#include "gui/C4MouseControl.h" +#include "platform/C4GamePadCon.h" namespace C4GUI { diff --git a/src/gui/C4Gui.h b/src/gui/C4Gui.h index b78e2f608..bcc7ae6d1 100644 --- a/src/gui/C4Gui.h +++ b/src/gui/C4Gui.h @@ -23,14 +23,14 @@ #ifndef INC_C4Gui #define INC_C4Gui -#include "graphics/C4FontLoader.h" -#include "lib/C4Rect.h" #include "graphics/C4FacetEx.h" -#include "lib/C4LogBuf.h" +#include "graphics/C4FontLoader.h" #include "gui/C4KeyboardInput.h" -#include "platform/StdScheduler.h" +#include "lib/C4Rect.h" +#include "lib/C4LogBuf.h" #include "object/C4Id.h" #include "platform/C4Window.h" +#include "platform/StdScheduler.h" // consts (load those from a def file some time) // font colors - alpha is font alpha, which is inversed opaque diff --git a/src/gui/C4GuiButton.cpp b/src/gui/C4GuiButton.cpp index 712782a57..d698a052d 100644 --- a/src/gui/C4GuiButton.cpp +++ b/src/gui/C4GuiButton.cpp @@ -19,9 +19,9 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiCheckBox.cpp b/src/gui/C4GuiCheckBox.cpp index cc32877c7..3091f640f 100644 --- a/src/gui/C4GuiCheckBox.cpp +++ b/src/gui/C4GuiCheckBox.cpp @@ -19,12 +19,10 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "graphics/C4FacetEx.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" - -#include "platform/C4Window.h" +#include "graphics/C4FacetEx.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiComboBox.cpp b/src/gui/C4GuiComboBox.cpp index c233b731d..45ac35d4c 100644 --- a/src/gui/C4GuiComboBox.cpp +++ b/src/gui/C4GuiComboBox.cpp @@ -20,12 +20,10 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "graphics/C4FacetEx.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" - -#include "platform/C4Window.h" +#include "graphics/C4FacetEx.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiContainers.cpp b/src/gui/C4GuiContainers.cpp index 72dc1a158..da4f0fd8c 100644 --- a/src/gui/C4GuiContainers.cpp +++ b/src/gui/C4GuiContainers.cpp @@ -19,9 +19,9 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiDialogs.cpp b/src/gui/C4GuiDialogs.cpp index 3794061ea..f40b9c0d2 100644 --- a/src/gui/C4GuiDialogs.cpp +++ b/src/gui/C4GuiDialogs.cpp @@ -21,14 +21,13 @@ #include "C4ForbidLibraryCompilation.h" #include "gui/C4Gui.h" -#include "object/C4DefList.h" -#include "game/C4Application.h" -#include "game/C4Viewport.h" -#include "object/C4Def.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" #include "game/C4Application.h" #include "game/C4GameScript.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "object/C4DefList.h" +#include "object/C4Def.h" #include "graphics/C4DrawGL.h" #include "platform/StdRegistry.h" diff --git a/src/gui/C4GuiEdit.cpp b/src/gui/C4GuiEdit.cpp index e278f9f66..e30598ee1 100644 --- a/src/gui/C4GuiEdit.cpp +++ b/src/gui/C4GuiEdit.cpp @@ -20,9 +20,9 @@ #include "gui/C4Gui.h" #include "game/C4Application.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiLabels.cpp b/src/gui/C4GuiLabels.cpp index c036fe1fe..5bb086d1e 100644 --- a/src/gui/C4GuiLabels.cpp +++ b/src/gui/C4GuiLabels.cpp @@ -19,9 +19,9 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiListBox.cpp b/src/gui/C4GuiListBox.cpp index c8fb3966f..69fcb32dc 100644 --- a/src/gui/C4GuiListBox.cpp +++ b/src/gui/C4GuiListBox.cpp @@ -19,9 +19,8 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "gui/C4MouseControl.h" #include "graphics/C4Draw.h" -#include +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiMenu.cpp b/src/gui/C4GuiMenu.cpp index ecbd4b74e..fc130ea88 100644 --- a/src/gui/C4GuiMenu.cpp +++ b/src/gui/C4GuiMenu.cpp @@ -19,12 +19,10 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "graphics/C4FacetEx.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" - -#include "platform/C4Window.h" +#include "graphics/C4FacetEx.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4GuiTabular.cpp b/src/gui/C4GuiTabular.cpp index 7478f8b6f..57a08dc9f 100644 --- a/src/gui/C4GuiTabular.cpp +++ b/src/gui/C4GuiTabular.cpp @@ -19,10 +19,10 @@ #include "C4Include.h" #include "gui/C4Gui.h" -#include "graphics/C4FacetEx.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4FacetEx.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" namespace C4GUI { diff --git a/src/gui/C4KeyboardInput.cpp b/src/gui/C4KeyboardInput.cpp index 31e865da6..dd557e43b 100644 --- a/src/gui/C4KeyboardInput.cpp +++ b/src/gui/C4KeyboardInput.cpp @@ -19,13 +19,8 @@ #include "gui/C4KeyboardInput.h" #include "c4group/C4Components.h" -#include "game/C4Game.h" #include "platform/C4Window.h" - -#include -#include -#include #include #ifdef HAVE_SDL diff --git a/src/gui/C4KeyboardInput.h b/src/gui/C4KeyboardInput.h index b46324400..63e4c7ab3 100644 --- a/src/gui/C4KeyboardInput.h +++ b/src/gui/C4KeyboardInput.h @@ -18,13 +18,6 @@ #ifndef INC_C4KeyboardInput #define INC_C4KeyboardInput -#include -#include -#include -#include -#include -#include - // key context classifications enum C4KeyScope { diff --git a/src/gui/C4LoaderScreen.cpp b/src/gui/C4LoaderScreen.cpp index ce9eea91d..bd2fff4fc 100644 --- a/src/gui/C4LoaderScreen.cpp +++ b/src/gui/C4LoaderScreen.cpp @@ -19,13 +19,11 @@ #include "gui/C4LoaderScreen.h" #include "c4group/C4Components.h" -#include "lib/C4LogBuf.h" -#include "lib/C4Log.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "lib/C4Random.h" #include "c4group/C4GroupSet.h" -#include "game/C4Game.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "lib/C4LogBuf.h" +#include "lib/C4Random.h" C4LoaderScreen::C4LoaderScreen() { diff --git a/src/gui/C4MainMenu.cpp b/src/gui/C4MainMenu.cpp index 8aa45ee0f..5b71e867e 100644 --- a/src/gui/C4MainMenu.cpp +++ b/src/gui/C4MainMenu.cpp @@ -19,19 +19,18 @@ #include "C4Include.h" #include "gui/C4MainMenu.h" +#include "control/C4GameControl.h" #include "game/C4Application.h" -#include "object/C4DefList.h" #include "game/C4FullScreen.h" #include "game/C4Viewport.h" -#include "player/C4Player.h" -#include "gui/C4GameOverDlg.h" #include "graphics/C4GraphicsResource.h" -#include "game/C4Game.h" -#include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" +#include "gui/C4GameOverDlg.h" #include "network/C4Network2.h" -#include "control/C4GameControl.h" #include "object/C4Def.h" +#include "object/C4DefList.h" +#include "object/C4GameObjects.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" // ----------------------------------------------------------- // C4MainMenu diff --git a/src/gui/C4Menu.cpp b/src/gui/C4Menu.cpp index 3d5236c34..c9751161f 100644 --- a/src/gui/C4Menu.cpp +++ b/src/gui/C4Menu.cpp @@ -20,18 +20,17 @@ #include "C4Include.h" #include "gui/C4Menu.h" +#include "control/C4GameControl.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" +#include "lib/StdColors.h" #include "object/C4Def.h" #include "object/C4DefList.h" #include "object/C4Object.h" -#include "game/C4Viewport.h" #include "player/C4Player.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "game/C4Game.h" #include "player/C4PlayerList.h" -#include "control/C4GameControl.h" -#include "lib/StdColors.h" const int32_t C4MN_DefInfoWdt = 270, // default width of info windows C4MN_DlgWdt = 270, // default width of dialog windows diff --git a/src/gui/C4Menu.h b/src/gui/C4Menu.h index 53ff84fc5..6ab16415b 100644 --- a/src/gui/C4Menu.h +++ b/src/gui/C4Menu.h @@ -20,9 +20,9 @@ #ifndef INC_C4Menu #define INC_C4Menu -#include "object/C4Id.h" #include "graphics/C4FacetEx.h" #include "gui/C4Gui.h" +#include "object/C4Id.h" #include "object/C4IDList.h" enum diff --git a/src/gui/C4MessageBoard.cpp b/src/gui/C4MessageBoard.cpp index 030e40d1e..21f933a68 100644 --- a/src/gui/C4MessageBoard.cpp +++ b/src/gui/C4MessageBoard.cpp @@ -21,17 +21,16 @@ #include "gui/C4MessageBoard.h" #include "game/C4Application.h" -#include "gui/C4LoaderScreen.h" -#include "gui/C4Gui.h" -#include "player/C4Player.h" -#include "game/C4GraphicsSystem.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "gui/C4MessageInput.h" -#include "game/C4Game.h" -#include "player/C4PlayerList.h" #include "game/C4FullScreen.h" +#include "game/C4GraphicsSystem.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4Gui.h" +#include "gui/C4LoaderScreen.h" +#include "gui/C4MessageInput.h" #include "lib/StdColors.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" const int C4LogSize=30000, C4LogMaxLines=1000; diff --git a/src/gui/C4MessageInput.cpp b/src/gui/C4MessageInput.cpp index d39018622..e82e48c04 100644 --- a/src/gui/C4MessageInput.cpp +++ b/src/gui/C4MessageInput.cpp @@ -18,18 +18,16 @@ #include "C4Include.h" #include "gui/C4MessageInput.h" -#include "game/C4Game.h" -#include "object/C4Object.h" -#include "gui/C4Gui.h" +#include "control/C4GameControl.h" #include "editor/C4Console.h" #include "game/C4Application.h" -#include "lib/C4Log.h" -#include "player/C4Player.h" -#include "gui/C4GameLobby.h" #include "game/C4GraphicsSystem.h" -#include "player/C4PlayerList.h" -#include "control/C4GameControl.h" #include "graphics/C4GraphicsResource.h" +#include "gui/C4Gui.h" +#include "gui/C4GameLobby.h" +#include "object/C4Object.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" // -------------------------------------------------- // C4ChatInputDialog diff --git a/src/gui/C4MouseControl.cpp b/src/gui/C4MouseControl.cpp index bbb4546c4..ddbed1a60 100644 --- a/src/gui/C4MouseControl.cpp +++ b/src/gui/C4MouseControl.cpp @@ -20,22 +20,21 @@ #include "C4Include.h" #include "gui/C4MouseControl.h" -#include "game/C4Viewport.h" -#include "object/C4Def.h" -#include "object/C4Object.h" +#include "control/C4GameControl.h" #include "game/C4Application.h" #include "game/C4FullScreen.h" -#include "gui/C4Gui.h" -#include "landscape/C4Landscape.h" -#include "game/C4Game.h" -#include "player/C4Player.h" -#include "gui/C4ChatDlg.h" -#include "graphics/C4GraphicsResource.h" +#include "game/C4Viewport.h" #include "graphics/C4Draw.h" -#include "player/C4PlayerList.h" -#include "control/C4GameControl.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4ChatDlg.h" +#include "gui/C4Gui.h" #include "gui/C4ScriptGuiWindow.h" +#include "landscape/C4Landscape.h" #include "lib/StdMesh.h" +#include "object/C4Def.h" +#include "object/C4Object.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" const int32_t C4MC_Drag_None = 0, C4MC_Drag_Script = 6, diff --git a/src/gui/C4MouseControl.h b/src/gui/C4MouseControl.h index 9bf7bba25..9ce2e2705 100644 --- a/src/gui/C4MouseControl.h +++ b/src/gui/C4MouseControl.h @@ -21,8 +21,8 @@ #define INC_C4MouseControl #include "graphics/C4Facet.h" -#include "object/C4ObjectList.h" #include "lib/C4Rect.h" +#include "object/C4ObjectList.h" struct ZoomData; // #include "graphics/C4Draw.h" const int32_t C4MC_Button_None = 0, diff --git a/src/gui/C4PlayerInfoListBox.cpp b/src/gui/C4PlayerInfoListBox.cpp index 35e4da945..0a5414084 100644 --- a/src/gui/C4PlayerInfoListBox.cpp +++ b/src/gui/C4PlayerInfoListBox.cpp @@ -18,18 +18,17 @@ #include "C4Include.h" #include "gui/C4PlayerInfoListBox.h" +#include "control/C4GameControl.h" #include "control/C4PlayerInfo.h" -#include "network/C4Network2Dialogs.h" +#include "control/C4RoundResults.h" #include "control/C4Teams.h" -#include "game/C4Game.h" -#include "gui/C4FileSelDlg.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4FileSelDlg.h" +#include "gui/C4GameLobby.h" #include "gui/C4MouseControl.h" #include "network/C4Network2.h" -#include "control/C4GameControl.h" -#include "control/C4RoundResults.h" -#include "gui/C4GameLobby.h" +#include "network/C4Network2Dialogs.h" DWORD GenerateRandomPlayerColor(int32_t iTry); // in C4PlayerInfoConflicts.cpp diff --git a/src/gui/C4Scoreboard.cpp b/src/gui/C4Scoreboard.cpp index b06adccd0..9565d091c 100644 --- a/src/gui/C4Scoreboard.cpp +++ b/src/gui/C4Scoreboard.cpp @@ -18,10 +18,10 @@ #include "C4Include.h" #include "gui/C4Scoreboard.h" -#include "gui/C4Gui.h" #include "gui/C4GameOverDlg.h" -#include "graphics/C4GraphicsResource.h" +#include "gui/C4Gui.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" class C4ScoreboardDlg : public C4GUI::Dialog diff --git a/src/gui/C4ScriptGuiWindow.cpp b/src/gui/C4ScriptGuiWindow.cpp index 4e485c318..122c817c6 100644 --- a/src/gui/C4ScriptGuiWindow.cpp +++ b/src/gui/C4ScriptGuiWindow.cpp @@ -29,22 +29,19 @@ #include "C4Include.h" #include "gui/C4ScriptGuiWindow.h" +#include "control/C4Control.h" #include "game/C4Application.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" +#include "lib/StdColors.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "game/C4GraphicsSystem.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "game/C4Game.h" -#include "control/C4Control.h" -#include "gui/C4MouseControl.h" #include "object/C4Object.h" #include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "game/C4Viewport.h" -#include "lib/StdColors.h" - -#include // Adds some helpful logs for hunting control & menu based desyncs. //#define MenuDebugLogF(...) DebugLogF(__VA_ARGS__) diff --git a/src/gui/C4ScriptGuiWindow.h b/src/gui/C4ScriptGuiWindow.h index 562479a6d..3bca08156 100644 --- a/src/gui/C4ScriptGuiWindow.h +++ b/src/gui/C4ScriptGuiWindow.h @@ -20,11 +20,8 @@ #include "graphics/C4Surface.h" #include "gui/C4Gui.h" - #include "script/C4Value.h" -#include - enum C4ScriptGuiWindowPropertyName { left = 0, diff --git a/src/gui/C4Startup.cpp b/src/gui/C4Startup.cpp index b41851f09..4f14f4e2a 100644 --- a/src/gui/C4Startup.cpp +++ b/src/gui/C4Startup.cpp @@ -19,18 +19,16 @@ #include "C4ForbidLibraryCompilation.h" #include "gui/C4Startup.h" +#include "game/C4Application.h" +#include "game/C4GraphicsSystem.h" #include "graphics/C4FontLoader.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4StartupAboutDlg.h" #include "gui/C4StartupMainDlg.h" -#include "gui/C4StartupScenSelDlg.h" #include "gui/C4StartupNetDlg.h" #include "gui/C4StartupOptionsDlg.h" -#include "gui/C4StartupAboutDlg.h" #include "gui/C4StartupPlrSelDlg.h" -#include "game/C4Game.h" -#include "game/C4Application.h" -#include "lib/C4Log.h" -#include "graphics/C4GraphicsResource.h" -#include "game/C4GraphicsSystem.h" +#include "gui/C4StartupScenSelDlg.h" bool C4StartupGraphics::LoadFile(C4FacetID &rToFct, const char *szFilename) { diff --git a/src/gui/C4StartupAboutDlg.cpp b/src/gui/C4StartupAboutDlg.cpp index 06c86eac2..8396a11fc 100644 --- a/src/gui/C4StartupAboutDlg.cpp +++ b/src/gui/C4StartupAboutDlg.cpp @@ -18,9 +18,9 @@ #include "C4Include.h" #include "gui/C4StartupAboutDlg.h" -#include "gui/C4UpdateDlg.h" -#include "graphics/C4GraphicsResource.h" #include "C4Version.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4UpdateDlg.h" // ------------------------------------------------ // --- C4StartupAboutDlg diff --git a/src/gui/C4StartupMainDlg.cpp b/src/gui/C4StartupMainDlg.cpp index c6a48ef60..98388d1ea 100644 --- a/src/gui/C4StartupMainDlg.cpp +++ b/src/gui/C4StartupMainDlg.cpp @@ -18,27 +18,21 @@ #include "C4Include.h" #include "gui/C4StartupMainDlg.h" -#include "game/C4Application.h" -#include "c4group/C4Components.h" -#include "gui/C4UpdateDlg.h" #include "C4Version.h" -#include "gui/C4StartupNetDlg.h" -#include "gui/C4StartupScenSelDlg.h" -#include "gui/C4StartupOptionsDlg.h" -#include "gui/C4StartupAboutDlg.h" -#include "gui/C4StartupPlrSelDlg.h" -#include "gui/C4Startup.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" -#include "c4group/C4Language.h" -#include "graphics/C4GraphicsResource.h" +#include "c4group/C4Components.h" +#include "game/C4Application.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4Startup.h" +#include "gui/C4StartupAboutDlg.h" +#include "gui/C4StartupNetDlg.h" +#include "gui/C4StartupOptionsDlg.h" +#include "gui/C4StartupPlrSelDlg.h" +#include "gui/C4StartupScenSelDlg.h" +#include "gui/C4UpdateDlg.h" #ifdef _WIN32 #include -#else -#include -#include #endif diff --git a/src/gui/C4StartupNetDlg.cpp b/src/gui/C4StartupNetDlg.cpp index 59045cedb..e0e4f7c29 100644 --- a/src/gui/C4StartupNetDlg.cpp +++ b/src/gui/C4StartupNetDlg.cpp @@ -19,12 +19,11 @@ #include "gui/C4StartupNetDlg.h" #include "game/C4Application.h" -#include "gui/C4UpdateDlg.h" -#include "gui/C4StartupScenSelDlg.h" -#include "game/C4Game.h" -#include "gui/C4ChatDlg.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4ChatDlg.h" +#include "gui/C4StartupScenSelDlg.h" +#include "gui/C4UpdateDlg.h" #include "network/C4Network2Reference.h" // ----------- C4StartupNetListEntry ----------------------------------------------------------------------- diff --git a/src/gui/C4StartupOptionsDlg.cpp b/src/gui/C4StartupOptionsDlg.cpp index a6bf0f0ed..c3011481a 100644 --- a/src/gui/C4StartupOptionsDlg.cpp +++ b/src/gui/C4StartupOptionsDlg.cpp @@ -20,15 +20,12 @@ #include "gui/C4StartupOptionsDlg.h" #include "game/C4Application.h" -#include "gui/C4StartupMainDlg.h" -#include "c4group/C4Language.h" -#include "platform/C4GamePadCon.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" -#include "network/C4Network2.h" +#include "graphics/C4GraphicsResource.h" #include "gui/C4MouseControl.h" +#include "gui/C4StartupMainDlg.h" +#include "network/C4Network2.h" +#include "platform/C4GamePadCon.h" #include "graphics/C4DrawGL.h" diff --git a/src/gui/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp index cb8137cb0..367497123 100644 --- a/src/gui/C4StartupPlrSelDlg.cpp +++ b/src/gui/C4StartupPlrSelDlg.cpp @@ -17,24 +17,16 @@ // Also contains player creation, editing and crew management #include "C4Include.h" - -#include - #include "gui/C4StartupPlrSelDlg.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4FileSelDlg.h" +#include "gui/C4MouseControl.h" #include "gui/C4StartupMainDlg.h" #include "lib/C4Random.h" -#include "game/C4Game.h" -#include "c4group/C4Language.h" -#include "gui/C4FileSelDlg.h" -#include "lib/C4Log.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "player/C4RankSystem.h" -#include "gui/C4MouseControl.h" #include "lib/StdColors.h" -#include -#include +#include "player/C4RankSystem.h" // font clrs const uint32_t ClrPlayerItem = 0xffffffff; diff --git a/src/gui/C4StartupPlrSelDlg.h b/src/gui/C4StartupPlrSelDlg.h index 3c425b2a0..969c6f142 100644 --- a/src/gui/C4StartupPlrSelDlg.h +++ b/src/gui/C4StartupPlrSelDlg.h @@ -19,7 +19,6 @@ #ifndef INC_C4StartupPlrSelDlg #define INC_C4StartupPlrSelDlg -#include #include "gui/C4Startup.h" #include "object/C4InfoCore.h" diff --git a/src/gui/C4StartupScenSelDlg.cpp b/src/gui/C4StartupScenSelDlg.cpp index f5bc01a4b..5c4c8f21e 100644 --- a/src/gui/C4StartupScenSelDlg.cpp +++ b/src/gui/C4StartupScenSelDlg.cpp @@ -18,22 +18,18 @@ #include "C4Include.h" #include "gui/C4StartupScenSelDlg.h" -#include "game/C4Application.h" -#include "gui/C4GameOptions.h" -#include "network/C4Network2Dialogs.h" -#include "gui/C4StartupMainDlg.h" -#include "gui/C4StartupNetDlg.h" #include "c4group/C4ComponentHost.h" #include "c4group/C4Components.h" -#include "lib/C4Log.h" -#include "game/C4Game.h" -#include "gui/C4GameDialogs.h" -#include "c4group/C4Language.h" -#include "gui/C4FileSelDlg.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" +#include "game/C4Application.h" #include "graphics/C4Draw.h" -#include +#include "graphics/C4GraphicsResource.h" +#include "gui/C4FileSelDlg.h" +#include "gui/C4GameDialogs.h" +#include "gui/C4GameOptions.h" +#include "gui/C4MouseControl.h" +#include "gui/C4StartupMainDlg.h" +#include "gui/C4StartupNetDlg.h" +#include "network/C4Network2Dialogs.h" // singleton C4StartupScenSelDlg *C4StartupScenSelDlg::pInstance=nullptr; diff --git a/src/gui/C4StartupScenSelDlg.h b/src/gui/C4StartupScenSelDlg.h index afe6cf26d..dcc06e92e 100644 --- a/src/gui/C4StartupScenSelDlg.h +++ b/src/gui/C4StartupScenSelDlg.h @@ -18,15 +18,12 @@ #ifndef INC_C4StartupScenSelDlg #define INC_C4StartupScenSelDlg +#include "gui/C4Folder.h" #include "gui/C4Startup.h" #include "landscape/C4Scenario.h" -#include "gui/C4Folder.h" #include "player/C4ScenarioParameters.h" #include "player/C4Achievement.h" -#include -#include - class C4StartupScenSelDlg; const int32_t C4StartupScenSel_DefaultIcon_Scenario = 14, diff --git a/src/gui/C4UpdateDlg.cpp b/src/gui/C4UpdateDlg.cpp index 6f2c31af4..07b6a404b 100644 --- a/src/gui/C4UpdateDlg.cpp +++ b/src/gui/C4UpdateDlg.cpp @@ -19,17 +19,14 @@ #include "C4Include.h" #include "gui/C4UpdateDlg.h" -#include "game/C4Application.h" #include "c4group/C4Components.h" +#include "game/C4Application.h" #include "gui/C4DownloadDlg.h" -#include "lib/C4Log.h" #ifdef _WIN32 #include #else -#include #include -#include #include #include #include diff --git a/src/gui/C4UpdateDlg.h b/src/gui/C4UpdateDlg.h index 987d7c272..4ef64f098 100644 --- a/src/gui/C4UpdateDlg.h +++ b/src/gui/C4UpdateDlg.h @@ -20,8 +20,8 @@ #ifdef WITH_AUTOMATIC_UPDATE -#include "gui/C4Gui.h" #include "game/C4GameVersion.h" +#include "gui/C4Gui.h" #include "network/C4Network2Reference.h" // dialog showing info about a connected client diff --git a/src/gui/C4UpperBoard.cpp b/src/gui/C4UpperBoard.cpp index 5f6d5e491..4ef51675b 100644 --- a/src/gui/C4UpperBoard.cpp +++ b/src/gui/C4UpperBoard.cpp @@ -16,10 +16,8 @@ #include "C4Include.h" #include "gui/C4UpperBoard.h" -#include "game/C4Game.h" -#include "config/C4Config.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" C4UpperBoard::C4UpperBoard() = default; diff --git a/src/landscape/C4Landscape.cpp b/src/landscape/C4Landscape.cpp index 04ad5f48c..c982b9318 100644 --- a/src/landscape/C4Landscape.cpp +++ b/src/landscape/C4Landscape.cpp @@ -21,8 +21,6 @@ #include "C4ForbidLibraryCompilation.h" #include "landscape/C4Landscape.h" -#include - #include "c4group/C4Components.h" #include "control/C4Record.h" #include "editor/C4ToolsDlg.h" @@ -30,7 +28,6 @@ #include "game/C4Physics.h" #include "graphics/C4GraphicsResource.h" #include "gui/C4GameMessage.h" -#include "landscape/fow/C4FoW.h" #include "landscape/C4LandscapeRender.h" #include "landscape/C4Map.h" #include "landscape/C4MapCreatorS2.h" @@ -43,12 +40,15 @@ #include "landscape/C4SolidMask.h" #include "landscape/C4Texture.h" #include "landscape/C4Weather.h" +#include "landscape/fow/C4FoW.h" #include "lib/C4Random.h" #include "lib/StdColors.h" #include "object/C4Def.h" #include "object/C4FindObject.h" #include "object/C4GameObjects.h" +#include + struct C4Landscape::P { std::unique_ptr Surface8; diff --git a/src/landscape/C4Landscape.h b/src/landscape/C4Landscape.h index 9e5ef3751..a2e477ebc 100644 --- a/src/landscape/C4Landscape.h +++ b/src/landscape/C4Landscape.h @@ -20,7 +20,6 @@ #ifndef INC_C4Landscape #define INC_C4Landscape -#include "C4Prototypes.h" #include "config/C4Constants.h" const int32_t C4MaxMaterial = 125; diff --git a/src/landscape/C4LandscapeRender.cpp b/src/landscape/C4LandscapeRender.cpp index 66a04e715..98b2477d8 100644 --- a/src/landscape/C4LandscapeRender.cpp +++ b/src/landscape/C4LandscapeRender.cpp @@ -17,18 +17,14 @@ #include "C4ForbidLibraryCompilation.h" #include "landscape/C4LandscapeRender.h" +#include "c4group/C4Components.h" +#include "c4group/C4GroupSet.h" +#include "graphics/C4DrawGL.h" #include "landscape/C4Landscape.h" #include "landscape/C4Texture.h" #include "landscape/fow/C4FoWRegion.h" - -#include "c4group/C4GroupSet.h" -#include "c4group/C4Components.h" - -#include "graphics/C4DrawGL.h" #include "lib/StdColors.h" -#include - #ifndef USE_CONSOLE // Automatically reload shaders when changed at runtime? diff --git a/src/landscape/C4LandscapeRender.h b/src/landscape/C4LandscapeRender.h index d7ee59dae..08ffc3a7b 100644 --- a/src/landscape/C4LandscapeRender.h +++ b/src/landscape/C4LandscapeRender.h @@ -18,9 +18,9 @@ #define C4LANDSCAPE_RENDER_H #include "C4ForbidLibraryCompilation.h" -#include "graphics/C4Surface.h" #include "graphics/C4FacetEx.h" #include "graphics/C4Shader.h" +#include "graphics/C4Surface.h" // Data we want to store per landscape pixel enum C4LR_Byte { diff --git a/src/landscape/C4Map.cpp b/src/landscape/C4Map.cpp index c4db60811..9bf6d55a6 100644 --- a/src/landscape/C4Map.cpp +++ b/src/landscape/C4Map.cpp @@ -20,8 +20,8 @@ #include "C4Include.h" #include "landscape/C4Map.h" -#include "lib/C4Random.h" #include "landscape/C4Texture.h" +#include "lib/C4Random.h" #include "graphics/CSurface8.h" C4MapCreator::C4MapCreator() diff --git a/src/landscape/C4MapCreatorS2.cpp b/src/landscape/C4MapCreatorS2.cpp index 0cd1d88a5..8ff4e5f5b 100644 --- a/src/landscape/C4MapCreatorS2.cpp +++ b/src/landscape/C4MapCreatorS2.cpp @@ -17,12 +17,13 @@ #include "C4Include.h" #include "landscape/C4MapCreatorS2.h" -#include "lib/C4Random.h" -#include "landscape/C4Material.h" -#include "script/C4ScriptHost.h" -#include "landscape/C4Texture.h" + #include "control/C4Record.h" #include "graphics/CSurface8.h" +#include "landscape/C4Material.h" +#include "landscape/C4Texture.h" +#include "lib/C4Random.h" +#include "script/C4ScriptHost.h" namespace { // node attribute entry for SetField search diff --git a/src/landscape/C4MapScript.cpp b/src/landscape/C4MapScript.cpp index bda30f41e..673d51af2 100644 --- a/src/landscape/C4MapScript.cpp +++ b/src/landscape/C4MapScript.cpp @@ -19,11 +19,12 @@ #include "C4Include.h" #include "landscape/C4MapScript.h" -#include "script/C4AulDefFunc.h" + +#include "game/C4GameScript.h" #include "landscape/C4Landscape.h" #include "landscape/C4Texture.h" #include "lib/C4Random.h" -#include "game/C4GameScript.h" +#include "script/C4AulDefFunc.h" C4MapScriptAlgo *FnParAlgo(C4PropList *algo_par); diff --git a/src/landscape/C4MapScript.h b/src/landscape/C4MapScript.h index 96561efb0..5b3462f84 100644 --- a/src/landscape/C4MapScript.h +++ b/src/landscape/C4MapScript.h @@ -21,11 +21,11 @@ #define INC_C4MapScript #include "c4group/C4ComponentHost.h" -#include "script/C4Aul.h" -#include "script/C4ScriptHost.h" -#include "lib/C4Rect.h" #include "graphics/CSurface8.h" #include "landscape/C4Landscape.h" +#include "lib/C4Rect.h" +#include "script/C4Aul.h" +#include "script/C4ScriptHost.h" // mattex masks: Array of bools for each possible material-texture index class C4MapScriptMatTexMask diff --git a/src/landscape/C4MassMover.cpp b/src/landscape/C4MassMover.cpp index 16c7315fb..9ffa123e3 100644 --- a/src/landscape/C4MassMover.cpp +++ b/src/landscape/C4MassMover.cpp @@ -21,10 +21,10 @@ #include "landscape/C4MassMover.h" #include "c4group/C4Components.h" -#include "lib/C4Random.h" +#include "control/C4Record.h" #include "landscape/C4Material.h" #include "landscape/C4Landscape.h" -#include "control/C4Record.h" +#include "lib/C4Random.h" // Note: creation optimized using advancing CreatePtr, so sequential // creation does not keep rescanning the complete set for a free diff --git a/src/landscape/C4Material.cpp b/src/landscape/C4Material.cpp index dee75cb29..da1bda7f8 100644 --- a/src/landscape/C4Material.cpp +++ b/src/landscape/C4Material.cpp @@ -19,19 +19,18 @@ #include "C4Include.h" #include "landscape/C4Material.h" -#include "c4group/C4Components.h" +#include "c4group/C4Components.h" #include "c4group/C4Group.h" -#include "landscape/C4PXS.h" -#include "lib/C4Random.h" #include "editor/C4ToolsDlg.h" // For C4TLS_MatSky... -#include "landscape/C4Texture.h" -#include "script/C4Aul.h" -#include "landscape/C4Landscape.h" -#include "platform/C4SoundSystem.h" -#include "script/C4Effect.h" -#include "lib/C4Log.h" #include "game/C4Physics.h" // For GravAccel +#include "landscape/C4PXS.h" +#include "landscape/C4Texture.h" +#include "landscape/C4Landscape.h" +#include "lib/C4Random.h" +#include "platform/C4SoundSystem.h" +#include "script/C4Aul.h" +#include "script/C4Effect.h" int32_t MVehic=MNone,MHalfVehic=MNone,MTunnel=MNone,MWater=MNone,MEarth=MNone; diff --git a/src/landscape/C4Material.h b/src/landscape/C4Material.h index e9a82ee8f..e597a46dd 100644 --- a/src/landscape/C4Material.h +++ b/src/landscape/C4Material.h @@ -21,12 +21,10 @@ #define INC_C4Material #include "config/C4Constants.h" -#include "lib/C4Real.h" -#include "object/C4Id.h" -#include "object/C4Shape.h" #include "graphics/C4Facet.h" #include "graphics/CSurface8.h" -#include +#include "object/C4Id.h" +#include "object/C4Shape.h" #define C4MatOv_Default 0 #define C4MatOv_Exact 1 diff --git a/src/landscape/C4PXS.cpp b/src/landscape/C4PXS.cpp index 61b7f7d5d..8052b56d4 100644 --- a/src/landscape/C4PXS.cpp +++ b/src/landscape/C4PXS.cpp @@ -21,13 +21,12 @@ #include "landscape/C4PXS.h" #include "c4group/C4Components.h" -#include "config/C4Config.h" -#include "game/C4Physics.h" -#include "lib/C4Random.h" -#include "landscape/C4Weather.h" #include "control/C4Record.h" -#include "lib/StdColors.h" +#include "game/C4Physics.h" #include "graphics/C4Draw.h" +#include "landscape/C4Weather.h" +#include "lib/C4Random.h" +#include "lib/StdColors.h" static const C4Real WindDrift_Factor = itofix(1, 800); diff --git a/src/landscape/C4Particles.cpp b/src/landscape/C4Particles.cpp index 5f834885b..63656b528 100644 --- a/src/landscape/C4Particles.cpp +++ b/src/landscape/C4Particles.cpp @@ -18,22 +18,20 @@ #include "landscape/C4Particles.h" // headers for particle loading -#include "lib/C4Log.h" #include "c4group/C4Components.h" -#include "config/C4Config.h" #ifndef USE_CONSOLE // headers for particle execution -#include "script/C4Aul.h" #include "game/C4Application.h" +#include "graphics/C4DrawGL.h" +#include "landscape/C4Material.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4Weather.h" +#include "object/C4MeshAnimation.h" +#include "object/C4Object.h" +#include "script/C4Aul.h" #include "script/C4Value.h" #include "script/C4ValueArray.h" -#include "landscape/C4Material.h" -#include "object/C4MeshAnimation.h" -#include "graphics/C4DrawGL.h" -#include "landscape/C4Landscape.h" -#include "landscape/C4Weather.h" -#include "object/C4Object.h" #include #endif diff --git a/src/landscape/C4PathFinder.cpp b/src/landscape/C4PathFinder.cpp index ba03cbd6e..a34283454 100644 --- a/src/landscape/C4PathFinder.cpp +++ b/src/landscape/C4PathFinder.cpp @@ -45,10 +45,10 @@ #include "C4Include.h" #include "landscape/C4PathFinder.h" -#include "graphics/C4Draw.h" -#include "graphics/C4FacetEx.h" #include "game/C4GraphicsSystem.h" +#include "graphics/C4Draw.h" +#include "graphics/C4FacetEx.h" #include "lib/StdColors.h" const int32_t C4PF_MaxDepth = 35, diff --git a/src/landscape/C4Scenario.cpp b/src/landscape/C4Scenario.cpp index 5ca942be4..63a3b1a30 100644 --- a/src/landscape/C4Scenario.cpp +++ b/src/landscape/C4Scenario.cpp @@ -20,10 +20,10 @@ #include "C4Include.h" #include "landscape/C4Scenario.h" +#include "c4group/C4Components.h" +#include "c4group/C4Group.h" #include "lib/C4InputValidation.h" #include "lib/C4Random.h" -#include "c4group/C4Group.h" -#include "c4group/C4Components.h" #include "lib/StdColors.h" //==================================== C4SVal ============================================== diff --git a/src/landscape/C4Sky.cpp b/src/landscape/C4Sky.cpp index 305b770fc..26ae30693 100644 --- a/src/landscape/C4Sky.cpp +++ b/src/landscape/C4Sky.cpp @@ -20,12 +20,11 @@ #include "C4Include.h" #include "landscape/C4Sky.h" -#include "game/C4Game.h" -#include "lib/C4Random.h" #include "c4group/C4Components.h" -#include "landscape/C4Weather.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "landscape/C4Weather.h" +#include "lib/C4Random.h" #include "lib/StdColors.h" void C4Sky::SetFadePalette(int32_t *ipColors) diff --git a/src/landscape/C4Sky.h b/src/landscape/C4Sky.h index 7891231fa..416dc762d 100644 --- a/src/landscape/C4Sky.h +++ b/src/landscape/C4Sky.h @@ -20,7 +20,6 @@ #ifndef INC_C4Sky #define INC_C4Sky -#include "lib/C4Real.h" #include "graphics/C4Shader.h" #define C4SkyPM_Fixed 0 // sky parallax mode: fixed diff --git a/src/landscape/C4SolidMask.cpp b/src/landscape/C4SolidMask.cpp index a5e12686a..e749fce68 100644 --- a/src/landscape/C4SolidMask.cpp +++ b/src/landscape/C4SolidMask.cpp @@ -19,15 +19,14 @@ #include "C4Include.h" #include "landscape/C4SolidMask.h" -#include "object/C4Def.h" -#include "object/C4Object.h" -#include "landscape/C4Landscape.h" -#include "game/C4Game.h" -#include "object/C4GameObjects.h" #include "graphics/C4DrawGL.h" -#include "graphics/StdPNG.h" #include "graphics/CSurface8.h" +#include "graphics/StdPNG.h" +#include "landscape/C4Landscape.h" #include "landscape/C4Material.h" +#include "object/C4Def.h" +#include "object/C4GameObjects.h" +#include "object/C4Object.h" void C4SolidMask::Put(bool fCauseInstability, C4TargetRect *pClipRect, bool fRestoreAttachment) diff --git a/src/landscape/C4Texture.cpp b/src/landscape/C4Texture.cpp index 6035ed8f4..a55eb81a7 100644 --- a/src/landscape/C4Texture.cpp +++ b/src/landscape/C4Texture.cpp @@ -19,21 +19,13 @@ #include "C4Include.h" #include "landscape/C4Texture.h" -#include "landscape/C4TextureShape.h" -#include "c4group/C4Group.h" -#include "game/C4Game.h" -#include "config/C4Config.h" #include "c4group/C4Components.h" -#include "landscape/C4Material.h" +#include "c4group/C4Group.h" #include "landscape/C4Landscape.h" -#include "lib/C4Log.h" #include "lib/C4Random.h" #include "lib/StdColors.h" -#include -#include - C4Texture::C4Texture() { Surface32=nullptr; diff --git a/src/landscape/C4Texture.h b/src/landscape/C4Texture.h index 29d64924a..51e3f4a96 100644 --- a/src/landscape/C4Texture.h +++ b/src/landscape/C4Texture.h @@ -20,11 +20,11 @@ #ifndef INC_C4Texture #define INC_C4Texture -#include "landscape/C4TextureShape.h" -#include "graphics/C4Surface.h" -#include "graphics/C4Draw.h" #include "config/C4Constants.h" #include "landscape/C4Material.h" +#include "landscape/C4TextureShape.h" +#include "graphics/C4Draw.h" +#include "graphics/C4Surface.h" class C4Texture { diff --git a/src/landscape/C4TextureShape.cpp b/src/landscape/C4TextureShape.cpp index e4129fb7f..de687082a 100644 --- a/src/landscape/C4TextureShape.cpp +++ b/src/landscape/C4TextureShape.cpp @@ -21,9 +21,8 @@ #include "landscape/C4TextureShape.h" #include "c4group/C4Group.h" -#include "landscape/C4Landscape.h" -#include "lib/C4Log.h" #include "graphics/StdPNG.h" +#include "landscape/C4Landscape.h" // -------------------------------------- C4TextureShape diff --git a/src/landscape/C4TransferZone.cpp b/src/landscape/C4TransferZone.cpp index 3d5056415..2328da1a8 100644 --- a/src/landscape/C4TransferZone.cpp +++ b/src/landscape/C4TransferZone.cpp @@ -20,11 +20,11 @@ #include "C4Include.h" #include "landscape/C4TransferZone.h" -#include "graphics/C4FacetEx.h" #include "graphics/C4Draw.h" +#include "graphics/C4FacetEx.h" #include "landscape/C4Landscape.h" -#include "object/C4GameObjects.h" #include "lib/StdColors.h" +#include "object/C4GameObjects.h" C4TransferZone::C4TransferZone() { diff --git a/src/landscape/C4Weather.cpp b/src/landscape/C4Weather.cpp index 6aac22d4d..80a7216b2 100644 --- a/src/landscape/C4Weather.cpp +++ b/src/landscape/C4Weather.cpp @@ -20,12 +20,11 @@ #include "C4Include.h" #include "landscape/C4Weather.h" -#include "object/C4Object.h" -#include "lib/C4Random.h" #include "game/C4GraphicsSystem.h" -#include "game/C4Game.h" -#include "platform/C4SoundSystem.h" #include "graphics/C4Draw.h" +#include "lib/C4Random.h" +#include "object/C4Object.h" +#include "platform/C4SoundSystem.h" C4Weather::C4Weather() { diff --git a/src/landscape/fow/C4FoW.h b/src/landscape/fow/C4FoW.h index 9e874d189..14fd29784 100644 --- a/src/landscape/fow/C4FoW.h +++ b/src/landscape/fow/C4FoW.h @@ -17,13 +17,13 @@ #define C4FOW_H #include "C4ForbidLibraryCompilation.h" -#include "graphics/C4Surface.h" #include "graphics/C4FacetEx.h" +#include "graphics/C4Shader.h" +#include "graphics/C4Surface.h" +#include "landscape/fow/C4FoWAmbient.h" +#include "landscape/fow/C4FoWLight.h" #include "lib/C4Rect.h" #include "object/C4Object.h" -#include "landscape/fow/C4FoWLight.h" -#include "landscape/fow/C4FoWAmbient.h" -#include "graphics/C4Shader.h" /** Simple transformation class which allows translation and scales in x and y. * This is typically used to initialize shader uniforms to transform fragment diff --git a/src/landscape/fow/C4FoWBeam.h b/src/landscape/fow/C4FoWBeam.h index bdf7b7658..41670c156 100644 --- a/src/landscape/fow/C4FoWBeam.h +++ b/src/landscape/fow/C4FoWBeam.h @@ -19,7 +19,6 @@ #include "C4ForbidLibraryCompilation.h" #ifndef USE_CONSOLE -#include "lib/StdBuf.h" /** This class represents one beam. A beam is a triangle spanned by two rays: one going from the origin to the left delimiter point, one going from the origin to the right delimiter point. diff --git a/src/landscape/fow/C4FoWDrawStrategy.h b/src/landscape/fow/C4FoWDrawStrategy.h index 1830839d8..e24b233f0 100644 --- a/src/landscape/fow/C4FoWDrawStrategy.h +++ b/src/landscape/fow/C4FoWDrawStrategy.h @@ -22,7 +22,6 @@ #include "graphics/C4DrawGL.h" #include "graphics/C4Shader.h" -#include class C4FoWRegion; class C4TargetFacet; diff --git a/src/landscape/fow/C4FoWLight.cpp b/src/landscape/fow/C4FoWLight.cpp index 2c1488936..a7b42f092 100644 --- a/src/landscape/fow/C4FoWLight.cpp +++ b/src/landscape/fow/C4FoWLight.cpp @@ -22,11 +22,9 @@ #include "landscape/fow/C4FoWLightSection.h" #include "landscape/fow/C4FoWBeamTriangle.h" #include "landscape/fow/C4FoWDrawStrategy.h" +#include "lib/StdColors.h" #include "player/C4PlayerList.h" #include "player/C4Player.h" -#include "lib/StdColors.h" - -#include C4FoWLight::C4FoWLight(C4Object *pObj) : iX(fixtoi(pObj->fix_x)), diff --git a/src/landscape/fow/C4FoWLight.h b/src/landscape/fow/C4FoWLight.h index eb633b58b..47345aef3 100644 --- a/src/landscape/fow/C4FoWLight.h +++ b/src/landscape/fow/C4FoWLight.h @@ -19,14 +19,12 @@ #ifndef USE_CONSOLE -#include "object/C4Object.h" -#include "graphics/C4Surface.h" #include "graphics/C4FacetEx.h" -#include "landscape/fow/C4FoWLightSection.h" +#include "graphics/C4Surface.h" #include "landscape/fow/C4FoWDrawStrategy.h" +#include "landscape/fow/C4FoWLightSection.h" #include "lib/C4Rect.h" - -#include +#include "object/C4Object.h" /** This class represents one light source. A light source has an associated object with which the light source moves and one light section that handles the light beams for each direction (up, down, left, right). diff --git a/src/landscape/fow/C4FoWLightSection.h b/src/landscape/fow/C4FoWLightSection.h index ef599f520..ec177dbda 100644 --- a/src/landscape/fow/C4FoWLightSection.h +++ b/src/landscape/fow/C4FoWLightSection.h @@ -21,7 +21,6 @@ #ifndef USE_CONSOLE #include "lib/C4Rect.h" -#include class C4FoWLight; class C4FoWRegion; diff --git a/src/lib/C4InputValidation.cpp b/src/lib/C4InputValidation.cpp index 6a3857a09..380047e4d 100644 --- a/src/lib/C4InputValidation.cpp +++ b/src/lib/C4InputValidation.cpp @@ -17,10 +17,8 @@ #include "C4Include.h" #include "lib/C4InputValidation.h" -#include "lib/C4Log.h" -#include "lib/C4Markup.h" -#include +#include "lib/C4Markup.h" namespace C4InVal { diff --git a/src/lib/C4InputValidation.h b/src/lib/C4InputValidation.h index 9a44d71fe..cbf21fb22 100644 --- a/src/lib/C4InputValidation.h +++ b/src/lib/C4InputValidation.h @@ -18,8 +18,6 @@ #ifndef INC_C4InputValidation #define INC_C4InputValidation -#include "lib/StdBuf.h" -#include "platform/StdFile.h" #include "lib/StdAdaptors.h" const unsigned int C4MaxName = 30; // player names, etc. diff --git a/src/lib/C4Log.cpp b/src/lib/C4Log.cpp index 8cf6c019d..e186388a8 100644 --- a/src/lib/C4Log.cpp +++ b/src/lib/C4Log.cpp @@ -20,18 +20,15 @@ #include "C4Include.h" #include "lib/C4Log.h" -#include "script/C4AulDebug.h" -#include "editor/C4Console.h" -#include "gui/C4GameLobby.h" -#include "game/C4Game.h" -#include "lib/C4LogBuf.h" -#include "c4group/C4Language.h" -#include "network/C4Network2.h" -#include "game/C4GraphicsSystem.h" -#include "config/C4Config.h" #include "c4group/C4Components.h" -#include "platform/C4Window.h" +#include "editor/C4Console.h" +#include "game/C4GraphicsSystem.h" #include "graphics/C4Shader.h" +#include "gui/C4GameLobby.h" +#include "lib/C4LogBuf.h" +#include "network/C4Network2.h" +#include "platform/C4Window.h" +#include "script/C4AulDebug.h" #ifdef HAVE_SYS_FILE_H #include diff --git a/src/lib/C4Log.h b/src/lib/C4Log.h index f26779e1c..7b7dd0b07 100644 --- a/src/lib/C4Log.h +++ b/src/lib/C4Log.h @@ -19,8 +19,6 @@ #ifndef INC_C4Log #define INC_C4Log -#include "lib/StdBuf.h" - bool OpenLog(); bool OpenExtraLogs(); bool CloseLog(); diff --git a/src/lib/C4NameList.h b/src/lib/C4NameList.h index e4d5cc0c7..5109dbe9b 100644 --- a/src/lib/C4NameList.h +++ b/src/lib/C4NameList.h @@ -25,7 +25,6 @@ const int C4MaxNameList = 10; #include "config/C4Constants.h" #include "lib/C4InputValidation.h" -#include class C4NameList { public: diff --git a/src/lib/C4Random.h b/src/lib/C4Random.h index dc5ebaa87..b354ae062 100644 --- a/src/lib/C4Random.h +++ b/src/lib/C4Random.h @@ -20,7 +20,7 @@ #ifndef INC_C4Random #define INC_C4Random -#include +#include extern int RandomCount; diff --git a/src/lib/C4Rect.h b/src/lib/C4Rect.h index 93af55678..cf3f411b6 100644 --- a/src/lib/C4Rect.h +++ b/src/lib/C4Rect.h @@ -22,8 +22,6 @@ #define C4D_VertexCpyPos (C4D_MaxVertex/2) -#include - struct FLOAT_RECT { float left,right,top,bottom; }; class C4Rect diff --git a/src/lib/Standard.cpp b/src/lib/Standard.cpp index 00f51fbe2..1669f3654 100644 --- a/src/lib/Standard.cpp +++ b/src/lib/Standard.cpp @@ -18,6 +18,7 @@ /* All kinds of valuable helpers */ #include "C4Include.h" +#include "lib/Standard.h" //------------------------------------- Basics ---------------------------------------- diff --git a/src/lib/Standard.h b/src/lib/Standard.h index a49a25bbe..18c86ab9d 100644 --- a/src/lib/Standard.h +++ b/src/lib/Standard.h @@ -38,8 +38,6 @@ inline InplaceReconstruct(T *obj) new (obj) T(); } -#include "platform/PlatformAbstraction.h" - // Small helpers template inline T Abs(T val) { return val > 0 ? val : -val; } template inline bool Inside(T ival, U lbound, V rbound) { return ival >= lbound && ival <= rbound; } @@ -57,7 +55,6 @@ int Angle(int iX1, int iY1, int iX2, int iY2); int Pow(int base, int exponent); int32_t StrToI32(const char *s, int base, const char **scan_end); -#include template typename std::enable_if::value>::type inline ZeroMem(T *lpMem, size_t dwSize) @@ -70,7 +67,6 @@ inline void MemCopy(const void *lpMem1, void *lpMem2, size_t dwSize) std::memmove(lpMem2,lpMem1,dwSize); } -#include inline char CharCapital(char cChar) { return std::toupper(cChar); } bool IsIdentifier(char cChar); inline bool IsWhiteSpace(char cChar) { return !!std::isspace((unsigned char)cChar); } @@ -152,9 +148,6 @@ bool SWildcardMatchEx(const char *szString, const char *szWildcard); // sprintf wrapper -#include -#include - #ifdef _WIN32 #define vsnprintf _vsprintf_p #endif diff --git a/src/lib/StdAdaptors.h b/src/lib/StdAdaptors.h index 2d3e6adee..5e16758d9 100644 --- a/src/lib/StdAdaptors.h +++ b/src/lib/StdAdaptors.h @@ -16,7 +16,6 @@ #ifndef STDADAPTORS_H #define STDADAPTORS_H -#include "lib/Standard.h" #include "lib/StdCompiler.h" // * Wrappers for C4Compiler-types diff --git a/src/lib/StdBuf.cpp b/src/lib/StdBuf.cpp index 603c9a783..a2c063f4e 100644 --- a/src/lib/StdBuf.cpp +++ b/src/lib/StdBuf.cpp @@ -15,23 +15,16 @@ */ #include "C4Include.h" #include "lib/StdBuf.h" + #include "lib/StdCompiler.h" #include "lib/StdAdaptors.h" -#include "platform/StdFile.h" -#include -#include #ifdef _WIN32 -#include #include "platform/C4windowswrapper.h" #else #define O_BINARY 0 #define O_SEQUENTIAL 0 -#include -#include #endif -#include -#include #include // *** StdBuf diff --git a/src/lib/StdBuf.h b/src/lib/StdBuf.h index 77af92912..4f834df1c 100644 --- a/src/lib/StdBuf.h +++ b/src/lib/StdBuf.h @@ -18,16 +18,8 @@ #ifndef STDBUF_H #define STDBUF_H -#include "platform/PlatformAbstraction.h" - #include -#include -#include -#include -#include -#include - // debug memory management #if defined(_DEBUG) && defined(_MSC_VER) #include diff --git a/src/lib/StdColors.h b/src/lib/StdColors.h index b66ea49a5..32a9cf7c8 100644 --- a/src/lib/StdColors.h +++ b/src/lib/StdColors.h @@ -18,8 +18,6 @@ #ifndef INC_StdColors #define INC_StdColors -#include - // helper function inline uint32_t RGBA(uint32_t r, uint32_t g, uint32_t b, uint32_t a) { diff --git a/src/lib/StdCompiler.cpp b/src/lib/StdCompiler.cpp index 70972a6a6..5a12a03b1 100644 --- a/src/lib/StdCompiler.cpp +++ b/src/lib/StdCompiler.cpp @@ -16,11 +16,6 @@ #include "C4Include.h" #include "lib/StdCompiler.h" -#include -#include -#include -#include "lib/C4Log.h" - // *** StdCompiler void StdCompiler::Warn(const char *szWarning, ...) @@ -205,7 +200,7 @@ StdStrBuf StdCompilerBinRead::getPosition() const template inline void StdCompilerBinRead::ReadValue(T &rValue) { - // Pufferüberhang prüfen + // Puffer�berhang pr�fen if (iPos + sizeof(T) > Buf.getSize()) { excEOF(); return; } // Kopieren @@ -865,7 +860,7 @@ long StdCompilerINIRead::ReadNum() { notFound("Number"); return 0; } // Skip whitespace SkipWhitespace(); - // Read number. If this breaks, Günther is to blame! + // Read number. If this breaks, G�nther is to blame! const char *pnPos = pPos; long iNum = strtol(pPos, const_cast(&pnPos), 10); // Could not read? @@ -882,7 +877,7 @@ unsigned long StdCompilerINIRead::ReadUNum() { notFound("Number"); return 0; } // Skip whitespace SkipWhitespace(); - // Read number. If this breaks, Günther is to blame! + // Read number. If this breaks, G�nther is to blame! const char *pnPos = pPos; unsigned long iNum = strtoul(pPos, const_cast(&pnPos), 10); // Could not read? diff --git a/src/lib/StdCompiler.h b/src/lib/StdCompiler.h index b490d4d6f..2ad9ac8a7 100644 --- a/src/lib/StdCompiler.h +++ b/src/lib/StdCompiler.h @@ -16,12 +16,6 @@ #ifndef STDCOMPILER_H #define STDCOMPILER_H -#include "lib/StdBuf.h" -#include "lib/C4Log.h" - -#include -#include - // Try to avoid casting NotFoundExceptions for trivial cases (MSVC log flood workaround) #if defined(_MSC_VER) #define STDCOMPILER_EXCEPTION_WORKAROUND diff --git a/src/lib/StdMesh.cpp b/src/lib/StdMesh.cpp index 65a2d112d..954ef7e81 100644 --- a/src/lib/StdMesh.cpp +++ b/src/lib/StdMesh.cpp @@ -16,9 +16,9 @@ #include "C4Include.h" #include "C4ForbidLibraryCompilation.h" -#include "graphics/C4DrawGL.h" #include "lib/StdMesh.h" -#include + +#include "graphics/C4DrawGL.h" namespace { diff --git a/src/lib/StdMesh.h b/src/lib/StdMesh.h index e739ac16e..113e10d4d 100644 --- a/src/lib/StdMesh.h +++ b/src/lib/StdMesh.h @@ -18,10 +18,8 @@ #define INC_StdMesh #include "C4ForbidLibraryCompilation.h" -#include "lib/StdMeshMath.h" #include "lib/StdMeshMaterial.h" - -#include +#include "lib/StdMeshMath.h" class StdMeshBone { diff --git a/src/lib/StdMeshLoader.cpp b/src/lib/StdMeshLoader.cpp index 25da486c2..60fc88df9 100644 --- a/src/lib/StdMeshLoader.cpp +++ b/src/lib/StdMeshLoader.cpp @@ -16,7 +16,6 @@ // A loader for the OGRE .mesh binary file format #include "C4Include.h" - #include "lib/StdMeshLoader.h" namespace diff --git a/src/lib/StdMeshLoader.h b/src/lib/StdMeshLoader.h index 04e3a04e4..9137e913e 100644 --- a/src/lib/StdMeshLoader.h +++ b/src/lib/StdMeshLoader.h @@ -14,11 +14,10 @@ */ // A loader for the OGRE .mesh binary file format -#include "lib/StdMesh.h" - #ifndef INC_StdMeshLoader #define INC_StdMeshLoader -#include + +#include "lib/StdMesh.h" namespace OgreToClonk { diff --git a/src/lib/StdMeshLoaderBinary.cpp b/src/lib/StdMeshLoaderBinary.cpp index 5e2a7fd28..de1485a36 100644 --- a/src/lib/StdMeshLoaderBinary.cpp +++ b/src/lib/StdMeshLoaderBinary.cpp @@ -21,8 +21,6 @@ #include "lib/StdMeshLoaderBinaryChunks.h" #include "lib/StdMeshLoaderDataStream.h" #include "lib/StdMeshMaterial.h" -#include -#include namespace { diff --git a/src/lib/StdMeshLoaderBinaryChunks.cpp b/src/lib/StdMeshLoaderBinaryChunks.cpp index f148b31cc..4a7a6a0ea 100644 --- a/src/lib/StdMeshLoaderBinaryChunks.cpp +++ b/src/lib/StdMeshLoaderBinaryChunks.cpp @@ -15,10 +15,6 @@ #include "C4Include.h" #include "lib/StdMeshLoaderBinaryChunks.h" -#include "lib/StdMeshLoaderDataStream.h" -#include -#include -#include // deleter-agnostic unique_ptr static caster template diff --git a/src/lib/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp index 83456bf6e..e9f838adb 100644 --- a/src/lib/StdMeshMaterial.cpp +++ b/src/lib/StdMeshMaterial.cpp @@ -17,22 +17,12 @@ #include "C4Include.h" #include "C4ForbidLibraryCompilation.h" #include "lib/StdMeshMaterial.h" + #include "lib/StdMeshUpdate.h" #include "graphics/C4DrawGL.h" -#include -#include - -// MSVC doesn't define M_PI in math.h unless requested -#ifdef _MSC_VER -#define _USE_MATH_DEFINES -#endif /* _MSC_VER */ -#include - #ifdef WITH_GLIB #include -#else -#include #endif namespace diff --git a/src/lib/StdMeshMaterial.h b/src/lib/StdMeshMaterial.h index bdd451ad3..cf29b1413 100644 --- a/src/lib/StdMeshMaterial.h +++ b/src/lib/StdMeshMaterial.h @@ -17,12 +17,9 @@ #ifndef INC_StdMeshMaterial #define INC_StdMeshMaterial -#include "lib/StdBuf.h" -#include "graphics/C4Surface.h" #include "graphics/C4Shader.h" +#include "graphics/C4Surface.h" -#include -#include #include // TODO: Support more features of OGRE material scripts diff --git a/src/lib/StdMeshMath.cpp b/src/lib/StdMeshMath.cpp index 38bc38163..b69477577 100644 --- a/src/lib/StdMeshMath.cpp +++ b/src/lib/StdMeshMath.cpp @@ -15,12 +15,6 @@ */ #include "C4Include.h" - -#ifdef _MSC_VER -# define _USE_MATH_DEFINES -# include -#endif - #include "lib/StdMeshMath.h" StdMeshVector StdMeshVector::Zero() diff --git a/src/lib/StdMeshUpdate.cpp b/src/lib/StdMeshUpdate.cpp index 655de0f61..1b32b4151 100644 --- a/src/lib/StdMeshUpdate.cpp +++ b/src/lib/StdMeshUpdate.cpp @@ -14,9 +14,10 @@ */ #include "C4Include.h" +#include "lib/StdMeshUpdate.h" + #include "lib/StdMesh.h" #include "lib/StdMeshMaterial.h" -#include "lib/StdMeshUpdate.h" #include "lib/StdMeshLoader.h" StdMeshMaterialUpdate::StdMeshMaterialUpdate(StdMeshMatManager& manager): diff --git a/src/lib/StdResStr2.cpp b/src/lib/StdResStr2.cpp index df94a89ea..10bd4b404 100644 --- a/src/lib/StdResStr2.cpp +++ b/src/lib/StdResStr2.cpp @@ -17,7 +17,6 @@ /* Load strings from a primitive memory string table */ #include "C4Include.h" -#include "c4group/C4Language.h" const int ResStrMaxLen = 4096; static char strResult[ResStrMaxLen + 1]; diff --git a/src/netio/TstC4NetIO.cpp b/src/netio/TstC4NetIO.cpp index 68893866e..0e587fd61 100644 --- a/src/netio/TstC4NetIO.cpp +++ b/src/netio/TstC4NetIO.cpp @@ -19,9 +19,6 @@ #include "network/C4NetIO.h" #include "lib/C4Random.h" -#include -#include -#include #ifdef _WIN32 #include "platform/C4windowswrapper.h" #include diff --git a/src/netpuncher/C4PuncherPacket.cpp b/src/netpuncher/C4PuncherPacket.cpp index 22b4aa107..562683976 100644 --- a/src/netpuncher/C4PuncherPacket.cpp +++ b/src/netpuncher/C4PuncherPacket.cpp @@ -15,8 +15,8 @@ #include "C4Include.h" #include "netpuncher/C4PuncherPacket.h" + #include "network/C4Network2Address.h" -#include void C4NetpuncherID::CompileFunc(StdCompiler *pComp) { pComp->Value(mkNamingAdapt(v4, "IPv4", 0u)); diff --git a/src/netpuncher/main.cpp b/src/netpuncher/main.cpp index b9f093f16..cd3871226 100644 --- a/src/netpuncher/main.cpp +++ b/src/netpuncher/main.cpp @@ -16,15 +16,11 @@ #include "C4Include.h" #include "netpuncher/C4PuncherHash.h" -#include "network/C4Network2.h" #include "netpuncher/C4PuncherPacket.h" +#include "network/C4Network2.h" -#include - -#include -#include #include -#include +#include class C4PuncherServer : public C4NetIOUDP, private C4NetIO::CBClass { diff --git a/src/network/C4Client.cpp b/src/network/C4Client.cpp index 25552b70c..1ce912378 100644 --- a/src/network/C4Client.cpp +++ b/src/network/C4Client.cpp @@ -16,13 +16,10 @@ #include "C4Include.h" #include "network/C4Client.h" -#include "game/C4Application.h" -#include "config/C4Config.h" -#include "network/C4Network2Client.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" -#include "player/C4PlayerList.h" #include "control/C4GameControl.h" +#include "game/C4Application.h" +#include "network/C4Network2Client.h" +#include "player/C4PlayerList.h" #ifndef HAVE_WINSOCK #include diff --git a/src/network/C4Client.h b/src/network/C4Client.h index 4e79cb234..81daea5fa 100644 --- a/src/network/C4Client.h +++ b/src/network/C4Client.h @@ -16,9 +16,9 @@ #ifndef C4CLIENT_H #define C4CLIENT_H +#include "lib/C4InputValidation.h" #include "network/C4NetIO.h" #include "network/C4PacketBase.h" -#include "lib/C4InputValidation.h" // special ids const int32_t C4ClientIDUnknown = -1, diff --git a/src/network/C4GameControlNetwork.cpp b/src/network/C4GameControlNetwork.cpp index b84bda6b1..f2a197172 100644 --- a/src/network/C4GameControlNetwork.cpp +++ b/src/network/C4GameControlNetwork.cpp @@ -18,10 +18,8 @@ #include "C4Include.h" #include "network/C4GameControlNetwork.h" -#include "game/C4Application.h" #include "control/C4GameControl.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" +#include "game/C4Application.h" #include "game/C4GraphicsSystem.h" // *** C4GameControlNetwork diff --git a/src/network/C4GameControlNetwork.h b/src/network/C4GameControlNetwork.h index 6605b4c78..a362269f9 100644 --- a/src/network/C4GameControlNetwork.h +++ b/src/network/C4GameControlNetwork.h @@ -19,8 +19,8 @@ #define INC_C4GameControlNetwork #include "control/C4Control.h" -#include "network/C4PacketBase.h" #include "network/C4Network2.h" +#include "network/C4PacketBase.h" // constants const int32_t C4ControlBacklog = 100, // (ctrl ticks) diff --git a/src/network/C4InteractiveThread.cpp b/src/network/C4InteractiveThread.cpp index 8ee375994..d2e6c2946 100644 --- a/src/network/C4InteractiveThread.cpp +++ b/src/network/C4InteractiveThread.cpp @@ -15,10 +15,8 @@ */ #include "C4Include.h" #include "network/C4InteractiveThread.h" -#include "game/C4Application.h" -#include "lib/C4Log.h" -#include "game/C4Game.h" +#include "game/C4Application.h" // *** C4InteractiveThread diff --git a/src/network/C4League.cpp b/src/network/C4League.cpp index 534505cd5..6ef76dbd8 100644 --- a/src/network/C4League.cpp +++ b/src/network/C4League.cpp @@ -19,7 +19,6 @@ #include "C4Include.h" #include "network/C4League.h" -#include "game/C4Game.h" #include "control/C4RoundResults.h" #include "graphics/C4GraphicsResource.h" diff --git a/src/network/C4League.h b/src/network/C4League.h index 915d918c2..1f58b5980 100644 --- a/src/network/C4League.h +++ b/src/network/C4League.h @@ -19,9 +19,9 @@ #ifndef C4LEAGUE_H_INCLUDED #define C4LEAGUE_H_INCLUDED -#include "network/C4Network2Reference.h" -#include "gui/C4Gui.h" #include "lib/SHA1.h" +#include "gui/C4Gui.h" +#include "network/C4Network2Reference.h" #define C4League_Name_Valid_Characters "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD9\xDA\xDB\xDC\xDD\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF\x20\x2E\x2D\x5F" diff --git a/src/network/C4NetIO.cpp b/src/network/C4NetIO.cpp index 79cd4b76f..00c802bc3 100644 --- a/src/network/C4NetIO.cpp +++ b/src/network/C4NetIO.cpp @@ -15,15 +15,10 @@ */ #include "C4Include.h" #include "network/C4NetIO.h" -#include "lib/C4Random.h" #include "config/C4Constants.h" -#include "config/C4Config.h" +#include "lib/C4Random.h" -#include -#include -#include -#include #include // platform specifics @@ -44,7 +39,6 @@ int pipe(int *phandles) { return _pipe(phandles, 10, O_BINARY); } #include #include #include -#include #include #include diff --git a/src/network/C4NetIO.h b/src/network/C4NetIO.h index aa4eb3d82..0b665465c 100644 --- a/src/network/C4NetIO.h +++ b/src/network/C4NetIO.h @@ -18,10 +18,9 @@ #ifndef C4NETIO_H #define C4NETIO_H -#include "platform/StdSync.h" -#include "lib/StdBuf.h" #include "lib/StdCompiler.h" #include "platform/StdScheduler.h" +#include "platform/StdSync.h" #ifdef _WIN32 #include "platform/C4windowswrapper.h" diff --git a/src/network/C4Network2.cpp b/src/network/C4Network2.cpp index 0ce6e159e..f1d9d3787 100644 --- a/src/network/C4Network2.cpp +++ b/src/network/C4Network2.cpp @@ -19,19 +19,16 @@ #include "network/C4Network2.h" #include "C4Version.h" -#include "lib/C4Log.h" -#include "game/C4Application.h" -#include "editor/C4Console.h" +#include "control/C4GameControl.h" #include "control/C4GameSave.h" #include "control/C4RoundResults.h" -#include "game/C4Game.h" +#include "editor/C4Console.h" +#include "game/C4Application.h" #include "game/C4GraphicsSystem.h" -#include "graphics/C4GraphicsResource.h" #include "graphics/C4Draw.h" -#include "control/C4GameControl.h" +#include "graphics/C4GraphicsResource.h" // lobby -#include "gui/C4Gui.h" #include "gui/C4GameLobby.h" #include "network/C4Network2Dialogs.h" diff --git a/src/network/C4Network2.h b/src/network/C4Network2.h index ec073de0d..c3ca8edb7 100644 --- a/src/network/C4Network2.h +++ b/src/network/C4Network2.h @@ -16,14 +16,14 @@ #ifndef INC_C4Network2 #define INC_C4Network2 -#include "network/C4NetIO.h" -#include "network/C4Network2Players.h" -#include "network/C4Network2IO.h" -#include "network/C4Network2Res.h" -#include "network/C4Network2Client.h" #include "control/C4Control.h" -#include "gui/C4Gui.h" #include "control/C4GameParameters.h" +#include "gui/C4Gui.h" +#include "network/C4NetIO.h" +#include "network/C4Network2Client.h" +#include "network/C4Network2IO.h" +#include "network/C4Network2Players.h" +#include "network/C4Network2Res.h" // standard ports const int16_t C4NetStdPortTCP = 11112, diff --git a/src/network/C4Network2Address.cpp b/src/network/C4Network2Address.cpp index 8121e74d7..2908f6ea8 100644 --- a/src/network/C4Network2Address.cpp +++ b/src/network/C4Network2Address.cpp @@ -15,6 +15,8 @@ */ #include "C4Include.h" +#include "network/C4Network2Address.h" + #ifndef _WIN32 #include #include @@ -22,8 +24,6 @@ #include #endif -#include "network/C4Network2Address.h" - // *** C4Network2Address void C4Network2Address::CompileFunc(StdCompiler *pComp) diff --git a/src/network/C4Network2Client.cpp b/src/network/C4Network2Client.cpp index 16518506f..893129a3c 100644 --- a/src/network/C4Network2Client.cpp +++ b/src/network/C4Network2Client.cpp @@ -16,13 +16,10 @@ #include "C4Include.h" #include "network/C4Network2Client.h" -#include "lib/C4Log.h" #include "editor/C4Console.h" -#include "network/C4Network2.h" -#include "network/C4Network2IO.h" -#include "network/C4Network2Stats.h" #include "gui/C4GameLobby.h" // fullscreen network lobby -#include "game/C4Game.h" +#include "network/C4Network2.h" +#include "network/C4Network2Stats.h" #include "player/C4PlayerList.h" // *** C4Network2Client diff --git a/src/network/C4Network2Client.h b/src/network/C4Network2Client.h index a94b0fa50..711e0f365 100644 --- a/src/network/C4Network2Client.h +++ b/src/network/C4Network2Client.h @@ -16,11 +16,11 @@ #ifndef INC_C4Network2Client #define INC_C4Network2Client +#include "network/C4Client.h" #include "network/C4NetIO.h" +#include "network/C4Network2Address.h" #include "network/C4Network2IO.h" #include "network/C4PacketBase.h" -#include "network/C4Client.h" -#include "network/C4Network2Address.h" class C4Network2; class C4Network2IOConnection; diff --git a/src/network/C4Network2Dialogs.cpp b/src/network/C4Network2Dialogs.cpp index 7c0f94936..1b58ec427 100644 --- a/src/network/C4Network2Dialogs.cpp +++ b/src/network/C4Network2Dialogs.cpp @@ -18,18 +18,16 @@ #include "C4Include.h" #include "network/C4Network2Dialogs.h" -#include "network/C4Network2.h" -#include "network/C4Network2Stats.h" -#include "game/C4Viewport.h" -#include "gui/C4GameOptions.h" -#include "game/C4Game.h" -#include "player/C4PlayerList.h" #include "control/C4GameControl.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" #include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "graphics/C4Draw.h" +#include "gui/C4GameOptions.h" #include "gui/C4Startup.h" #include "lib/StdColors.h" +#include "network/C4Network2.h" +#include "network/C4Network2Stats.h" +#include "player/C4PlayerList.h" #ifndef HAVE_WINSOCK #include diff --git a/src/network/C4Network2IO.cpp b/src/network/C4Network2IO.cpp index 89f392060..9d804810b 100644 --- a/src/network/C4Network2IO.cpp +++ b/src/network/C4Network2IO.cpp @@ -15,14 +15,11 @@ */ #include "C4Include.h" #include "network/C4Network2IO.h" -#include "network/C4Network2Reference.h" -#include "network/C4Network2Discover.h" -#include "game/C4Application.h" -#include "lib/C4Log.h" -#include "game/C4Game.h" #include "control/C4GameControl.h" - +#include "game/C4Application.h" +#include "network/C4Network2Discover.h" +#include "network/C4Network2Reference.h" #include "network/C4Network2UPnP.h" #ifndef HAVE_WINSOCK diff --git a/src/network/C4Network2IO.h b/src/network/C4Network2IO.h index dfd331cf8..ca01feaf4 100644 --- a/src/network/C4Network2IO.h +++ b/src/network/C4Network2IO.h @@ -16,10 +16,10 @@ #ifndef INC_C4Network2IO #define INC_C4Network2IO -#include "network/C4NetIO.h" +#include "netpuncher/C4PuncherPacket.h" #include "network/C4Client.h" #include "network/C4InteractiveThread.h" -#include "netpuncher/C4PuncherPacket.h" +#include "network/C4NetIO.h" #include diff --git a/src/network/C4Network2IRC.cpp b/src/network/C4Network2IRC.cpp index 1e017c3cd..87b23ec8d 100644 --- a/src/network/C4Network2IRC.cpp +++ b/src/network/C4Network2IRC.cpp @@ -17,13 +17,10 @@ #include "C4Include.h" #include "network/C4Network2IRC.h" -#include "game/C4Application.h" -#include "config/C4Config.h" #include "C4Version.h" -#include "network/C4InteractiveThread.h" +#include "game/C4Application.h" #include "gui/C4Gui.h" // for clearly visi - -#include // for isdigit +#include "network/C4InteractiveThread.h" // Helper for IRC command parameter parsing StdStrBuf ircExtractPar(const char **ppPar) diff --git a/src/network/C4Network2IRC.h b/src/network/C4Network2IRC.h index 5e9afdac5..dbdef3b67 100644 --- a/src/network/C4Network2IRC.h +++ b/src/network/C4Network2IRC.h @@ -17,7 +17,6 @@ #define C4NETWORK2IRC_H #include "network/C4NetIO.h" -#include enum C4Network2IRCMessageType { diff --git a/src/network/C4Network2Players.cpp b/src/network/C4Network2Players.cpp index 270e1c976..62de35ec4 100644 --- a/src/network/C4Network2Players.cpp +++ b/src/network/C4Network2Players.cpp @@ -20,14 +20,13 @@ #include "C4Include.h" #include "network/C4Network2Players.h" -#include "control/C4PlayerInfo.h" -#include "gui/C4GameLobby.h" -#include "game/C4Game.h" -#include "network/C4Network2.h" -#include "control/C4GameControl.h" -#include "control/C4RoundResults.h" #include "control/C4Control.h" +#include "control/C4GameControl.h" +#include "control/C4PlayerInfo.h" +#include "control/C4RoundResults.h" +#include "gui/C4GameLobby.h" +#include "network/C4Network2.h" // *** C4Network2Players diff --git a/src/network/C4Network2Reference.cpp b/src/network/C4Network2Reference.cpp index 7b4fc2913..2583e32af 100644 --- a/src/network/C4Network2Reference.cpp +++ b/src/network/C4Network2Reference.cpp @@ -16,13 +16,10 @@ #include "C4Include.h" #include "network/C4Network2Reference.h" -#include "game/C4Game.h" -#include "control/C4RoundResults.h" #include "C4Version.h" +#include "control/C4RoundResults.h" #include "game/C4Application.h" -#include -#include #include // *** C4Network2Reference diff --git a/src/network/C4Network2Reference.h b/src/network/C4Network2Reference.h index d807e419d..f2d539574 100644 --- a/src/network/C4Network2Reference.h +++ b/src/network/C4Network2Reference.h @@ -16,12 +16,12 @@ #ifndef C4NETWORK2REFERENCE_H #define C4NETWORK2REFERENCE_H -#include "network/C4Network2.h" -#include "network/C4Network2Client.h" -#include "control/C4GameParameters.h" #include "C4Version.h" +#include "control/C4GameParameters.h" #include "game/C4GameVersion.h" #include "lib/C4InputValidation.h" +#include "network/C4Network2.h" +#include "network/C4Network2Client.h" const int C4Network2HTTPQueryTimeout = 10; // (s) const uint32_t C4Network2HTTPHappyEyeballsTimeout = 300; // (ms) diff --git a/src/network/C4Network2Res.cpp b/src/network/C4Network2Res.cpp index 32992cf6a..a25698984 100644 --- a/src/network/C4Network2Res.cpp +++ b/src/network/C4Network2Res.cpp @@ -16,22 +16,17 @@ #include "C4Include.h" #include "network/C4Network2Res.h" -#include "game/C4Application.h" -#include "lib/C4Random.h" -#include "config/C4Config.h" -#include "lib/C4Log.h" -#include "c4group/C4Group.h" #include "c4group/C4Components.h" -#include "game/C4Game.h" +#include "c4group/C4Group.h" #include "control/C4GameControl.h" +#include "lib/C4Random.h" +#include "game/C4Application.h" -#include #include #include #ifdef _WIN32 #include #endif -#include #ifdef _MSC_VER #define snprintf _snprintf diff --git a/src/network/C4Network2ResDlg.cpp b/src/network/C4Network2ResDlg.cpp index 39b0d50d9..2ff2af8d7 100644 --- a/src/network/C4Network2ResDlg.cpp +++ b/src/network/C4Network2ResDlg.cpp @@ -18,13 +18,13 @@ #include "C4Include.h" #include "network/C4Network2Dialogs.h" -#include "game/C4Application.h" -#include "gui/C4GameLobby.h" -#include "game/C4FullScreen.h" -#include "network/C4Network2.h" #include "control/C4PlayerInfo.h" -#include "network/C4Network2Players.h" +#include "game/C4Application.h" +#include "game/C4FullScreen.h" #include "graphics/C4GraphicsResource.h" +#include "gui/C4GameLobby.h" +#include "network/C4Network2.h" +#include "network/C4Network2Players.h" // ----------- C4Network2ResDlg::ListItem ---------------------------------------------------------------- diff --git a/src/network/C4Network2Stats.cpp b/src/network/C4Network2Stats.cpp index 69033009d..4f9024a33 100644 --- a/src/network/C4Network2Stats.cpp +++ b/src/network/C4Network2Stats.cpp @@ -18,12 +18,11 @@ #include "C4Include.h" #include "network/C4Network2Stats.h" -#include "game/C4Game.h" +#include "control/C4GameControl.h" +#include "network/C4Network2.h" +#include "object/C4GameObjects.h" #include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" -#include "network/C4Network2.h" -#include "control/C4GameControl.h" C4Graph::C4Graph() : szTitle(LoadResStr("IDS_NET_GRAPH")), dwColor(0x7fff0000) diff --git a/src/network/C4Network2Stats.h b/src/network/C4Network2Stats.h index 2b1101448..44ee43c98 100644 --- a/src/network/C4Network2Stats.h +++ b/src/network/C4Network2Stats.h @@ -19,9 +19,6 @@ #define INC_C4Network2Stats #include "game/C4Application.h" -#include "lib/StdBuf.h" - -#include // (int) value by time function class C4Graph diff --git a/src/network/C4Network2UPnPLinux.cpp b/src/network/C4Network2UPnPLinux.cpp index 1a6fa4a49..8cad5b707 100644 --- a/src/network/C4Network2UPnPLinux.cpp +++ b/src/network/C4Network2UPnPLinux.cpp @@ -15,16 +15,16 @@ /* Linux implementation of a UPnP port mapper (using miniupnpc) */ #include "C4Include.h" -#include "game/C4Application.h" -#include "C4Version.h" +#include "network/C4Network2UPnP.h" -#include +#include "C4Version.h" +#include "game/C4Application.h" #include #include #include -#include "network/C4Network2UPnP.h" +#include static const char *description = "OpenClonk"; diff --git a/src/network/C4Packet2.cpp b/src/network/C4Packet2.cpp index 1cda7232f..f8ea6bd7b 100644 --- a/src/network/C4Packet2.cpp +++ b/src/network/C4Packet2.cpp @@ -15,13 +15,12 @@ */ #include "C4Include.h" - -#include "network/C4Network2Res.h" #include "C4Version.h" -#include "gui/C4GameLobby.h" -#include "network/C4Network2.h" #include "control/C4RoundResults.h" +#include "gui/C4GameLobby.h" #include "network/C4GameControlNetwork.h" +#include "network/C4Network2.h" +#include "network/C4Network2Res.h" // *** constants diff --git a/src/object/C4Command.cpp b/src/object/C4Command.cpp index d63ff4427..e2ad292ee 100644 --- a/src/object/C4Command.cpp +++ b/src/object/C4Command.cpp @@ -20,20 +20,19 @@ #include "C4Include.h" #include "object/C4Command.h" +#include "gui/C4GameMessage.h" +#include "landscape/C4Landscape.h" +#include "lib/C4Random.h" #include "object/C4Def.h" #include "object/C4DefList.h" +#include "object/C4GameObjects.h" #include "object/C4Object.h" #include "object/C4ObjectCom.h" #include "object/C4ObjectInfo.h" -#include "lib/C4Random.h" -#include "gui/C4GameMessage.h" #include "object/C4ObjectMenu.h" -#include "player/C4Player.h" #include "platform/C4SoundSystem.h" -#include "landscape/C4Landscape.h" -#include "game/C4Game.h" +#include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" const int32_t MoveToRange=5,LetGoRange1=7,LetGoRange2=30,DigRange=1; const int32_t FollowRange=6,PushToRange=10,DigOutPositionRange=15; diff --git a/src/object/C4Def.cpp b/src/object/C4Def.cpp index 084ba0bde..2983ddb2f 100644 --- a/src/object/C4Def.cpp +++ b/src/object/C4Def.cpp @@ -20,22 +20,20 @@ #include "C4Include.h" #include "C4ForbidLibraryCompilation.h" #include "object/C4Def.h" -#include "graphics/C4DrawGL.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" #include "c4group/C4Components.h" -#include "config/C4Config.h" -#include "platform/C4FileMonitor.h" -#include "c4group/C4Language.h" -#include "object/C4Object.h" -#include "player/C4RankSystem.h" -#include "platform/C4SoundSystem.h" -#include "landscape/C4SolidMask.h" -#include "landscape/C4Particles.h" +#include "graphics/C4Draw.h" +#include "graphics/C4DrawGL.h" +#include "graphics/C4GraphicsResource.h" #include "graphics/CSurface8.h" +#include "landscape/C4Particles.h" +#include "landscape/C4SolidMask.h" #include "lib/StdColors.h" #include "lib/StdMeshLoader.h" +#include "object/C4Object.h" +#include "platform/C4FileMonitor.h" +#include "platform/C4SoundSystem.h" +#include "player/C4RankSystem.h" // Helper class to load additional resources required for meshes from // a C4Group. diff --git a/src/object/C4Def.h b/src/object/C4Def.h index 47c8e136d..20663e942 100644 --- a/src/object/C4Def.h +++ b/src/object/C4Def.h @@ -20,21 +20,19 @@ #ifndef INC_C4Def #define INC_C4Def -#include "object/C4Shape.h" -#include "object/C4InfoCore.h" -#include "object/C4IDList.h" -#include "script/C4ValueMap.h" -#include "graphics/C4Facet.h" #include "c4group/C4ComponentHost.h" -#include "script/C4PropList.h" - -#include "script/C4ScriptHost.h" -#include "object/C4DefGraphics.h" #include "c4group/C4LangStringTable.h" +#include "graphics/C4Facet.h" #include "lib/C4InputValidation.h" +#include "object/C4DefGraphics.h" +#include "object/C4IDList.h" +#include "object/C4InfoCore.h" +#include "object/C4Shape.h" +#include "script/C4PropList.h" +#include "script/C4ScriptHost.h" +#include "script/C4ValueMap.h" #include -#include const int32_t C4D_None = 0, diff --git a/src/object/C4DefGraphics.cpp b/src/object/C4DefGraphics.cpp index 9237a0dd5..c53ecf56c 100644 --- a/src/object/C4DefGraphics.cpp +++ b/src/object/C4DefGraphics.cpp @@ -18,28 +18,24 @@ #include "C4Include.h" #include "object/C4DefGraphics.h" -#include "object/C4Def.h" -#include "object/C4DefList.h" -#include "object/C4Object.h" -#include "object/C4ObjectInfo.h" -#include "config/C4Config.h" #include "c4group/C4Components.h" #include "game/C4Application.h" -#include "game/C4Game.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "graphics/C4Surface.h" #include "gui/C4Menu.h" +#include "landscape/C4Material.h" +#include "lib/StdMeshLoader.h" +#include "object/C4Def.h" +#include "object/C4DefList.h" +#include "object/C4GameObjects.h" +#include "object/C4MeshAnimation.h" +#include "object/C4Object.h" +#include "object/C4ObjectInfo.h" #include "object/C4ObjectMenu.h" #include "player/C4Player.h" -#include "lib/C4Log.h" -#include "landscape/C4Material.h" #include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" #include "player/C4RankSystem.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "graphics/C4Surface.h" -#include "object/C4MeshAnimation.h" -#include "lib/StdMeshLoader.h" -#include "lib/StdMeshUpdate.h" //-------------------------------- C4DefGraphics ----------------------------------------------- diff --git a/src/object/C4DefGraphics.h b/src/object/C4DefGraphics.h index addef546a..69189f29e 100644 --- a/src/object/C4DefGraphics.h +++ b/src/object/C4DefGraphics.h @@ -19,10 +19,10 @@ #define INC_C4DefGraphics #include "graphics/C4Facet.h" -#include "object/C4ObjectPtr.h" #include "lib/C4InputValidation.h" #include "lib/StdMeshUpdate.h" #include "object/C4Id.h" +#include "object/C4ObjectPtr.h" // defintion graphics class C4AdditionalDefGraphics; diff --git a/src/object/C4DefList.cpp b/src/object/C4DefList.cpp index 32c1b50c7..4da55ea49 100644 --- a/src/object/C4DefList.cpp +++ b/src/object/C4DefList.cpp @@ -21,15 +21,12 @@ #include "object/C4DefList.h" #include "c4group/C4Components.h" -#include "config/C4Config.h" +#include "control/C4Record.h" +#include "game/C4GameScript.h" +#include "game/C4GameVersion.h" +#include "lib/StdMeshLoader.h" #include "object/C4Def.h" #include "platform/C4FileMonitor.h" -#include "game/C4GameVersion.h" -#include "c4group/C4Language.h" -#include "game/C4GameScript.h" -#include "control/C4Record.h" - -#include "lib/StdMeshLoader.h" namespace { diff --git a/src/object/C4FindObject.cpp b/src/object/C4FindObject.cpp index 0d027157e..b846ee500 100644 --- a/src/object/C4FindObject.cpp +++ b/src/object/C4FindObject.cpp @@ -16,13 +16,12 @@ #include "C4Include.h" #include "object/C4FindObject.h" +#include "lib/C4Random.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "object/C4Object.h" -#include "game/C4Game.h" -#include "lib/C4Random.h" -#include "player/C4PlayerList.h" #include "object/C4GameObjects.h" +#include "object/C4Object.h" +#include "player/C4PlayerList.h" // *** C4FindObject diff --git a/src/object/C4FindObject.h b/src/object/C4FindObject.h index 30599d8c0..6b44ab166 100644 --- a/src/object/C4FindObject.h +++ b/src/object/C4FindObject.h @@ -16,8 +16,8 @@ #ifndef C4FINDOBJECT_H #define C4FINDOBJECT_H -#include "script/C4Value.h" #include "lib/C4Rect.h" +#include "script/C4Value.h" // Condition map enum C4FindObjectCondID diff --git a/src/object/C4GameObjects.cpp b/src/object/C4GameObjects.cpp index 11bd4b17d..ee3f96749 100644 --- a/src/object/C4GameObjects.cpp +++ b/src/object/C4GameObjects.cpp @@ -19,17 +19,15 @@ #include "C4Include.h" #include "object/C4GameObjects.h" -#include "script/C4Effect.h" -#include "object/C4Def.h" -#include "object/C4Object.h" -#include "object/C4ObjectCom.h" +#include "control/C4Record.h" #include "game/C4Physics.h" #include "lib/C4Random.h" #include "network/C4Network2Stats.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" +#include "object/C4Def.h" +#include "object/C4Object.h" +#include "object/C4ObjectCom.h" #include "player/C4PlayerList.h" -#include "control/C4Record.h" +#include "script/C4Effect.h" C4GameObjects::C4GameObjects() { diff --git a/src/object/C4GameObjects.h b/src/object/C4GameObjects.h index 97f22171b..4a016cc89 100644 --- a/src/object/C4GameObjects.h +++ b/src/object/C4GameObjects.h @@ -18,8 +18,8 @@ #ifndef INC_C4GameObjects #define INC_C4GameObjects -#include "object/C4ObjectList.h" #include "object/C4FindObject.h" +#include "object/C4ObjectList.h" #include "object/C4Sector.h" // main object list class diff --git a/src/object/C4IDList.cpp b/src/object/C4IDList.cpp index 5df67b2d2..9df744358 100644 --- a/src/object/C4IDList.cpp +++ b/src/object/C4IDList.cpp @@ -20,10 +20,10 @@ #include "C4Include.h" #include "object/C4IDList.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" C4IDListChunk::C4IDListChunk() { diff --git a/src/object/C4Id.cpp b/src/object/C4Id.cpp index 5c9e1c34a..805e404ea 100644 --- a/src/object/C4Id.cpp +++ b/src/object/C4Id.cpp @@ -19,9 +19,8 @@ #include "C4Include.h" #include "object/C4Id.h" -#include "lib/StdCompiler.h" -#include +#include "lib/StdCompiler.h" C4ID::NamesList C4ID::names; C4ID::LookupTable C4ID::lookup; diff --git a/src/object/C4Id.h b/src/object/C4Id.h index 6eba0e352..c013f3c5b 100644 --- a/src/object/C4Id.h +++ b/src/object/C4Id.h @@ -21,9 +21,6 @@ #define INC_C4Id #include "lib/StdAdaptors.h" -#include -#include -#include class C4ID { diff --git a/src/object/C4InfoCore.cpp b/src/object/C4InfoCore.cpp index cd44a6a1e..25833e1ef 100644 --- a/src/object/C4InfoCore.cpp +++ b/src/object/C4InfoCore.cpp @@ -20,17 +20,14 @@ #include "C4Include.h" #include "object/C4InfoCore.h" +#include "c4group/C4Components.h" +#include "c4group/C4Group.h" +#include "lib/C4Markup.h" +#include "lib/C4Random.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "lib/C4Random.h" -#include "lib/C4Markup.h" -#include "player/C4RankSystem.h" -#include "c4group/C4Group.h" -#include "c4group/C4Components.h" -#include "game/C4Game.h" #include "object/C4GameObjects.h" - -#include "lib/C4Random.h" +#include "player/C4RankSystem.h" //------------------------------- Player Info ---------------------------------------- diff --git a/src/object/C4InfoCore.h b/src/object/C4InfoCore.h index 8d740b457..29336bcfc 100644 --- a/src/object/C4InfoCore.h +++ b/src/object/C4InfoCore.h @@ -20,11 +20,10 @@ #ifndef INC_C4InfoCore #define INC_C4InfoCore -#include "object/C4Id.h" -#include "script/C4ValueMap.h" -#include "lib/C4Real.h" #include "lib/C4InputValidation.h" +#include "object/C4Id.h" #include "player/C4ScenarioParameters.h" +#include "script/C4ValueMap.h" const int32_t C4MaxPhysical = 100000, C4MaxDeathMsg = 75; diff --git a/src/object/C4MeshAnimation.cpp b/src/object/C4MeshAnimation.cpp index 45b99f718..e4fdeec09 100644 --- a/src/object/C4MeshAnimation.cpp +++ b/src/object/C4MeshAnimation.cpp @@ -15,11 +15,11 @@ */ #include "C4Include.h" -#include "script/C4Aul.h" #include "object/C4MeshAnimation.h" + #include "object/C4Object.h" +#include "script/C4Aul.h" #include "script/C4ValueArray.h" -#include "game/C4Game.h" namespace { diff --git a/src/object/C4MeshDenumerator.cpp b/src/object/C4MeshDenumerator.cpp index 94058a944..136824117 100644 --- a/src/object/C4MeshDenumerator.cpp +++ b/src/object/C4MeshDenumerator.cpp @@ -17,8 +17,9 @@ #include "C4Include.h" #include "object/C4MeshDenumerator.h" -#include "object/C4Object.h" + #include "object/C4Def.h" +#include "object/C4Object.h" const StdMeshInstance::AttachedMesh::DenumeratorFactoryFunc C4MeshDenumeratorFactory = StdMeshInstance::AttachedMesh::DenumeratorFactory; diff --git a/src/object/C4Movement.cpp b/src/object/C4Movement.cpp index c32e5a699..5cdb0d2d4 100644 --- a/src/object/C4Movement.cpp +++ b/src/object/C4Movement.cpp @@ -18,14 +18,13 @@ /* Object motion, collision, friction */ #include "C4Include.h" + +#include "game/C4Physics.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4SolidMask.h" #include "object/C4Def.h" #include "object/C4Object.h" - #include "script/C4Effect.h" -#include "game/C4Physics.h" -#include "landscape/C4SolidMask.h" -#include "landscape/C4Landscape.h" -#include "game/C4Game.h" /* Some physical constants */ diff --git a/src/object/C4Object.cpp b/src/object/C4Object.cpp index 20d647f18..654945a10 100644 --- a/src/object/C4Object.cpp +++ b/src/object/C4Object.cpp @@ -21,38 +21,35 @@ #include "C4ForbidLibraryCompilation.h" #include "object/C4Object.h" -#include "script/C4AulExec.h" +#include "control/C4Record.h" +#include "game/C4Application.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Physics.h" +#include "game/C4Viewport.h" +#include "graphics/C4Draw.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4GameMessage.h" +#include "landscape/C4MaterialList.h" +#include "landscape/C4PXS.h" +#include "landscape/C4Particles.h" +#include "landscape/C4SolidMask.h" +#include "landscape/fow/C4FoW.h" +#include "lib/C4Random.h" +#include "object/C4Command.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "script/C4Effect.h" -#include "object/C4ObjectInfo.h" -#include "game/C4Physics.h" -#include "landscape/C4PXS.h" -#include "object/C4ObjectCom.h" -#include "object/C4Command.h" -#include "game/C4Viewport.h" -#include "landscape/C4MaterialList.h" -#include "control/C4Record.h" -#include "landscape/C4SolidMask.h" -#include "platform/C4SoundSystem.h" -#include "lib/C4Random.h" -#include "lib/C4Log.h" -#include "player/C4Player.h" -#include "object/C4ObjectMenu.h" -#include "player/C4RankSystem.h" -#include "gui/C4GameMessage.h" -#include "graphics/C4GraphicsResource.h" -#include "graphics/C4Draw.h" -#include "game/C4GraphicsSystem.h" -#include "game/C4Game.h" -#include "game/C4Application.h" -#include "player/C4PlayerList.h" #include "object/C4GameObjects.h" -#include "control/C4Record.h" #include "object/C4MeshAnimation.h" #include "object/C4MeshDenumerator.h" -#include "landscape/fow/C4FoW.h" -#include "landscape/C4Particles.h" +#include "object/C4ObjectCom.h" +#include "object/C4ObjectInfo.h" +#include "object/C4ObjectMenu.h" +#include "platform/C4SoundSystem.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" +#include "player/C4RankSystem.h" +#include "script/C4AulExec.h" +#include "script/C4Effect.h" static void DrawVertex(C4Facet &cgo, float tx, float ty, int32_t col, int32_t contact) { diff --git a/src/object/C4ObjectCom.cpp b/src/object/C4ObjectCom.cpp index d1e923ba2..88ecd9e25 100644 --- a/src/object/C4ObjectCom.cpp +++ b/src/object/C4ObjectCom.cpp @@ -20,20 +20,19 @@ #include "C4Include.h" #include "object/C4ObjectCom.h" -#include "script/C4Effect.h" -#include "object/C4Def.h" -#include "object/C4Object.h" #include "game/C4Physics.h" -#include "object/C4Command.h" -#include "lib/C4Random.h" +#include "graphics/C4GraphicsResource.h" #include "gui/C4GameMessage.h" +#include "landscape/C4Material.h" +#include "lib/C4Random.h" +#include "object/C4Command.h" +#include "object/C4Def.h" +#include "object/C4GameObjects.h" +#include "object/C4Object.h" #include "object/C4ObjectMenu.h" #include "player/C4Player.h" -#include "graphics/C4GraphicsResource.h" -#include "landscape/C4Material.h" -#include "game/C4Game.h" #include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" +#include "script/C4Effect.h" bool SimFlightHitsLiquid(C4Real fcx, C4Real fcy, C4Real xdir, C4Real ydir); diff --git a/src/object/C4ObjectCom.h b/src/object/C4ObjectCom.h index 3e51e0c82..e102ea947 100644 --- a/src/object/C4ObjectCom.h +++ b/src/object/C4ObjectCom.h @@ -20,8 +20,6 @@ #ifndef INC_C4ObjectCom #define INC_C4ObjectCom -#include "lib/C4Real.h" - bool ComDirLike(int32_t iComDir, int32_t iSample); bool ObjectActionWalk(C4Object *cObj); diff --git a/src/object/C4ObjectInfo.cpp b/src/object/C4ObjectInfo.cpp index 969deb911..b7d0a609e 100644 --- a/src/object/C4ObjectInfo.cpp +++ b/src/object/C4ObjectInfo.cpp @@ -20,18 +20,15 @@ #include "C4Include.h" #include "object/C4ObjectInfo.h" +#include "c4group/C4Components.h" +#include "game/C4Application.h" +#include "graphics/C4GraphicsResource.h" +#include "lib/C4Random.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "lib/C4Random.h" -#include "c4group/C4Components.h" -#include "game/C4Game.h" -#include "config/C4Config.h" -#include "game/C4Application.h" -#include "player/C4RankSystem.h" -#include "lib/C4Log.h" #include "player/C4Player.h" -#include "graphics/C4GraphicsResource.h" #include "player/C4PlayerList.h" +#include "player/C4RankSystem.h" #ifdef _MSC_VER #define snprintf _snprintf diff --git a/src/object/C4ObjectInfo.h b/src/object/C4ObjectInfo.h index 913e7b9d4..dfae22d6b 100644 --- a/src/object/C4ObjectInfo.h +++ b/src/object/C4ObjectInfo.h @@ -20,10 +20,10 @@ #ifndef INC_C4ObjectInfo #define INC_C4ObjectInfo +#include "graphics/C4FacetEx.h" #include "graphics/C4Surface.h" #include "object/C4InfoCore.h" #include "object/C4Object.h" -#include "graphics/C4FacetEx.h" class C4ObjectInfo: public C4ObjectInfoCore { diff --git a/src/object/C4ObjectInfoList.cpp b/src/object/C4ObjectInfoList.cpp index 5c12e5902..13344c48a 100644 --- a/src/object/C4ObjectInfoList.cpp +++ b/src/object/C4ObjectInfoList.cpp @@ -20,14 +20,12 @@ #include "C4Include.h" #include "object/C4ObjectInfoList.h" +#include "c4group/C4Components.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "object/C4ObjectInfo.h" -#include "c4group/C4Components.h" -#include "game/C4Game.h" -#include "player/C4RankSystem.h" -#include "config/C4Config.h" #include "object/C4GameObjects.h" +#include "object/C4ObjectInfo.h" +#include "player/C4RankSystem.h" C4ObjectInfoList::C4ObjectInfoList() { diff --git a/src/object/C4ObjectList.cpp b/src/object/C4ObjectList.cpp index 5ccb0c87f..35a347c5a 100644 --- a/src/object/C4ObjectList.cpp +++ b/src/object/C4ObjectList.cpp @@ -20,13 +20,12 @@ #include "C4Include.h" #include "object/C4ObjectList.h" -#include "object/C4Def.h" -#include "object/C4DefList.h" -#include "object/C4Object.h" #include "game/C4Application.h" #include "graphics/C4GraphicsResource.h" -#include "game/C4Game.h" +#include "object/C4Def.h" +#include "object/C4DefList.h" #include "object/C4GameObjects.h" +#include "object/C4Object.h" static const C4ObjectLink NULL_LINK = { nullptr, nullptr, nullptr }; diff --git a/src/object/C4ObjectMenu.cpp b/src/object/C4ObjectMenu.cpp index 6a4e6caea..5f06ea2c5 100644 --- a/src/object/C4ObjectMenu.cpp +++ b/src/object/C4ObjectMenu.cpp @@ -20,16 +20,15 @@ #include "object/C4ObjectMenu.h" #include "control/C4Control.h" +#include "game/C4Viewport.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" #include "object/C4Def.h" +#include "object/C4GameObjects.h" #include "object/C4Object.h" #include "object/C4ObjectCom.h" #include "player/C4Player.h" -#include "game/C4Viewport.h" -#include "gui/C4MouseControl.h" -#include "graphics/C4GraphicsResource.h" -#include "game/C4Game.h" #include "player/C4PlayerList.h" -#include "object/C4GameObjects.h" #include "script/C4AulExec.h" // ----------------------------------------------------------- diff --git a/src/object/C4ObjectPtr.cpp b/src/object/C4ObjectPtr.cpp index dd4924205..45ddacde2 100644 --- a/src/object/C4ObjectPtr.cpp +++ b/src/object/C4ObjectPtr.cpp @@ -17,8 +17,9 @@ #include "C4Include.h" #include "object/C4ObjectPtr.h" -#include "object/C4Object.h" + #include "object/C4GameObjects.h" +#include "object/C4Object.h" #include diff --git a/src/object/C4ObjectScript.cpp b/src/object/C4ObjectScript.cpp index 55f4902f1..ba7a2992e 100644 --- a/src/object/C4ObjectScript.cpp +++ b/src/object/C4ObjectScript.cpp @@ -18,26 +18,26 @@ #include "C4Include.h" #include "C4ForbidLibraryCompilation.h" -#include "script/C4Aul.h" -#include "script/C4AulDefFunc.h" -#include "object/C4Command.h" -#include "object/C4DefList.h" +#include "control/C4Teams.h" #include "graphics/C4Draw.h" -#include "gui/C4GameMessage.h" #include "graphics/C4GraphicsResource.h" +#include "gui/C4GameMessage.h" #include "landscape/C4Material.h" #include "landscape/C4Particles.h" +#include "lib/C4Random.h" +#include "lib/StdMeshMath.h" +#include "object/C4Command.h" +#include "object/C4DefList.h" #include "object/C4MeshAnimation.h" +#include "object/C4MeshDenumerator.h" #include "object/C4ObjectCom.h" #include "object/C4ObjectInfo.h" #include "object/C4ObjectMenu.h" #include "player/C4Player.h" #include "player/C4PlayerList.h" -#include "lib/C4Random.h" #include "player/C4RankSystem.h" -#include "control/C4Teams.h" -#include "lib/StdMeshMath.h" -#include "object/C4MeshDenumerator.h" +#include "script/C4Aul.h" +#include "script/C4AulDefFunc.h" bool C4ValueToMatrix(C4Value& value, StdMeshMatrix* matrix) { diff --git a/src/object/C4Sector.cpp b/src/object/C4Sector.cpp index 7f6fff46d..169444d27 100644 --- a/src/object/C4Sector.cpp +++ b/src/object/C4Sector.cpp @@ -18,11 +18,9 @@ #include "C4Include.h" #include "object/C4Sector.h" -#include "game/C4Game.h" -#include "object/C4Object.h" -#include "lib/C4Log.h" #include "control/C4Record.h" #include "object/C4GameObjects.h" +#include "object/C4Object.h" /* sector */ diff --git a/src/object/C4Sector.h b/src/object/C4Sector.h index b10ca352c..5043c8f9a 100644 --- a/src/object/C4Sector.h +++ b/src/object/C4Sector.h @@ -19,8 +19,8 @@ #ifndef INC_C4Sector #define INC_C4Sector -#include "object/C4ObjectList.h" #include "lib/C4Rect.h" +#include "object/C4ObjectList.h" // class predefs class C4LSector; diff --git a/src/object/C4Shape.cpp b/src/object/C4Shape.cpp index 37e40c3a0..07c830e3a 100644 --- a/src/object/C4Shape.cpp +++ b/src/object/C4Shape.cpp @@ -20,10 +20,10 @@ #include "C4Include.h" #include "object/C4Shape.h" -#include "game/C4Physics.h" -#include "landscape/C4Material.h" -#include "landscape/C4Landscape.h" #include "control/C4Record.h" +#include "game/C4Physics.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4Material.h" bool C4Shape::AddVertex(int32_t iX, int32_t iY) { diff --git a/src/platform/C4AppDelegate.h b/src/platform/C4AppDelegate.h index 03aa272b4..a7bf59154 100644 --- a/src/platform/C4AppDelegate.h +++ b/src/platform/C4AppDelegate.h @@ -20,8 +20,6 @@ Feel free to customize this file to suit your needs */ -#include - #include "C4Include.h" #include "gui/C4KeyboardInput.h" diff --git a/src/platform/C4AppMac.mm b/src/platform/C4AppMac.mm index 07963a50e..6a0261d34 100644 --- a/src/platform/C4AppMac.mm +++ b/src/platform/C4AppMac.mm @@ -18,7 +18,6 @@ #include "C4ForbidLibraryCompilation.h" #include -#include #include "C4Include.h" #include "platform/C4Window.h" diff --git a/src/platform/C4AppSDL.cpp b/src/platform/C4AppSDL.cpp index c5c3b0de9..afdcd6790 100644 --- a/src/platform/C4AppSDL.cpp +++ b/src/platform/C4AppSDL.cpp @@ -19,15 +19,13 @@ #include "C4Include.h" #include "platform/C4App.h" -#include "platform/C4Window.h" -#include "graphics/C4DrawGL.h" -#include "platform/StdFile.h" -#include "lib/StdBuf.h" -#include "gui/C4MouseControl.h" -#include "game/C4Application.h" -#include "gui/C4Gui.h" -#include "platform/C4GamePadCon.h" #include "C4Version.h" +#include "game/C4Application.h" +#include "graphics/C4DrawGL.h" +#include "gui/C4Gui.h" +#include "gui/C4MouseControl.h" +#include "platform/C4GamePadCon.h" +#include "platform/C4Window.h" static void sdlToC4MCBtn(const SDL_MouseButtonEvent &e, int32_t& button, DWORD& flags) { diff --git a/src/platform/C4AppT.cpp b/src/platform/C4AppT.cpp index 6b0743f29..3aa86a29b 100644 --- a/src/platform/C4AppT.cpp +++ b/src/platform/C4AppT.cpp @@ -19,9 +19,9 @@ #include "C4Include.h" #include "platform/C4App.h" -#include "platform/C4Window.h" -#include "graphics/C4Draw.h" #include "game/C4Application.h" +#include "graphics/C4Draw.h" +#include "platform/C4Window.h" /* C4AbstractApp */ diff --git a/src/platform/C4CrashHandlerWin32.cpp b/src/platform/C4CrashHandlerWin32.cpp index 7c25a71ac..0bfba932c 100644 --- a/src/platform/C4CrashHandlerWin32.cpp +++ b/src/platform/C4CrashHandlerWin32.cpp @@ -25,13 +25,8 @@ #include "C4Version.h" #include "platform/C4windowswrapper.h" #include -#include -#include #include -#ifdef HAVE_INTTYPES_H #include -#endif -#include #if defined(__CRT_WIDE) || (defined(_MSC_VER) && _MSC_VER >= 1900) #define USE_WIDE_ASSERT #endif diff --git a/src/platform/C4FileMonitor.cpp b/src/platform/C4FileMonitor.cpp index 89da347f5..7c502565f 100644 --- a/src/platform/C4FileMonitor.cpp +++ b/src/platform/C4FileMonitor.cpp @@ -18,13 +18,11 @@ #include "C4Include.h" #include "platform/C4FileMonitor.h" -#include "game/C4Application.h" -#include "platform/StdFile.h" +#include "game/C4Application.h" #ifdef HAVE_SYS_INOTIFY_H #include -#include C4FileMonitor::C4FileMonitor(ChangeNotify pCallback): fStarted(false), pCallback(pCallback) { diff --git a/src/platform/C4FileMonitor.h b/src/platform/C4FileMonitor.h index e74d71a82..ce86fafec 100644 --- a/src/platform/C4FileMonitor.h +++ b/src/platform/C4FileMonitor.h @@ -19,9 +19,8 @@ #ifndef STD_FILE_MONITOR_H_INC #define STD_FILE_MONITOR_H_INC -#include "platform/StdScheduler.h" #include "network/C4InteractiveThread.h" -#include +#include "platform/StdScheduler.h" #ifdef __APPLE__ #import diff --git a/src/platform/C4FileMonitorMac.mm b/src/platform/C4FileMonitorMac.mm index 9a4772f32..6df95c6c1 100644 --- a/src/platform/C4FileMonitorMac.mm +++ b/src/platform/C4FileMonitorMac.mm @@ -17,9 +17,8 @@ #include "C4Include.h" #include "platform/C4FileMonitor.h" -#include "game/C4Application.h" -#include "platform/StdFile.h" +#include "game/C4Application.h" #import diff --git a/src/platform/C4GamePadCon.cpp b/src/platform/C4GamePadCon.cpp index 6e19cf46b..0792ce2c6 100644 --- a/src/platform/C4GamePadCon.cpp +++ b/src/platform/C4GamePadCon.cpp @@ -21,11 +21,8 @@ #include "C4ForbidLibraryCompilation.h" #include "platform/C4GamePadCon.h" -#include "config/C4Config.h" -#include "object/C4ObjectCom.h" -#include "lib/C4Log.h" #include "game/C4Application.h" -#include "game/C4Game.h" +#include "object/C4ObjectCom.h" #if defined(HAVE_SDL) && !defined(USE_CONSOLE) diff --git a/src/platform/C4GamePadCon.h b/src/platform/C4GamePadCon.h index a1bb0fd53..6f2ab3f3d 100644 --- a/src/platform/C4GamePadCon.h +++ b/src/platform/C4GamePadCon.h @@ -20,12 +20,8 @@ #ifndef INC_C4GamePadCon #define INC_C4GamePadCon -#include - #ifdef HAVE_SDL #include "gui/C4KeyboardInput.h" -#include -#include #include #endif diff --git a/src/platform/C4MusicFile.cpp b/src/platform/C4MusicFile.cpp index d850fff81..3d49cfa77 100644 --- a/src/platform/C4MusicFile.cpp +++ b/src/platform/C4MusicFile.cpp @@ -19,7 +19,6 @@ #include "platform/C4MusicFile.h" #include "game/C4Application.h" -#include "lib/C4Log.h" #if AUDIO_TK == AUDIO_TK_OPENAL #if defined(__APPLE__) diff --git a/src/platform/C4MusicSystem.cpp b/src/platform/C4MusicSystem.cpp index 731066673..4aa5df764 100644 --- a/src/platform/C4MusicSystem.cpp +++ b/src/platform/C4MusicSystem.cpp @@ -20,13 +20,11 @@ #include "C4Include.h" #include "platform/C4MusicSystem.h" -#include "platform/C4Window.h" -#include "platform/C4MusicFile.h" #include "game/C4Application.h" -#include "lib/C4Random.h" -#include "lib/C4Log.h" -#include "game/C4Game.h" #include "game/C4GraphicsSystem.h" +#include "lib/C4Random.h" +#include "platform/C4MusicFile.h" +#include "platform/C4Window.h" C4MusicSystem::C4MusicSystem(): Songs(nullptr), diff --git a/src/platform/C4SoundInstance.cpp b/src/platform/C4SoundInstance.cpp index 2df276679..e392ccc4c 100644 --- a/src/platform/C4SoundInstance.cpp +++ b/src/platform/C4SoundInstance.cpp @@ -20,12 +20,10 @@ #include "C4Include.h" #include "platform/C4SoundInstance.h" -#include "lib/C4Random.h" -#include "object/C4Object.h" -#include "game/C4Game.h" -#include "config/C4Config.h" #include "game/C4Application.h" #include "game/C4Viewport.h" +#include "lib/C4Random.h" +#include "object/C4Object.h" #include "platform/C4SoundIncludes.h" #include "platform/C4SoundLoaders.h" diff --git a/src/platform/C4SoundInstance.h b/src/platform/C4SoundInstance.h index 76af9bb7e..0c09e0216 100644 --- a/src/platform/C4SoundInstance.h +++ b/src/platform/C4SoundInstance.h @@ -17,8 +17,6 @@ /* Helper classes for individual sounds and effects in sound system. */ -#include "C4Include.h" - #include "platform/C4SoundSystem.h" class C4Object; diff --git a/src/platform/C4SoundLoaders.cpp b/src/platform/C4SoundLoaders.cpp index cbed9f695..4632dd462 100644 --- a/src/platform/C4SoundLoaders.cpp +++ b/src/platform/C4SoundLoaders.cpp @@ -16,9 +16,9 @@ #include "C4Include.h" #include "platform/C4SoundLoaders.h" -#include "platform/C4MusicFile.h" #include "game/C4Application.h" +#include "platform/C4MusicFile.h" using namespace C4SoundLoaders; diff --git a/src/platform/C4SoundLoaders.h b/src/platform/C4SoundLoaders.h index c94e85842..b7141fc43 100644 --- a/src/platform/C4SoundLoaders.h +++ b/src/platform/C4SoundLoaders.h @@ -16,7 +16,6 @@ #ifndef INC_C4SoundLoaders #define INC_C4SoundLoaders -#include #include "platform/C4SoundIncludes.h" #include "platform/C4SoundSystem.h" diff --git a/src/platform/C4SoundModifiers.cpp b/src/platform/C4SoundModifiers.cpp index c6bbc1495..2ae2086e2 100644 --- a/src/platform/C4SoundModifiers.cpp +++ b/src/platform/C4SoundModifiers.cpp @@ -19,10 +19,10 @@ #include "C4Include.h" #include "platform/C4SoundModifiers.h" -#include "platform/C4SoundSystem.h" -#include "platform/C4SoundInstance.h" -#include "platform/C4SoundIncludes.h" + #include "game/C4Application.h" +#include "platform/C4SoundInstance.h" +#include "platform/C4SoundSystem.h" #include "script/C4Value.h" #if (AUDIO_TK == AUDIO_TK_OPENAL) && defined(HAVE_ALEXT) diff --git a/src/platform/C4SoundSystem.cpp b/src/platform/C4SoundSystem.cpp index 3727df8f3..eda0af239 100644 --- a/src/platform/C4SoundSystem.cpp +++ b/src/platform/C4SoundSystem.cpp @@ -20,14 +20,12 @@ #include "C4Include.h" #include "platform/C4SoundSystem.h" -#include "platform/C4SoundInstance.h" #include "lib/C4Random.h" -#include "object/C4Object.h" -#include "game/C4Game.h" -#include "config/C4Config.h" #include "game/C4Application.h" #include "game/C4Viewport.h" +#include "object/C4Object.h" #include "platform/C4SoundIncludes.h" +#include "platform/C4SoundInstance.h" #include "platform/C4SoundLoaders.h" C4SoundSystem::C4SoundSystem(): diff --git a/src/platform/C4Window.h b/src/platform/C4Window.h index 852e363bb..ad2eb847b 100644 --- a/src/platform/C4Window.h +++ b/src/platform/C4Window.h @@ -20,7 +20,6 @@ #define INC_STDWINDOW #include "C4ForbidLibraryCompilation.h" -#include "lib/StdBuf.h" #if defined(USE_SDL_MAINLOOP) #include @@ -45,10 +44,6 @@ extern int MK_ALT; #endif #endif -#ifdef USE_SDL_MAINLOOP -#include -#endif - #if defined(USE_WIN32_WINDOWS) || defined(USE_CONSOLE) || defined(USE_SDL_MAINLOOP) #define K_ESCAPE 1 #define K_1 2 diff --git a/src/platform/C4WindowSDL.cpp b/src/platform/C4WindowSDL.cpp index 7d4e65104..91b5e029c 100644 --- a/src/platform/C4WindowSDL.cpp +++ b/src/platform/C4WindowSDL.cpp @@ -19,17 +19,13 @@ #include "C4Include.h" #include "platform/C4Window.h" -#include "game/C4Application.h" -#include "graphics/C4DrawGL.h" -#include "editor/C4Console.h" -#include "editor/C4ViewportWindow.h" -#include "gui/C4Gui.h" -#include "platform/StdFile.h" -#include "lib/StdBuf.h" - #include "C4Version.h" #include "lib/C4Rect.h" -#include "config/C4Config.h" +#include "editor/C4Console.h" +#include "editor/C4ViewportWindow.h" +#include "game/C4Application.h" +#include "graphics/C4DrawGL.h" +#include "gui/C4Gui.h" #ifdef SDL_VIDEO_DRIVER_X11 #include diff --git a/src/platform/C4WindowWin32.cpp b/src/platform/C4WindowWin32.cpp index e913a490b..403b2cfdb 100644 --- a/src/platform/C4WindowWin32.cpp +++ b/src/platform/C4WindowWin32.cpp @@ -21,18 +21,17 @@ #include "C4ForbidLibraryCompilation.h" #include "platform/C4Window.h" -#include "game/C4Application.h" -#include "platform/C4AppWin32Impl.h" -#include "config/C4Config.h" +#include "C4Version.h" #include "editor/C4Console.h" -#include "graphics/C4DrawGL.h" +#include "editor/C4ViewportWindow.h" +#include "game/C4Application.h" #include "game/C4FullScreen.h" #include "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "graphics/C4DrawGL.h" #include "gui/C4MouseControl.h" #include "lib/C4Rect.h" -#include "C4Version.h" -#include "game/C4Viewport.h" -#include "editor/C4ViewportWindow.h" +#include "platform/C4AppWin32Impl.h" #include "platform/StdRegistry.h" #include "res/resource.h" diff --git a/src/platform/StdFile.cpp b/src/platform/StdFile.cpp index a7746a7bb..9a1610489 100644 --- a/src/platform/StdFile.cpp +++ b/src/platform/StdFile.cpp @@ -19,29 +19,19 @@ #include "C4Include.h" #include "platform/StdFile.h" -#include "lib/StdBuf.h" -#include #ifdef HAVE_IO_H #include #endif #ifdef HAVE_DIRECT_H #include #endif -#ifdef HAVE_UNISTD_H -#include -#endif #ifdef _WIN32 #include "platform/C4windowswrapper.h" #endif -#include -#include -#include -#include #include #include #include -#include /* Path & Filename */ #ifdef _WIN32 diff --git a/src/platform/StdRegistry.cpp b/src/platform/StdRegistry.cpp index f926fae04..8a5ddf929 100644 --- a/src/platform/StdRegistry.cpp +++ b/src/platform/StdRegistry.cpp @@ -21,8 +21,6 @@ #include "platform/StdRegistry.h" #ifdef _WIN32 -#include "platform/C4windowswrapper.h" -#include StdCopyStrBuf GetRegistryString(const char *szSubKey, const char *szValueName) { diff --git a/src/platform/StdScheduler.cpp b/src/platform/StdScheduler.cpp index 69e2f5f49..c11feb21f 100644 --- a/src/platform/StdScheduler.cpp +++ b/src/platform/StdScheduler.cpp @@ -16,14 +16,6 @@ #include "C4Include.h" #include "platform/StdScheduler.h" -#include - -#include -#include -#include - -#include - #ifdef HAVE_IO_H #include #endif @@ -31,11 +23,6 @@ #include #endif -#ifdef HAVE_UNISTD_H -// For pipe() -#include -#endif - #ifdef _WIN32 #include #endif diff --git a/src/platform/StdScheduler.h b/src/platform/StdScheduler.h index 7024ff0ec..c825cb576 100644 --- a/src/platform/StdScheduler.h +++ b/src/platform/StdScheduler.h @@ -33,7 +33,6 @@ struct pollfd; #else // _WIN32 #ifdef HAVE_POLL_H #include -#include #else // HAVE_POLL_H #include #endif // HAVE_POLL_H @@ -45,9 +44,6 @@ struct pollfd; #endif #endif // _WIN32 - -#include - typedef struct _GMainLoop GMainLoop; // Abstract class for a process diff --git a/src/platform/StdSchedulerPoll.cpp b/src/platform/StdSchedulerPoll.cpp index 7b26fd3d8..b5cc90140 100644 --- a/src/platform/StdSchedulerPoll.cpp +++ b/src/platform/StdSchedulerPoll.cpp @@ -18,20 +18,12 @@ #include "platform/StdScheduler.h" #ifdef HAVE_POLL_H -#include -#include -#include -#include #ifdef HAVE_IO_H #include #endif #ifdef HAVE_SHARE_H #include #endif -#ifdef HAVE_UNISTD_H -#include -#endif -#include // Is this process currently signaled? bool StdSchedulerProc::IsSignaled() diff --git a/src/player/C4Achievement.cpp b/src/player/C4Achievement.cpp index f73823902..768b0a04f 100644 --- a/src/player/C4Achievement.cpp +++ b/src/player/C4Achievement.cpp @@ -14,10 +14,10 @@ */ #include "C4Include.h" #include "player/C4Achievement.h" + #include "c4group/C4Components.h" #include "graphics/C4FacetEx.h" - /* C4AchievementGraphics */ bool C4AchievementGraphics::Init(C4Group &File) diff --git a/src/player/C4Player.cpp b/src/player/C4Player.cpp index 61ecb75ae..22760247e 100644 --- a/src/player/C4Player.cpp +++ b/src/player/C4Player.cpp @@ -20,31 +20,29 @@ #include "C4Include.h" #include "player/C4Player.h" +#include "control/C4GameControl.h" #include "game/C4Application.h" -#include "object/C4Def.h" -#include "object/C4DefList.h" -#include "object/C4Object.h" -#include "object/C4ObjectInfo.h" -#include "object/C4Command.h" +#include "game/C4FullScreen.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4GameMessage.h" +#include "gui/C4GameOverDlg.h" +#include "gui/C4MessageInput.h" +#include "gui/C4MouseControl.h" +#include "landscape/C4Landscape.h" +#include "lib/C4Random.h" #include "network/C4League.h" #include "network/C4Network2Stats.h" -#include "gui/C4MessageInput.h" -#include "platform/C4GamePadCon.h" -#include "lib/C4Random.h" -#include "lib/C4Log.h" -#include "game/C4FullScreen.h" -#include "gui/C4GameOverDlg.h" -#include "object/C4ObjectMenu.h" -#include "gui/C4MouseControl.h" -#include "gui/C4GameMessage.h" -#include "graphics/C4GraphicsResource.h" -#include "game/C4GraphicsSystem.h" -#include "landscape/C4Landscape.h" -#include "game/C4Game.h" -#include "player/C4PlayerList.h" +#include "object/C4Command.h" +#include "object/C4Def.h" +#include "object/C4DefList.h" #include "object/C4GameObjects.h" -#include "control/C4GameControl.h" -#include "game/C4Viewport.h" +#include "object/C4Object.h" +#include "object/C4ObjectInfo.h" +#include "object/C4ObjectMenu.h" +#include "platform/C4GamePadCon.h" +#include "player/C4PlayerList.h" C4Player::C4Player() : C4PlayerInfoCore() { diff --git a/src/player/C4Player.h b/src/player/C4Player.h index 5211a9b01..cba21b275 100644 --- a/src/player/C4Player.h +++ b/src/player/C4Player.h @@ -20,15 +20,13 @@ #ifndef INC_C4Player #define INC_C4Player +#include "control/C4PlayerControl.h" #include "gui/C4MainMenu.h" -#include "object/C4ObjectInfoList.h" #include "object/C4InfoCore.h" +#include "object/C4ObjectInfoList.h" #include "object/C4ObjectList.h" #include "object/C4ObjectPtr.h" -#include "control/C4PlayerControl.h" #include "script/C4Value.h" -#include -#include const int32_t C4PVM_Cursor = 0, C4PVM_Target = 1, diff --git a/src/player/C4PlayerList.cpp b/src/player/C4PlayerList.cpp index 0e311d9e5..c3c874e11 100644 --- a/src/player/C4PlayerList.cpp +++ b/src/player/C4PlayerList.cpp @@ -21,18 +21,16 @@ #include "player/C4PlayerList.h" #include "c4group/C4Components.h" -#include "game/C4FullScreen.h" -#include "editor/C4Console.h" -#include "network/C4League.h" -#include "lib/C4Log.h" -#include "player/C4Player.h" -#include "object/C4Object.h" -#include "game/C4Game.h" -#include "game/C4Viewport.h" -#include "object/C4GameObjects.h" #include "control/C4GameControl.h" #include "control/C4RoundResults.h" +#include "editor/C4Console.h" +#include "game/C4FullScreen.h" +#include "game/C4Viewport.h" #include "lib/StdColors.h" +#include "network/C4League.h" +#include "object/C4GameObjects.h" +#include "object/C4Object.h" +#include "player/C4Player.h" C4PlayerList::C4PlayerList() { diff --git a/src/player/C4RankSystem.cpp b/src/player/C4RankSystem.cpp index e02559d37..6ea1c0df6 100644 --- a/src/player/C4RankSystem.cpp +++ b/src/player/C4RankSystem.cpp @@ -20,11 +20,9 @@ #include "C4Include.h" #include "player/C4RankSystem.h" -#include "lib/C4Log.h" -#include "c4group/C4Group.h" #include "c4group/C4ComponentHost.h" +#include "c4group/C4Group.h" #include "graphics/C4FacetEx.h" -#include "game/C4Game.h" #include "graphics/C4GraphicsResource.h" #include "platform/StdRegistry.h" diff --git a/src/script/C4Aul.cpp b/src/script/C4Aul.cpp index 524d0b2ec..873b78527 100644 --- a/src/script/C4Aul.cpp +++ b/src/script/C4Aul.cpp @@ -18,14 +18,12 @@ #include "C4Include.h" #include "script/C4Aul.h" -#include "script/C4AulExec.h" -#include "script/C4AulDebug.h" -#include "config/C4Config.h" -#include "script/C4Effect.h" -#include "script/C4ScriptHost.h" -#include "lib/C4Log.h" #include "c4group/C4Components.h" #include "c4group/C4LangStringTable.h" +#include "script/C4AulDebug.h" +#include "script/C4AulExec.h" +#include "script/C4Effect.h" +#include "script/C4ScriptHost.h" const char *C4AulWarningMessages[] = { #define DIAG(id, text, enabled) text, diff --git a/src/script/C4Aul.h b/src/script/C4Aul.h index 4bded1fb4..875dd2eb0 100644 --- a/src/script/C4Aul.h +++ b/src/script/C4Aul.h @@ -21,8 +21,6 @@ #include "script/C4StringTable.h" #include "script/C4Value.h" #include "script/C4ValueMap.h" -#include -#include // consts #define C4AUL_MAX_Identifier 100 // max length of function identifiers diff --git a/src/script/C4AulAST.h b/src/script/C4AulAST.h index cd8779563..b0d2f4123 100644 --- a/src/script/C4AulAST.h +++ b/src/script/C4AulAST.h @@ -18,11 +18,6 @@ #ifndef INC_C4AulAST #define INC_C4AulAST -#include - -#include -#include - #include "script/C4Value.h" namespace aul { namespace ast { diff --git a/src/script/C4AulCompiler.cpp b/src/script/C4AulCompiler.cpp index 631a6f01e..7fde82253 100644 --- a/src/script/C4AulCompiler.cpp +++ b/src/script/C4AulCompiler.cpp @@ -17,14 +17,13 @@ #include "C4Include.h" #include "script/C4AulCompiler.h" -#include -#include - #include "script/C4Aul.h" #include "script/C4AulParse.h" #include "script/C4AulScriptFunc.h" #include "script/C4ScriptHost.h" +#include + #define C4AUL_Inherited "inherited" #define C4AUL_SafeInherited "_inherited" #define C4AUL_DebugBreak "__debugbreak" diff --git a/src/script/C4AulDebug.cpp b/src/script/C4AulDebug.cpp index ed8a33ec8..eae51b664 100644 --- a/src/script/C4AulDebug.cpp +++ b/src/script/C4AulDebug.cpp @@ -16,12 +16,10 @@ #include "C4Include.h" #include "script/C4AulDebug.h" -#include "game/C4Application.h" #include "C4Version.h" #include "control/C4GameControl.h" -#include "game/C4Game.h" +#include "game/C4Application.h" #include "gui/C4MessageInput.h" -#include "lib/C4Log.h" #include "object/C4Def.h" #include "object/C4Object.h" #include "script/C4AulExec.h" diff --git a/src/script/C4AulDefFunc.h b/src/script/C4AulDefFunc.h index 32e3c48ec..51d472c40 100644 --- a/src/script/C4AulDefFunc.h +++ b/src/script/C4AulDefFunc.h @@ -22,7 +22,6 @@ #include "object/C4Def.h" #include "object/C4DefList.h" #include "script/C4Effect.h" -#include inline const static char *FnStringPar(C4String *pString) { diff --git a/src/script/C4AulExec.cpp b/src/script/C4AulExec.cpp index 558b25531..19e00d9ee 100644 --- a/src/script/C4AulExec.cpp +++ b/src/script/C4AulExec.cpp @@ -18,17 +18,13 @@ #include "C4Include.h" #include "script/C4AulExec.h" +#include "control/C4Record.h" +#include "object/C4Def.h" +#include "object/C4Object.h" #include "script/C4Aul.h" #include "script/C4AulScriptFunc.h" #include "script/C4AulDebug.h" -#include "object/C4Object.h" -#include "config/C4Config.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" -#include "control/C4Record.h" -#include "object/C4Def.h" #include "script/C4ScriptHost.h" -#include C4AulExec AulExec; diff --git a/src/script/C4AulExec.h b/src/script/C4AulExec.h index f47fd4cde..34a7e6e5f 100644 --- a/src/script/C4AulExec.h +++ b/src/script/C4AulExec.h @@ -19,8 +19,8 @@ #ifndef C4AULEXEC_H #define C4AULEXEC_H -#include "script/C4Aul.h" #include "platform/C4TimeMilliseconds.h" +#include "script/C4Aul.h" #include "script/C4AulScriptFunc.h" const int MAX_CONTEXT_STACK = 512; diff --git a/src/script/C4AulLink.cpp b/src/script/C4AulLink.cpp index 8099cbeab..03cda04f0 100644 --- a/src/script/C4AulLink.cpp +++ b/src/script/C4AulLink.cpp @@ -18,12 +18,12 @@ #include "C4Include.h" #include "script/C4Aul.h" +#include "game/C4Game.h" +#include "landscape/C4Material.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "script/C4Effect.h" -#include "landscape/C4Material.h" -#include "game/C4Game.h" #include "object/C4GameObjects.h" +#include "script/C4Effect.h" void C4ScriptHost::DoAppend(C4Def *def) { diff --git a/src/script/C4AulParse.cpp b/src/script/C4AulParse.cpp index 9c37d94db..b46183d7e 100644 --- a/src/script/C4AulParse.cpp +++ b/src/script/C4AulParse.cpp @@ -18,18 +18,9 @@ #include "C4Include.h" #include "script/C4AulParse.h" -#include -#include - -#include "script/C4Aul.h" +#include "object/C4Def.h" #include "script/C4AulDebug.h" #include "script/C4AulExec.h" -#include "object/C4Def.h" -#include "game/C4Game.h" -#include "lib/C4Log.h" -#include "config/C4Config.h" -#include "script/C4AulAST.h" -#include "script/C4AulCompiler.h" #ifndef DEBUG_BYTECODE_DUMP #define DEBUG_BYTECODE_DUMP 0 diff --git a/src/script/C4AulParse.h b/src/script/C4AulParse.h index 4d2b3d6e5..1a018af48 100644 --- a/src/script/C4AulParse.h +++ b/src/script/C4AulParse.h @@ -17,13 +17,13 @@ #ifndef INC_C4AulParse #define INC_C4AulParse -#include - #include "script/C4Aul.h" #include "script/C4AulAST.h" #include "script/C4AulCompiler.h" #include "script/C4AulScriptFunc.h" +#include + enum C4AulBCCType : int; enum C4AulTokenType : int; diff --git a/src/script/C4Effect.cpp b/src/script/C4Effect.cpp index 96d06c953..392f98f23 100644 --- a/src/script/C4Effect.cpp +++ b/src/script/C4Effect.cpp @@ -21,8 +21,8 @@ #include "C4Include.h" #include "script/C4Effect.h" -#include "script/C4Aul.h" #include "game/C4GameScript.h" +#include "script/C4Aul.h" void C4Effect::AssignCallbackFunctions() { diff --git a/src/script/C4PropList.cpp b/src/script/C4PropList.cpp index 7851ac0d2..378cc4189 100644 --- a/src/script/C4PropList.cpp +++ b/src/script/C4PropList.cpp @@ -18,9 +18,9 @@ #include "C4Include.h" #include "script/C4PropList.h" -#include "script/C4Aul.h" -#include "object/C4GameObjects.h" #include "control/C4Record.h" +#include "object/C4GameObjects.h" +#include "script/C4Aul.h" void C4PropList::AddRef(C4Value *pRef) { diff --git a/src/script/C4PropList.h b/src/script/C4PropList.h index 3bc12a931..4d86ca780 100644 --- a/src/script/C4PropList.h +++ b/src/script/C4PropList.h @@ -15,8 +15,6 @@ /* Property lists */ -#include - #include "script/C4Value.h" #include "script/C4StringTable.h" diff --git a/src/script/C4Script.cpp b/src/script/C4Script.cpp index 4691bbab6..13a4ba771 100644 --- a/src/script/C4Script.cpp +++ b/src/script/C4Script.cpp @@ -18,13 +18,11 @@ /* Functions mapped by C4Script */ #include "C4Include.h" -#include "script/C4AulDefFunc.h" -#include "script/C4AulExec.h" -#include "lib/C4Random.h" #include "C4Version.h" - -#include +#include "lib/C4Random.h" +#include "script/C4AulExec.h" +#include "script/C4AulDefFunc.h" //========================== Some Support Functions ======================================= diff --git a/src/script/C4ScriptHost.cpp b/src/script/C4ScriptHost.cpp index e00be37fc..3c22bbb52 100644 --- a/src/script/C4ScriptHost.cpp +++ b/src/script/C4ScriptHost.cpp @@ -20,11 +20,10 @@ #include "C4Include.h" #include "script/C4ScriptHost.h" -#include "script/C4AulAST.h" +#include "object/C4Def.h" #include "script/C4AulCompiler.h" #include "script/C4AulParse.h" #include "script/C4AulScriptFunc.h" -#include "object/C4Def.h" #include "script/C4AulScriptFunc.h" #include "script/C4Effect.h" diff --git a/src/script/C4ScriptHost.h b/src/script/C4ScriptHost.h index 5be373b59..a44cf94a2 100644 --- a/src/script/C4ScriptHost.h +++ b/src/script/C4ScriptHost.h @@ -21,9 +21,9 @@ #define INC_C4ScriptHost #include "c4group/C4ComponentHost.h" - #include "script/C4Aul.h" #include "script/C4AulAST.h" + #include // aul script state diff --git a/src/script/C4ScriptStandalone.cpp b/src/script/C4ScriptStandalone.cpp index 75d5ff907..f71571c9a 100644 --- a/src/script/C4ScriptStandalone.cpp +++ b/src/script/C4ScriptStandalone.cpp @@ -17,11 +17,11 @@ #include "C4Include.h" -#include "lib/C4Random.h" #include "c4group/C4Group.h" +#include "lib/C4Random.h" +#include "object/C4DefList.h" #include "script/C4Aul.h" #include "script/C4ScriptHost.h" -#include "object/C4DefList.h" /* StandaloneStubs.cpp is shared with mape, which has a real implementation of these */ C4Def* C4DefList::GetByName(const StdStrBuf &) {return nullptr;} diff --git a/src/script/C4ScriptStandaloneStubs.cpp b/src/script/C4ScriptStandaloneStubs.cpp index 6ba56ff85..0fe652453 100644 --- a/src/script/C4ScriptStandaloneStubs.cpp +++ b/src/script/C4ScriptStandaloneStubs.cpp @@ -15,14 +15,13 @@ #include "C4Include.h" +#include "config/C4Reloc.h" +#include "control/C4Record.h" +#include "object/C4Def.h" +#include "object/C4ObjectList.h" #include "script/C4Aul.h" #include "script/C4AulDebug.h" -#include "config/C4Config.h" -#include "object/C4Def.h" #include "script/C4PropList.h" -#include "control/C4Record.h" -#include "config/C4Reloc.h" -#include "object/C4ObjectList.h" /* Parts of the ScriptEngine that are normally in C4Globals for initialization order reasons. */ #ifdef _DEBUG diff --git a/src/script/C4Value.cpp b/src/script/C4Value.cpp index 7caccf4f1..5520f2d17 100644 --- a/src/script/C4Value.cpp +++ b/src/script/C4Value.cpp @@ -17,17 +17,15 @@ #include "C4Include.h" #include "script/C4Value.h" -#include "script/C4AulExec.h" +#include "game/C4GameScript.h" #include "object/C4Def.h" #include "object/C4DefList.h" -#include "script/C4StringTable.h" -#include "script/C4ValueArray.h" -#include "game/C4Game.h" -#include "game/C4GameScript.h" #include "object/C4GameObjects.h" #include "object/C4Object.h" -#include "lib/C4Log.h" +#include "script/C4AulExec.h" #include "script/C4Effect.h" +#include "script/C4StringTable.h" +#include "script/C4ValueArray.h" const C4Value C4VNull; diff --git a/src/script/C4Value.h b/src/script/C4Value.h index b0b2f5558..83e7a2b74 100644 --- a/src/script/C4Value.h +++ b/src/script/C4Value.h @@ -16,8 +16,8 @@ #ifndef INC_C4Value #define INC_C4Value -#include "script/C4StringTable.h" #include "object/C4ObjectPtr.h" +#include "script/C4StringTable.h" // C4Value type enum C4V_Type diff --git a/src/script/C4ValueArray.cpp b/src/script/C4ValueArray.cpp index 6304bdc71..c1816be70 100644 --- a/src/script/C4ValueArray.cpp +++ b/src/script/C4ValueArray.cpp @@ -15,10 +15,9 @@ */ #include "C4Include.h" #include "script/C4ValueArray.h" -#include -#include "script/C4Aul.h" #include "object/C4FindObject.h" +#include "script/C4Aul.h" C4ValueArray::C4ValueArray() : pData(nullptr), iSize(0), iCapacity(0), constant(false)