Header reorganisation

Lots of #includes are moved from C4Game.h to the files that actually need
them

engine/inc/C4Console.h

@@ -28,7 +28,6 @@
 #include "C4ToolsDlg.h"
 #include "C4ObjectListDlg.h"
 #include "C4EditCursor.h"
-#include "C4Game.h"
 
 #include <StdWindow.h>
 

engine/inc/C4FullScreen.h

@@ -26,10 +26,6 @@
 #include "C4MainMenu.h"
 #include <StdWindow.h>
 
-#ifndef BIG_C4INCLUDE
-#include "C4Game.h"
-#endif
-
 bool IsKeyDown(int iKey);
 
 class C4FullScreen: public CStdWindow

engine/inc/C4Game.h

@@ -26,42 +26,24 @@
 
 #ifdef C4ENGINE
 
-#include <C4Def.h>
-#include <C4Texture.h>
-#include <C4RankSystem.h>
-#include <C4GraphicsSystem.h>
-#include <C4GraphicsResource.h>
-#include <C4GameMessage.h>
-#include <C4MouseControl.h>
-#include <C4MessageInput.h>
-#include <C4Weather.h>
-#include <C4Material.h>
-#include <C4GameObjects.h>
-#include <C4Landscape.h>
-#include <C4Scenario.h>
-#include <C4MassMover.h>
-#include <C4PXS.h>
-#include <C4PlayerList.h>
-#include <C4Teams.h>
+#include <C4Client.h>
+#include <C4GameParameters.h>
 #include <C4PlayerInfo.h>
+#include <C4RoundResults.h>
+#include <C4GameMessage.h>
+#include <C4Weather.h>
+#include <C4GameObjects.h>
+#include <C4Scenario.h>
+#include <C4PlayerList.h>
+#include <C4Material.h>
+#include <C4GameControl.h>
 #include <C4Control.h>
 #include <C4PathFinder.h>
-#include <C4ComponentHost.h>
-#include <C4ScriptHost.h>
-#include <C4Particles.h>
-#include <C4GroupSet.h>
 #include <C4Extra.h>
-#include <C4GameControl.h>
 #include <C4Effects.h>
 #include <C4Fonts.h>
-#include "C4LangStringTable.h"
 #include "C4Scoreboard.h"
-#include <C4Network2.h>
-#include <C4Scenario.h>
-#include <C4Client.h>
-#include <C4Network2Reference.h>
 #include <C4VideoPlayback.h>
-#include <C4RoundResults.h>
 
 class C4Game
   {

engine/inc/C4Wrappers.h

@@ -31,6 +31,9 @@
 #include <C4Game.h>
 #include <C4Landscape.h>
 #include <C4Log.h>
+#include "C4Texture.h"
+#include "C4GraphicsSystem.h"
+#include "C4GraphicsResource.h"
 #endif
 
 //=================================== ID2Def ==============================================

engine/src/C4Application.cpp

@@ -31,6 +31,10 @@
 #endif
 
 #ifndef BIG_C4INCLUDE
+#include "C4Game.h"
+#include "C4GraphicsSystem.h"
+#include "C4GraphicsResource.h"
+#include "C4MessageInput.h"
 #include <C4FileClasses.h>
 #include <C4FullScreen.h>
 #include <C4Language.h>

engine/src/C4ChatDlg.cpp

@@ -22,9 +22,10 @@
 
 #include "C4Include.h"
 #include "C4ChatDlg.h"
-#include "C4Game.h"
+
 #include "C4InputValidation.h"
 #include "C4Network2IRC.h"
+#include "C4MessageInput.h"
 
 void convUTF8toWindows(StdStrBuf &sText)
 {

engine/src/C4Console.cpp

@@ -28,10 +28,14 @@
 #include <C4Application.h>
 
 #include <C4GameSave.h>
+#include <C4Game.h>
+#include <C4MessageInput.h>
 #include <C4UserMessages.h>
 #include <C4Version.h>
 #include <C4Language.h>
 #include <C4Player.h>
+#include <C4Landscape.h>
+#include <C4GraphicsSystem.h>
 
 #include <StdFile.h>
 #include <StdRegistry.h>

engine/src/C4Control.cpp

@@ -36,6 +36,9 @@
 #include <C4Log.h>
 #include <C4Wrappers.h>
 #include <C4Player.h>
+#include <C4RankSystem.h>
+#include <C4PXS.h>
+#include <C4MassMover.h>
 #endif
 
 // *** C4ControlPacket

engine/src/C4Def.cpp

@@ -35,7 +35,7 @@
 #include <C4Components.h>
 #include <C4Config.h>
 #include <C4ValueList.h>
-
+#include <C4RankSystem.h>
 #ifdef C4ENGINE
 #include <C4Wrappers.h>
 #include <C4Object.h>

engine/src/C4EditCursor.cpp

@@ -32,6 +32,7 @@
 #include <C4Application.h>
 #include <C4Random.h>
 #include <C4Wrappers.h>
+#include <C4MouseControl.h>
 #endif
 
 #ifdef WITH_DEVELOPER_MODE

engine/src/C4Effect.cpp

@@ -30,6 +30,7 @@
 #include <C4Log.h>
 #include <C4Game.h>
 #include <C4Wrappers.h>
+#include <C4PXS.h>
 #endif
 
 void C4Effect::AssignCallbackFunctions()

engine/src/C4Facet.cpp

@@ -24,6 +24,7 @@
 #include <C4Include.h>
 #include <C4Facet.h>
 #include <C4Game.h>
+#include <C4GraphicsResource.h>
 
 #include <StdD3D.h>
 

engine/src/C4FileSelDlg.cpp

@@ -23,7 +23,8 @@
 #include <C4FileSelDlg.h>
 
 #ifndef BIG_C4INCLUDE
-#include <C4Game.h> // only for single use of ::GraphicsResource.fctOKCancel below...
+#include <C4GraphicsResource.h> // only for single use of ::GraphicsResource.fctOKCancel below...
+#include <C4Version.h>
 #endif
 
 #ifdef _WIN32

engine/src/C4FullScreen.cpp

@@ -25,6 +25,7 @@
 #include <C4FullScreen.h>
 
 #ifndef BIG_C4INCLUDE
+#include <C4Game.h>
 #include <C4Application.h>
 #include <C4UserMessages.h>
 #include <C4Viewport.h>
@@ -36,6 +37,8 @@
 #include <C4GamePadCon.h>
 #include <C4Player.h>
 #include <C4GameOverDlg.h>
+#include <C4GraphicsSystem.h>
+#include <C4MouseControl.h>
 #endif
 
 #ifdef _WIN32

engine/src/C4Game.cpp

@@ -58,6 +58,11 @@
 #include <C4ObjectMenu.h>
 #include <C4GameLobby.h>
 #include <C4ChatDlg.h>
+#include <C4MouseControl.h>
+#include <C4PXS.h>
+#include <C4MessageInput.h>
+#include <C4MassMover.h>
+#include <C4RankSystem.h>
 #endif
 
 #include <StdFile.h>

engine/src/C4GameControlNetwork.cpp

@@ -27,6 +27,7 @@
 #include <C4GameControl.h>
 #include <C4Game.h>
 #include <C4Log.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 // *** C4GameControlNetwork

engine/src/C4GameLobby.cpp

@@ -33,6 +33,7 @@
 #include "C4RTF.H"
 #include "C4ChatDlg.h"
 #include "C4PlayerInfoListBox.h"
+#include <C4MessageInput.h>
 #endif
 
 namespace C4GameLobby {

engine/src/C4GameMessage.cpp

@@ -26,6 +26,7 @@
 #ifndef BIG_C4INCLUDE
 #include <C4Object.h>
 #include <C4Application.h>
+#include <C4GraphicsResource.h>
 #include <C4Game.h>
 #include <C4Player.h>
 #endif

engine/src/C4GameOptions.cpp

@@ -21,7 +21,7 @@
 
 #include "C4Include.h"
 #include "C4GameOptions.h"
-#include "C4Game.h"
+#include <C4Game.h>
 
 // ----------- C4GameOptionsList::Option ----------------------------------------------------------------
 

engine/src/C4GameParameters.cpp

@@ -24,7 +24,7 @@
 #ifndef BIG_C4INCLUDE
 #include "C4Log.h"
 #include "C4Components.h"
-#include "C4Game.h"
+
 #include "C4Wrappers.h"
 #endif
 

engine/src/C4GameSave.cpp

@@ -32,6 +32,9 @@
 #include <C4Console.h>
 #include <C4Log.h>
 #include <C4Player.h>
+#include <C4Landscape.h>
+#include <C4PXS.h>
+#include <C4MassMover.h>
 #endif
 
 // *** C4GameSave main class

engine/src/C4GraphicsResource.cpp

@@ -29,6 +29,7 @@
 #include <C4Gui.h>
 #include <C4Log.h>
 #include <C4Game.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 #include <StdGL.h>

engine/src/C4GraphicsSystem.cpp

@@ -36,6 +36,7 @@
 #include <C4Wrappers.h>
 #include <C4Player.h>
 #include <C4SoundSystem.h>
+#include <C4MouseControl.h>
 #endif
 
 #include <StdPNG.h>

engine/src/C4Gui.cpp

@@ -31,6 +31,7 @@
 #include <C4Wrappers.h>
 #include <C4Log.h>
 #include <C4GamePadCon.h>
+#include <C4MouseControl.h>
 #endif
 
 namespace C4GUI {

engine/src/C4GuiButton.cpp

@@ -24,6 +24,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 

engine/src/C4GuiContainers.cpp

@@ -25,6 +25,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 

engine/src/C4GuiDialogs.cpp

@@ -33,6 +33,7 @@
 #include <C4Console.h>
 #include <C4Def.h>
 #include <C4Wrappers.h>
+#include <C4MouseControl.h>
 #endif
 
 #include <StdGL.h>

engine/src/C4GuiEdit.cpp

@@ -25,6 +25,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 

engine/src/C4GuiLabels.cpp

@@ -24,6 +24,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 

engine/src/C4GuiListBox.cpp

@@ -23,6 +23,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 

engine/src/C4GuiTabular.cpp

@@ -27,6 +27,7 @@
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
+#include <C4MouseControl.h>
 
 namespace C4GUI {
 

engine/src/C4IDList.cpp

@@ -27,7 +27,7 @@
 #ifndef BIG_C4INCLUDE
 #include <C4Def.h>
 #include <C4Application.h>
-#include <C4Game.h>
+#include <C4GraphicsResource.h>
 #endif
 
 C4IDListChunk::C4IDListChunk()

engine/src/C4Landscape.cpp

@@ -42,6 +42,8 @@
 #include <C4Application.h>
 #include <C4Wrappers.h>
 #include <C4Stat.h>
+#include <C4MassMover.h>
+#include <C4PXS.h>
 #endif
 
 #include <StdPNG.h>

engine/src/C4LoaderScreen.cpp

@@ -25,9 +25,10 @@
 #ifndef BIG_C4INCLUDE
 #include <C4LogBuf.h>
 #include <C4Log.h>
-#include <C4Game.h>
+#include <C4GraphicsResource.h>
 #include <C4Random.h>
 #include <C4GroupSet.h>
+#include <C4Game.h>
 #endif
 
 C4LoaderScreen::C4LoaderScreen() : TitleFont(::GraphicsResource.FontTitle), LogFont(::GraphicsResource.FontTiny)

engine/src/C4Log.cpp

@@ -28,8 +28,11 @@
 #ifndef BIG_C4INCLUDE
 #include <C4Console.h>
 #include <C4GameLobby.h>
+#include <C4Game.h>
 #include <C4LogBuf.h>
 #include <C4Language.h>
+#include <C4Network2.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 #if defined(HAVE_SHARE_H) || defined(_WIN32)

engine/src/C4Material.cpp

@@ -28,7 +28,7 @@
 #ifndef BIG_C4INCLUDE
 
 #include <C4Group.h>
-#include <C4Game.h>
+#include <C4PXS.h>
 #include <C4Random.h>
 #include <C4ToolsDlg.h> // For C4TLS_MatSky...
 #ifdef C4ENGINE

engine/src/C4Menu.cpp

@@ -30,6 +30,7 @@
 #include <C4Viewport.h>
 #include <C4Wrappers.h>
 #include <C4Player.h>
+#include <C4MouseControl.h>
 #endif
 
 const int32_t 		C4MN_DefInfoWdt     = 270, // default width of info windows

engine/src/C4MessageBoard.cpp

@@ -32,6 +32,10 @@
 #include <C4Console.h>
 #include <C4Network2Dialogs.h>
 #include <C4Player.h>
+#include <C4GraphicsSystem.h>
+#include <C4GraphicsResource.h>
+#include <C4MessageInput.h>
+#include <C4Game.h>
 #endif
 
 const int C4LogSize=30000, C4LogMaxLines=1000;

engine/src/C4MessageInput.cpp

@@ -35,6 +35,7 @@
 #include <C4Log.h>
 #include <C4Player.h>
 #include <C4GameLobby.h>
+#include <C4GraphicsSystem.h>
 #endif
 #include <cctype>
 

engine/src/C4Network2.cpp

@@ -30,6 +30,9 @@
 #include <C4Console.h>
 #include <C4GameSave.h>
 #include <C4RoundResults.h>
+#include <C4Game.h>
+#include <C4GraphicsSystem.h>
+#include <C4GraphicsResource.h>
 
 // lobby
 #include <C4Gui.h>

engine/src/C4Network2Client.cpp

@@ -27,6 +27,7 @@
 #include <C4Network2IO.h>
 #include <C4Network2Stats.h>
 #include <C4GameLobby.h> // fullscreen network lobby
+#include <C4Game.h>
 #endif
 
 #ifndef _WIN32

engine/src/C4Network2Dialogs.cpp

@@ -27,9 +27,10 @@
 #ifndef BIG_C4INCLUDE
 #include "C4Network2.h"
 #include "C4Network2Stats.h"
-#include "C4Game.h"
+
 #include "C4Viewport.h"
 #include "C4GameOptions.h"
+#include <C4Game.h>
 #endif
 
 #ifndef HAVE_WINSOCK

engine/src/C4Network2Players.cpp

@@ -25,7 +25,8 @@
 #include "C4Network2Players.h"
 #include "C4PlayerInfo.h"
 #include "C4GameLobby.h"
-#include "C4Game.h"
+#include <C4Game.h>
+
 #include "C4Control.h"
 
 // *** C4Network2Players

engine/src/C4Network2Reference.cpp

@@ -18,9 +18,7 @@
  * See clonk_trademark_license.txt for full license.
  */
 #include "C4Include.h"
-#ifdef C4ENGINE
-#include "C4Game.h"
-#endif
+#include <C4Game.h>
 #include "C4Version.h"
 #include "C4Network2Reference.h"
 

engine/src/C4Network2ResDlg.cpp

@@ -22,7 +22,7 @@
 #include "C4Include.h"
 #include "C4GameLobby.h"
 #include "C4FullScreen.h"
-#include "C4Game.h"
+
 #include "C4Network2.h"
 #include "C4PlayerInfo.h"
 #include "C4Network2Players.h"

engine/src/C4Object.cpp

@@ -45,6 +45,8 @@
 #include <C4Wrappers.h>
 #include <C4Player.h>
 #include <C4ObjectMenu.h>
+#include <C4RankSystem.h>
+#include <C4GameVersion.h>
 #endif
 
 void DrawVertex(C4Facet &cgo, int32_t tx, int32_t ty, int32_t col, int32_t contact)

engine/src/C4ObjectList.cpp

@@ -29,6 +29,7 @@
 #include <C4Object.h>
 #include <C4Wrappers.h>
 #include <C4Application.h>
+#include <C4Region.h>
 #endif
 
 C4ObjectList::C4ObjectList(): FirstIter(0)

engine/src/C4ObjectListDlg.cpp

@@ -24,6 +24,7 @@
 #include <C4Console.h>
 #include <C4Object.h>
 #include <C4Language.h>
+#include <C4Game.h>
 
 
 #ifdef WITH_DEVELOPER_MODE

engine/src/C4ObjectMenu.cpp

@@ -27,6 +27,7 @@
 #include <C4Wrappers.h>
 #include <C4Player.h>
 #include <C4Viewport.h>
+#include <C4MouseControl.h>
 #endif
 
 

engine/src/C4Packet2.cpp

@@ -19,10 +19,13 @@
  */
 #include "C4Include.h"
 
-#include "C4Game.h"
+
 #include "C4Network2Res.h"
 #include "C4Version.h"
 #include "C4GameLobby.h"
+#include <C4Network2.h>
+#include <C4RoundResults.h>
+#include <C4GameControlNetwork.h>
 
 // *** constants
 

engine/src/C4PathFinder.cpp

@@ -52,6 +52,7 @@
 #ifndef BIG_C4INCLUDE
 #include <C4FacetEx.h>
 #include <C4Game.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 const int32_t C4PF_MaxDepth				 = 35,

engine/src/C4Player.cpp

@@ -41,6 +41,7 @@
 #include <C4FullScreen.h>
 #include <C4GameOverDlg.h>
 #include <C4ObjectMenu.h>
+#include <C4MouseControl.h>
 #endif
 
 #define C4FOW_Def_View_RangeX 500

engine/src/C4PlayerInfoListBox.cpp

@@ -29,6 +29,8 @@
 #include <C4Teams.h>
 #include <C4Game.h>
 #include <C4FileSelDlg.h>
+#include <C4GraphicsResource.h>
+#include <C4MouseControl.h>
 #endif
 
 DWORD GenerateRandomPlayerColor(int32_t iTry); // in C4PlayerInfoConflicts.cpp

engine/src/C4PlayerList.cpp

@@ -32,6 +32,8 @@
 #include <C4Log.h>
 #include <C4Player.h>
 #include <C4Object.h>
+#include <C4Game.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 C4PlayerList::C4PlayerList()

engine/src/C4RankSystem.cpp

@@ -29,6 +29,7 @@
 #include <C4ComponentHost.h>
 #include <C4FacetEx.h>
 #include <C4Game.h>
+#include <C4GraphicsResource.h>
 #endif
 
 #include <StdRegistry.h>

engine/src/C4Scoreboard.cpp

@@ -22,8 +22,9 @@
 #include "C4Include.h"
 #include "C4Scoreboard.h"
 #include "C4Gui.h"
-#include "C4Game.h"
+
 #include "C4GameOverDlg.h"
+#include <C4GraphicsResource.h>
 
 // ************************************************
 // *** C4Scoreboard

engine/src/C4Script.cpp

@@ -41,6 +41,9 @@
 #include <C4ObjectInfoList.h>
 #include <C4Player.h>
 #include <C4ObjectMenu.h>
+#include <C4RankSystem.h>
+#include <C4PXS.h>
+#include <C4MessageInput.h>
 #endif
 
 //========================== Some Support Functions =======================================

engine/src/C4SoundSystem.cpp

@@ -30,6 +30,7 @@
 #include <C4Game.h>
 #include <C4Config.h>
 #include <C4Application.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 C4SoundEffect::C4SoundEffect():

engine/src/C4Startup.cpp

@@ -32,6 +32,8 @@
 #include <C4Game.h>
 #include <C4Application.h>
 #include <C4Log.h>
+#include <C4GraphicsResource.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 bool C4StartupGraphics::LoadFile(C4FacetID &rToFct, const char *szFilename)

engine/src/C4StartupMainDlg.cpp

@@ -35,6 +35,7 @@
 #include <C4Game.h>
 #include <C4Log.h>
 #include <C4Language.h>
+#include <C4GraphicsResource.h>
 #endif
 
 

engine/src/C4StartupPlrSelDlg.cpp

@@ -32,6 +32,8 @@
 #include <C4Language.h>
 #include <C4FileSelDlg.h>
 #include <C4Log.h>
+#include <C4GraphicsResource.h>
+#include <C4RankSystem.h>
 #endif
 #include <cctype>
 

engine/src/C4StartupScenSelDlg.cpp

@@ -38,6 +38,7 @@
 #include <C4GameDialogs.h>
 #include <C4Language.h>
 #include <C4FileSelDlg.h>
+#include <C4MouseControl.h>
 #endif
 
 #include <set>

engine/src/C4UpperBoard.cpp

@@ -24,6 +24,7 @@
 #include <C4Game.h>
 #include <C4Config.h>
 #include <C4Application.h>
+#include <C4GraphicsResource.h>
 #endif
 
 C4UpperBoard::C4UpperBoard()

engine/src/C4Video.cpp

@@ -30,6 +30,8 @@
 #include <C4Application.h>
 #include <C4Game.h>
 #include <C4Player.h>
+#include <C4GraphicsResource.h>
+#include <C4GraphicsSystem.h>
 #endif
 
 #ifdef _WIN32

engine/src/C4Viewport.cpp

@@ -41,6 +41,8 @@
 #include <C4Player.h>
 #include <C4ChatDlg.h>
 #include <C4ObjectMenu.h>
+#include <C4MouseControl.h>
+#include <C4PXS.h>
 #endif
 
 #include <StdGL.h>

engine/src/C4WinMain.cpp

@@ -29,6 +29,8 @@
 #include <C4Console.h>
 #include <C4FullScreen.h>
 #include <C4Log.h>
+#include <C4Game.h>
+#include <C4Version.h>
 
 C4Application Application;
 C4Console			Console;