From 493c27612620fb1874ac118e78acdcafd13af5ab Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Sun, 3 Apr 2016 20:07:56 +0200 Subject: [PATCH] Rewrite header inclusions to #include "path/to/file.h" style --- CMakeLists.txt | 17 --- src/C4Globals.cpp | 26 ++-- src/C4Include.h | 20 ++-- src/c4group/C4ComponentHost.cpp | 4 +- src/c4group/C4Extra.cpp | 12 +- src/c4group/C4Extra.h | 2 +- src/c4group/C4Group.cpp | 8 +- src/c4group/C4Group.h | 4 +- src/c4group/C4GroupMain.cpp | 12 +- src/c4group/C4GroupSet.cpp | 10 +- src/c4group/C4LangStringTable.cpp | 4 +- src/c4group/C4LangStringTable.h | 2 +- src/c4group/C4Language.cpp | 14 +-- src/c4group/C4Update.cpp | 12 +- src/c4group/C4Update.h | 2 +- src/c4group/CStdFile.cpp | 8 +- src/c4group/CStdFile.h | 2 +- src/c4group/gunzip4c4group.cpp | 4 +- src/config/C4Config.cpp | 22 ++-- src/config/C4Config.h | 6 +- src/config/C4Reloc.cpp | 8 +- src/control/C4Control.cpp | 50 ++++---- src/control/C4Control.h | 12 +- src/control/C4GameControl.cpp | 22 ++-- src/control/C4GameControl.h | 6 +- src/control/C4GameParameters.cpp | 14 +-- src/control/C4GameParameters.h | 8 +- src/control/C4GameSave.cpp | 30 ++--- src/control/C4GameSave.h | 4 +- src/control/C4PlayerControl.cpp | 32 ++--- src/control/C4PlayerControl.h | 8 +- src/control/C4PlayerInfo.cpp | 20 ++-- src/control/C4PlayerInfo.h | 10 +- src/control/C4PlayerInfoConflicts.cpp | 12 +- src/control/C4Record.cpp | 20 ++-- src/control/C4Record.h | 4 +- src/control/C4RoundResults.cpp | 16 +-- src/control/C4RoundResults.h | 8 +- src/control/C4Teams.cpp | 16 +-- src/control/C4Teams.h | 2 +- src/editor/C4Console.cpp | 38 +++--- src/editor/C4Console.h | 10 +- src/editor/C4ConsoleCocoa.mm | 34 +++--- src/editor/C4ConsoleGTK.cpp | 44 +++---- src/editor/C4ConsoleGTKDlg.cpp | 4 +- src/editor/C4ConsoleGUI.h | 8 +- src/editor/C4ConsoleWin32.cpp | 30 ++--- src/editor/C4EditCursor.cpp | 28 ++--- src/editor/C4EditCursor.h | 6 +- src/editor/C4EditorWindowController.mm | 10 +- src/editor/C4ObjectListDlg.cpp | 10 +- src/editor/C4ObjectListDlg.h | 2 +- src/editor/C4ToolsDlg.cpp | 12 +- src/editor/C4ToolsDlg.h | 2 +- src/editor/C4ViewportWindow.cpp | 12 +- src/editor/C4ViewportWindow.h | 2 +- src/game/C4Application.cpp | 40 +++---- src/game/C4Application.h | 12 +- src/game/C4FullScreen.cpp | 28 ++--- src/game/C4FullScreen.h | 2 +- src/game/C4Game.cpp | 112 +++++++++--------- src/game/C4Game.h | 12 +- src/game/C4GameScript.cpp | 50 ++++---- src/game/C4GameScript.h | 2 +- src/game/C4GameVersion.h | 2 +- src/game/C4GraphicsSystem.cpp | 28 ++--- src/game/C4GraphicsSystem.h | 4 +- src/game/C4Physics.h | 2 +- src/game/C4Viewport.cpp | 40 +++---- src/game/C4Viewport.h | 2 +- src/game/ClonkMain.cpp | 12 +- src/graphics/Bitmap256.cpp | 4 +- src/graphics/Bitmap256.h | 2 +- src/graphics/C4Draw.cpp | 22 ++-- src/graphics/C4Draw.h | 4 +- src/graphics/C4DrawGL.cpp | 14 +-- src/graphics/C4DrawGL.h | 6 +- src/graphics/C4DrawGLCtx.cpp | 6 +- src/graphics/C4DrawGLMac.h | 2 +- src/graphics/C4DrawGLMac.mm | 26 ++-- src/graphics/C4DrawMeshGL.cpp | 10 +- src/graphics/C4DrawT.cpp | 4 +- src/graphics/C4DrawT.h | 2 +- src/graphics/C4Facet.cpp | 8 +- src/graphics/C4Facet.h | 2 +- src/graphics/C4FacetEx.cpp | 8 +- src/graphics/C4FacetEx.h | 4 +- src/graphics/C4FontLoader.cpp | 22 ++-- src/graphics/C4FontLoader.h | 6 +- src/graphics/C4GraphicsResource.cpp | 16 +-- src/graphics/C4GraphicsResource.h | 10 +- src/graphics/C4Shader.cpp | 4 +- src/graphics/C4Shader.h | 8 +- src/graphics/C4Surface.cpp | 22 ++-- src/graphics/C4Surface.h | 2 +- src/graphics/C4SurfaceLoaders.cpp | 12 +- src/graphics/CSurface8.cpp | 8 +- src/graphics/StdPNG.cpp | 6 +- src/gui/C4ChatDlg.cpp | 12 +- src/gui/C4ChatDlg.h | 4 +- src/gui/C4DownloadDlg.cpp | 6 +- src/gui/C4DownloadDlg.h | 4 +- src/gui/C4FileSelDlg.cpp | 10 +- src/gui/C4FileSelDlg.h | 4 +- src/gui/C4Folder.cpp | 8 +- src/gui/C4GameDialogs.cpp | 8 +- src/gui/C4GameDialogs.h | 2 +- src/gui/C4GameLobby.cpp | 26 ++-- src/gui/C4GameLobby.h | 4 +- src/gui/C4GameMessage.cpp | 12 +- src/gui/C4GameMessage.h | 4 +- src/gui/C4GameOptions.cpp | 14 +-- src/gui/C4GameOptions.h | 2 +- src/gui/C4GameOverDlg.cpp | 26 ++-- src/gui/C4GameOverDlg.h | 4 +- src/gui/C4GfxErrorDlg.cpp | 12 +- src/gui/C4Gui.cpp | 22 ++-- src/gui/C4Gui.h | 16 +-- src/gui/C4GuiButton.cpp | 10 +- src/gui/C4GuiCheckBox.cpp | 12 +- src/gui/C4GuiComboBox.cpp | 12 +- src/gui/C4GuiContainers.cpp | 8 +- src/gui/C4GuiDialogs.cpp | 22 ++-- src/gui/C4GuiEdit.cpp | 10 +- src/gui/C4GuiLabels.cpp | 8 +- src/gui/C4GuiListBox.cpp | 6 +- src/gui/C4GuiMenu.cpp | 12 +- src/gui/C4GuiTabular.cpp | 10 +- src/gui/C4KeyboardInput.cpp | 12 +- src/gui/C4LoaderScreen.cpp | 18 +-- src/gui/C4LoaderScreen.h | 2 +- src/gui/C4MainMenu.cpp | 30 ++--- src/gui/C4MainMenu.h | 2 +- src/gui/C4Menu.cpp | 22 ++-- src/gui/C4Menu.h | 8 +- src/gui/C4MessageBoard.cpp | 24 ++-- src/gui/C4MessageBoard.h | 4 +- src/gui/C4MessageInput.cpp | 28 ++--- src/gui/C4MessageInput.h | 4 +- src/gui/C4MouseControl.cpp | 30 ++--- src/gui/C4MouseControl.h | 4 +- src/gui/C4PlayerInfoListBox.cpp | 26 ++-- src/gui/C4PlayerInfoListBox.h | 2 +- src/gui/C4Scoreboard.cpp | 8 +- src/gui/C4ScriptGuiWindow.cpp | 26 ++-- src/gui/C4ScriptGuiWindow.h | 6 +- src/gui/C4Startup.cpp | 28 ++--- src/gui/C4Startup.h | 2 +- src/gui/C4StartupAboutDlg.cpp | 10 +- src/gui/C4StartupAboutDlg.h | 2 +- src/gui/C4StartupMainDlg.cpp | 32 ++--- src/gui/C4StartupMainDlg.h | 2 +- src/gui/C4StartupNetDlg.cpp | 18 +-- src/gui/C4StartupNetDlg.h | 6 +- src/gui/C4StartupOptionsDlg.cpp | 24 ++-- src/gui/C4StartupOptionsDlg.h | 2 +- src/gui/C4StartupPlrSelDlg.cpp | 20 ++-- src/gui/C4StartupPlrSelDlg.h | 4 +- src/gui/C4StartupScenSelDlg.cpp | 32 ++--- src/gui/C4StartupScenSelDlg.h | 8 +- src/gui/C4UpdateDlg.cpp | 10 +- src/gui/C4UpdateDlg.h | 6 +- src/gui/C4UpperBoard.cpp | 10 +- src/gui/C4UpperBoard.h | 2 +- src/landscape/C4Landscape.h | 2 +- src/landscape/C4LandscapeRender.cpp | 16 +-- src/landscape/C4LandscapeRender.h | 6 +- src/landscape/C4Map.cpp | 10 +- src/landscape/C4MapCreatorS2.cpp | 16 +-- src/landscape/C4MapScript.cpp | 14 +-- src/landscape/C4MapScript.h | 12 +- src/landscape/C4MapScriptAlgo.cpp | 6 +- src/landscape/C4MassMover.cpp | 14 +-- src/landscape/C4Material.cpp | 28 ++--- src/landscape/C4Material.h | 10 +- src/landscape/C4MaterialList.cpp | 4 +- src/landscape/C4MaterialList.h | 2 +- src/landscape/C4PXS.cpp | 16 +-- src/landscape/C4PXS.h | 2 +- src/landscape/C4Particles.cpp | 30 ++--- src/landscape/C4Particles.h | 4 +- src/landscape/C4PathFinder.cpp | 8 +- src/landscape/C4Scenario.cpp | 14 +-- src/landscape/C4Scenario.h | 4 +- src/landscape/C4ScenarioSection.cpp | 8 +- src/landscape/C4Sky.cpp | 14 +-- src/landscape/C4Sky.h | 4 +- src/landscape/C4SolidMask.cpp | 16 +-- src/landscape/C4SolidMask.h | 4 +- src/landscape/C4Texture.cpp | 20 ++-- src/landscape/C4Texture.h | 8 +- src/landscape/C4TextureShape.cpp | 12 +- src/landscape/C4TextureShape.h | 2 +- src/landscape/C4TransferZone.cpp | 10 +- src/landscape/C4Weather.cpp | 14 +-- src/landscape/C4Weather.h | 2 +- src/landscape/fow/C4FoW.cpp | 2 +- src/landscape/fow/C4FoW.h | 14 +-- src/landscape/fow/C4FoWAmbient.cpp | 4 +- src/landscape/fow/C4FoWAmbient.h | 2 +- src/landscape/fow/C4FoWBeam.cpp | 2 +- src/landscape/fow/C4FoWBeam.h | 2 +- src/landscape/fow/C4FoWDrawStrategy.cpp | 8 +- src/landscape/fow/C4FoWDrawStrategy.h | 4 +- src/landscape/fow/C4FoWLight.cpp | 12 +- src/landscape/fow/C4FoWLight.h | 12 +- src/landscape/fow/C4FoWLightSection.cpp | 12 +- src/landscape/fow/C4FoWLightSection.h | 2 +- src/landscape/fow/C4FoWRegion.cpp | 4 +- src/landscape/fow/C4FoWRegion.h | 8 +- src/lib/C4InputValidation.cpp | 6 +- src/lib/C4InputValidation.h | 6 +- src/lib/C4Log.cpp | 28 ++--- src/lib/C4Log.h | 2 +- src/lib/C4LogBuf.cpp | 4 +- src/lib/C4Markup.cpp | 4 +- src/lib/C4NameList.cpp | 2 +- src/lib/C4NameList.h | 4 +- src/lib/C4Random.cpp | 4 +- src/lib/C4Real.cpp | 6 +- src/lib/C4Rect.cpp | 8 +- src/lib/C4SimpleLog.cpp | 4 +- src/lib/C4Stat.cpp | 2 +- src/lib/Standard.h | 2 +- src/lib/StdAdaptors.h | 4 +- src/lib/StdBuf.cpp | 10 +- src/lib/StdBuf.h | 2 +- src/lib/StdCompiler.cpp | 4 +- src/lib/StdCompiler.h | 4 +- src/lib/StdMesh.cpp | 4 +- src/lib/StdMesh.h | 4 +- src/lib/StdMeshLoader.cpp | 4 +- src/lib/StdMeshLoader.h | 2 +- src/lib/StdMeshLoaderBinary.cpp | 10 +- src/lib/StdMeshLoaderBinaryChunks.cpp | 4 +- src/lib/StdMeshLoaderBinaryChunks.h | 4 +- src/lib/StdMeshLoaderDataStream.h | 2 +- src/lib/StdMeshLoaderXml.cpp | 4 +- src/lib/StdMeshMaterial.cpp | 6 +- src/lib/StdMeshMaterial.h | 6 +- src/lib/StdMeshMath.cpp | 4 +- src/lib/StdMeshUpdate.cpp | 8 +- src/lib/StdMeshUpdate.h | 4 +- src/lib/StdResStr2.cpp | 2 +- src/mape/cpp-handles/c4def-handle.cpp | 4 +- src/mape/cpp-handles/group-handle.cpp | 2 +- src/mape/cpp-handles/log-handle.cpp | 4 +- src/mape/cpp-handles/mapgen-handle.cpp | 12 +- src/mape/cpp-handles/material-handle.cpp | 4 +- src/mape/cpp-handles/random-handle.cpp | 2 +- src/mape/cpp-handles/stub-handle.cpp | 28 ++--- src/mape/cpp-handles/texture-handle.cpp | 2 +- src/netio/TstC4NetIO.cpp | 6 +- src/network/C4Client.cpp | 18 +-- src/network/C4Client.h | 6 +- src/network/C4GameControlNetwork.cpp | 12 +- src/network/C4GameControlNetwork.h | 8 +- src/network/C4InteractiveThread.cpp | 8 +- src/network/C4InteractiveThread.h | 4 +- src/network/C4League.cpp | 10 +- src/network/C4League.h | 6 +- src/network/C4NetIO.cpp | 6 +- src/network/C4NetIO.h | 10 +- src/network/C4Network2.cpp | 32 ++--- src/network/C4Network2.h | 16 +-- src/network/C4Network2Client.cpp | 20 ++-- src/network/C4Network2Client.h | 8 +- src/network/C4Network2Dialogs.cpp | 20 ++-- src/network/C4Network2Dialogs.h | 6 +- src/network/C4Network2Discover.cpp | 2 +- src/network/C4Network2Discover.h | 2 +- src/network/C4Network2IO.cpp | 16 +-- src/network/C4Network2IO.h | 6 +- src/network/C4Network2IRC.cpp | 10 +- src/network/C4Network2IRC.h | 2 +- src/network/C4Network2Players.cpp | 16 +-- src/network/C4Network2Players.h | 2 +- src/network/C4Network2Reference.cpp | 6 +- src/network/C4Network2Reference.h | 10 +- src/network/C4Network2Res.cpp | 20 ++-- src/network/C4Network2Res.h | 10 +- src/network/C4Network2ResDlg.cpp | 16 +-- src/network/C4Network2Stats.cpp | 16 +-- src/network/C4Network2Stats.h | 4 +- src/network/C4Network2UPnPLinux.cpp | 8 +- src/network/C4Packet2.cpp | 10 +- src/network/C4PacketBase.h | 2 +- src/object/C4Action.cpp | 4 +- src/object/C4Command.cpp | 30 ++--- src/object/C4Command.h | 4 +- src/object/C4Def.cpp | 26 ++-- src/object/C4Def.h | 24 ++-- src/object/C4DefGraphics.cpp | 40 +++---- src/object/C4DefGraphics.h | 12 +- src/object/C4DefList.cpp | 22 ++-- src/object/C4DefList.h | 6 +- src/object/C4FindObject.cpp | 16 +-- src/object/C4FindObject.h | 4 +- src/object/C4GameObjects.cpp | 24 ++-- src/object/C4GameObjects.h | 6 +- src/object/C4IDList.cpp | 10 +- src/object/C4IDList.h | 2 +- src/object/C4Id.cpp | 4 +- src/object/C4Id.h | 2 +- src/object/C4InfoCore.cpp | 22 ++-- src/object/C4InfoCore.h | 10 +- src/object/C4MeshAnimation.cpp | 8 +- src/object/C4MeshAnimation.h | 4 +- src/object/C4Movement.cpp | 14 +-- src/object/C4Object.cpp | 58 ++++----- src/object/C4ObjectCom.cpp | 30 ++--- src/object/C4ObjectCom.h | 2 +- src/object/C4ObjectInfo.cpp | 26 ++-- src/object/C4ObjectInfo.h | 8 +- src/object/C4ObjectInfoList.cpp | 18 +-- src/object/C4ObjectInfoList.h | 2 +- src/object/C4ObjectList.cpp | 16 +-- src/object/C4ObjectList.h | 2 +- src/object/C4ObjectMenu.cpp | 24 ++-- src/object/C4ObjectMenu.h | 2 +- src/object/C4ObjectPtr.cpp | 8 +- src/object/C4ObjectScript.cpp | 38 +++--- src/object/C4Sector.cpp | 14 +-- src/object/C4Sector.h | 4 +- src/object/C4Shape.cpp | 12 +- src/object/C4Shape.h | 6 +- src/platform/C4App.cpp | 6 +- src/platform/C4App.h | 6 +- src/platform/C4AppDelegate+MainMenuActions.mm | 8 +- src/platform/C4AppDelegate.h | 4 +- src/platform/C4AppDelegate.mm | 6 +- src/platform/C4AppGTK.cpp | 14 +-- src/platform/C4AppMac.mm | 8 +- src/platform/C4AppSDL.cpp | 22 ++-- src/platform/C4AppT.cpp | 10 +- src/platform/C4CrashHandlerWin32.cpp | 4 +- src/platform/C4FileMonitor.cpp | 10 +- src/platform/C4FileMonitor.h | 4 +- src/platform/C4FileMonitorMac.mm | 8 +- src/platform/C4GamePadCon.cpp | 12 +- src/platform/C4GamePadCon.h | 2 +- src/platform/C4MusicFile.cpp | 8 +- src/platform/C4MusicFile.h | 4 +- src/platform/C4MusicSystem.cpp | 18 +-- src/platform/C4MusicSystem.h | 4 +- src/platform/C4SoundInstance.cpp | 20 ++-- src/platform/C4SoundInstance.h | 4 +- src/platform/C4SoundLoaders.cpp | 8 +- src/platform/C4SoundLoaders.h | 4 +- src/platform/C4SoundModifiers.cpp | 14 +-- src/platform/C4SoundModifiers.h | 4 +- src/platform/C4SoundSystem.cpp | 22 ++-- src/platform/C4SoundSystem.h | 4 +- src/platform/C4StdInProc.cpp | 6 +- src/platform/C4StdInProc.h | 2 +- src/platform/C4TimeMilliseconds.cpp | 6 +- src/platform/C4Window.h | 4 +- src/platform/C4WindowController.mm | 12 +- src/platform/C4WindowGTK.cpp | 28 ++--- src/platform/C4WindowMac.mm | 14 +-- src/platform/C4WindowSDL.cpp | 16 +-- src/platform/C4WindowWin32.cpp | 32 ++--- src/platform/PlatformAbstraction.cpp | 4 +- src/platform/StdFile.cpp | 6 +- src/platform/StdRegistry.cpp | 4 +- src/platform/StdRegistry.h | 4 +- src/platform/StdScheduler.cpp | 2 +- src/platform/StdScheduler.h | 4 +- src/platform/StdSchedulerMac.mm | 4 +- src/platform/StdSchedulerPoll.cpp | 2 +- src/platform/StdSchedulerWin32.cpp | 4 +- src/platform/StdSync.h | 2 +- src/player/C4Player.cpp | 52 ++++---- src/player/C4Player.h | 14 +-- src/player/C4PlayerList.cpp | 28 ++--- src/player/C4PlayerList.h | 2 +- src/player/C4RankSystem.cpp | 18 +-- src/player/C4RankSystem.h | 2 +- src/player/C4ScenarioParameters.cpp | 8 +- src/script/C4Aul.cpp | 18 +-- src/script/C4Aul.h | 8 +- src/script/C4AulDebug.cpp | 20 ++-- src/script/C4AulDebug.h | 2 +- src/script/C4AulDefFunc.h | 8 +- src/script/C4AulExec.cpp | 20 ++-- src/script/C4AulExec.h | 6 +- src/script/C4AulFunc.cpp | 8 +- src/script/C4AulFunc.h | 2 +- src/script/C4AulLink.cpp | 14 +-- src/script/C4AulParse.cpp | 18 +-- src/script/C4AulScriptFunc.cpp | 8 +- src/script/C4AulScriptFunc.h | 4 +- src/script/C4Effect.cpp | 10 +- src/script/C4Effect.h | 4 +- src/script/C4PropList.cpp | 12 +- src/script/C4PropList.h | 4 +- src/script/C4Script.cpp | 10 +- src/script/C4ScriptHost.cpp | 6 +- src/script/C4ScriptHost.h | 4 +- src/script/C4ScriptStandalone.cpp | 4 +- src/script/C4ScriptStandaloneStubs.cpp | 16 +-- src/script/C4StringTable.cpp | 4 +- src/script/C4Value.cpp | 22 ++-- src/script/C4Value.h | 10 +- src/script/C4ValueArray.cpp | 10 +- src/script/C4ValueArray.h | 2 +- src/script/C4ValueMap.cpp | 4 +- 407 files changed, 2223 insertions(+), 2240 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fde55be1..c1608669a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -976,23 +976,6 @@ endif() include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src/c4group - ${CMAKE_CURRENT_SOURCE_DIR}/src/config - ${CMAKE_CURRENT_SOURCE_DIR}/src/control - ${CMAKE_CURRENT_SOURCE_DIR}/src/editor - ${CMAKE_CURRENT_SOURCE_DIR}/src/game - ${CMAKE_CURRENT_SOURCE_DIR}/src/gamescript - ${CMAKE_CURRENT_SOURCE_DIR}/src/graphics - ${CMAKE_CURRENT_SOURCE_DIR}/src/gui - ${CMAKE_CURRENT_SOURCE_DIR}/src/landscape - ${CMAKE_CURRENT_SOURCE_DIR}/src/landscape/fow - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib - ${CMAKE_CURRENT_SOURCE_DIR}/src/network - ${CMAKE_CURRENT_SOURCE_DIR}/src/object - ${CMAKE_CURRENT_SOURCE_DIR}/src/platform - ${CMAKE_CURRENT_SOURCE_DIR}/src/player - ${CMAKE_CURRENT_SOURCE_DIR}/src/res - ${CMAKE_CURRENT_SOURCE_DIR}/src/script ) # Mark thirdparty as system headers so we don't get warnings from them diff --git a/src/C4Globals.cpp b/src/C4Globals.cpp index 4e1c601d6..6f9e4cc53 100644 --- a/src/C4Globals.cpp +++ b/src/C4Globals.cpp @@ -16,19 +16,19 @@ /* Global interdependent objects */ -#include -#include "C4Application.h" -#include "C4Aul.h" -#include "C4Console.h" -#include -#include "C4FullScreen.h" -#include "C4GraphicsSystem.h" -#include "C4Game.h" -#include "C4GameObjects.h" -#include "C4MouseControl.h" -#include "C4Network2.h" -#include "C4PropList.h" -#include "C4StringTable.h" +#include "C4Include.h" +#include "game/C4Application.h" +#include "script/C4Aul.h" +#include "editor/C4Console.h" +#include "object/C4DefList.h" +#include "game/C4FullScreen.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Game.h" +#include "object/C4GameObjects.h" +#include "gui/C4MouseControl.h" +#include "network/C4Network2.h" +#include "script/C4PropList.h" +#include "script/C4StringTable.h" #ifdef _DEBUG C4Set C4PropList::PropLists; diff --git a/src/C4Include.h b/src/C4Include.h index 2845ce31a..d4863fa19 100644 --- a/src/C4Include.h +++ b/src/C4Include.h @@ -25,7 +25,7 @@ don't need to include this file or any of the files it includes. */ #ifndef INC_C4Include #define INC_C4Include -#include "PlatformAbstraction.h" +#include "platform/PlatformAbstraction.h" #define DEBUGREC_SCRIPT #define DEBUGREC_START_FRAME 0 @@ -83,16 +83,16 @@ inline void operator delete(void *p, const char *, long) #endif #include -#include "Standard.h" +#include "lib/Standard.h" #include "C4Prototypes.h" -#include "C4Real.h" -#include "StdBuf.h" -#include "StdFile.h" -#include "C4Language.h" -#include "C4Log.h" -#include "C4Reloc.h" -#include "C4Config.h" +#include "lib/C4Real.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 "C4Game.h" +#include "game/C4Game.h" #endif // INC_C4Include diff --git a/src/c4group/C4ComponentHost.cpp b/src/c4group/C4ComponentHost.cpp index 012155896..7119d6410 100644 --- a/src/c4group/C4ComponentHost.cpp +++ b/src/c4group/C4ComponentHost.cpp @@ -17,8 +17,8 @@ /* Holds a single text file component from a group */ -#include -#include +#include "C4Include.h" +#include "c4group/C4ComponentHost.h" bool C4ComponentHost::Load(C4Group &hGroup, const char *fname, diff --git a/src/c4group/C4Extra.cpp b/src/c4group/C4Extra.cpp index 48d6b9a8b..f5bb58988 100644 --- a/src/c4group/C4Extra.cpp +++ b/src/c4group/C4Extra.cpp @@ -15,13 +15,13 @@ */ // user-customizable multimedia package Extra.ocg -#include -#include +#include "C4Include.h" +#include "c4group/C4Extra.h" -#include -#include -#include -#include +#include "config/C4Config.h" +#include "c4group/C4Components.h" +#include "game/C4Game.h" +#include "lib/C4Log.h" C4Extra::C4Extra() { diff --git a/src/c4group/C4Extra.h b/src/c4group/C4Extra.h index cd5de39d8..884b4497b 100644 --- a/src/c4group/C4Extra.h +++ b/src/c4group/C4Extra.h @@ -18,7 +18,7 @@ #ifndef INC_C4Extra #define INC_C4Extra -#include +#include "c4group/C4Group.h" class C4Extra { diff --git a/src/c4group/C4Group.cpp b/src/c4group/C4Group.cpp index c81f8a112..5745895e8 100644 --- a/src/c4group/C4Group.cpp +++ b/src/c4group/C4Group.cpp @@ -19,11 +19,11 @@ /* Needs to be compilable as Objective C++ on OS X */ -#include -#include +#include "C4Include.h" +#include "c4group/C4Group.h" -#include -#include +#include "c4group/C4Components.h" +#include "lib/C4InputValidation.h" #include diff --git a/src/c4group/C4Group.h b/src/c4group/C4Group.h index 1f57acd55..3ca53176d 100644 --- a/src/c4group/C4Group.h +++ b/src/c4group/C4Group.h @@ -23,8 +23,8 @@ #ifdef HAVE_IO_H #include #endif -#include -#include +#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/C4GroupMain.cpp b/src/c4group/C4GroupMain.cpp index 79f9d6d21..46bc11183 100644 --- a/src/c4group/C4GroupMain.cpp +++ b/src/c4group/C4GroupMain.cpp @@ -16,14 +16,14 @@ /* C4Group command line executable */ -#include +#include "C4Include.h" -#include -#include -#include -#include +#include "c4group/C4Group.h" +#include "C4Version.h" +#include "c4group/C4Update.h" +#include "platform/StdRegistry.h" #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #endif int globalArgC; diff --git a/src/c4group/C4GroupSet.cpp b/src/c4group/C4GroupSet.cpp index bd005b8bf..6b9e11258 100644 --- a/src/c4group/C4GroupSet.cpp +++ b/src/c4group/C4GroupSet.cpp @@ -16,12 +16,12 @@ // a set of group files // manages system file overwriting by scearios or folders -#include -#include +#include "C4Include.h" +#include "c4group/C4GroupSet.h" -#include -#include -#include +#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 8d29e9fa2..60431e5f5 100644 --- a/src/c4group/C4LangStringTable.cpp +++ b/src/c4group/C4LangStringTable.cpp @@ -20,8 +20,8 @@ #include #include -#include "C4LangStringTable.h" -#include "C4InputValidation.h" +#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 5cdc71ca7..f7df05b38 100644 --- a/src/c4group/C4LangStringTable.h +++ b/src/c4group/C4LangStringTable.h @@ -18,7 +18,7 @@ #ifndef INC_C4LangStringTable #define INC_C4LangStringTable -#include "C4ComponentHost.h" +#include "c4group/C4ComponentHost.h" #include #include diff --git a/src/c4group/C4Language.cpp b/src/c4group/C4Language.cpp index 2c90527c8..920c4335a 100644 --- a/src/c4group/C4Language.cpp +++ b/src/c4group/C4Language.cpp @@ -22,14 +22,14 @@ */ -#include -#include +#include "C4Include.h" +#include "c4group/C4Language.h" -#include -#include -#include -#include -#include +#include "game/C4Application.h" +#include "c4group/C4Components.h" +#include "lib/C4Log.h" +#include "config/C4Config.h" +#include "game/C4Game.h" C4Language Languages; diff --git a/src/c4group/C4Update.cpp b/src/c4group/C4Update.cpp index 990077f0b..922b1facf 100644 --- a/src/c4group/C4Update.cpp +++ b/src/c4group/C4Update.cpp @@ -13,17 +13,17 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include "C4Update.h" +#include "C4Include.h" +#include "c4group/C4Update.h" #include "C4Version.h" -#include "C4Components.h" -#include "C4Group.h" -#include "C4Log.h" +#include "c4group/C4Components.h" +#include "c4group/C4Group.h" +#include "lib/C4Log.h" C4Config *GetCfg(); #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #include #endif diff --git a/src/c4group/C4Update.h b/src/c4group/C4Update.h index 7d241cd4c..99d20ca02 100644 --- a/src/c4group/C4Update.h +++ b/src/c4group/C4Update.h @@ -19,7 +19,7 @@ #define INC_C4GroupEx -#include "C4InputValidation.h" +#include "lib/C4InputValidation.h" const int C4UP_MaxUpGrpCnt = 50; diff --git a/src/c4group/CStdFile.cpp b/src/c4group/CStdFile.cpp index 98fe542c8..caa8a5379 100644 --- a/src/c4group/CStdFile.cpp +++ b/src/c4group/CStdFile.cpp @@ -21,12 +21,12 @@ #ifdef _WIN32 # include "platform/C4windowswrapper.h" #endif -#include -#include -#include +#include "platform/StdFile.h" +#include "c4group/CStdFile.h" +#include "lib/SHA1.h" #include -#include +#include "zlib/gzio.h" #include #include diff --git a/src/c4group/CStdFile.h b/src/c4group/CStdFile.h index c977d1291..73399f168 100644 --- a/src/c4group/CStdFile.h +++ b/src/c4group/CStdFile.h @@ -21,7 +21,7 @@ #define INC_CSTDFILE #include -#include // for StdThreadCheck +#include "platform/StdSync.h" // for StdThreadCheck #include // for gzFile const int CStdFileBufSize = 4096; diff --git a/src/c4group/gunzip4c4group.cpp b/src/c4group/gunzip4c4group.cpp index de03a8e90..76b7ddffa 100644 --- a/src/c4group/gunzip4c4group.cpp +++ b/src/c4group/gunzip4c4group.cpp @@ -12,8 +12,8 @@ * for the above references. */ -#include -#include +#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 1d625861b..deef369b8 100644 --- a/src/config/C4Config.cpp +++ b/src/config/C4Config.cpp @@ -16,19 +16,19 @@ /* Game configuration as stored in registry */ -#include -#include +#include "C4Include.h" +#include "config/C4Config.h" -#include -#include -#include -#include -#include +#include "C4Version.h" +#include "lib/C4Log.h" +#include "c4group/C4Components.h" +#include "network/C4Network2.h" +#include "c4group/C4Language.h" #include -#include -#include -#include +#include "platform/StdFile.h" +#include "platform/C4Window.h" +#include "platform/StdRegistry.h" #ifdef HAVE_SYS_STAT_H #include @@ -40,7 +40,7 @@ #include #endif -#include +#include "game/C4Application.h" void C4ConfigGeneral::CompileFunc(StdCompiler *pComp) { diff --git a/src/config/C4Config.h b/src/config/C4Config.h index a6ac8da9b..b44fa046f 100644 --- a/src/config/C4Config.h +++ b/src/config/C4Config.h @@ -20,9 +20,9 @@ #ifndef INC_C4Config #define INC_C4Config -#include "C4Constants.h" -#include "C4InputValidation.h" -#include "C4PlayerControl.h" +#include "config/C4Constants.h" +#include "lib/C4InputValidation.h" +#include "control/C4PlayerControl.h" #include #define C4DEFAULT_FONT_NAME "Endeavour" diff --git a/src/config/C4Reloc.cpp b/src/config/C4Reloc.cpp index f2bce3a82..b721d6fcc 100644 --- a/src/config/C4Reloc.cpp +++ b/src/config/C4Reloc.cpp @@ -13,11 +13,11 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "config/C4Reloc.h" -#include -#include +#include "config/C4Config.h" +#include "game/C4Application.h" C4Reloc Reloc; // singleton diff --git a/src/control/C4Control.cpp b/src/control/C4Control.cpp index 7002df094..ca3613c6d 100644 --- a/src/control/C4Control.cpp +++ b/src/control/C4Control.cpp @@ -17,40 +17,40 @@ /* Control packets contain all player input in the message queue */ -#include -#include +#include "C4Include.h" +#include "control/C4Control.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 -#include -#include -#include +#include "player/C4PlayerList.h" +#include "object/C4GameObjects.h" +#include "control/C4GameControl.h" +#include "gui/C4ScriptGuiWindow.h" #include "gui/C4MessageInput.h" #include "object/C4Def.h" #include "object/C4DefList.h" #ifndef NOAULDEBUG -#include +#include "script/C4AulDebug.h" #endif -#include +#include "script/C4AulExec.h" // *** C4ControlPacket C4ControlPacket::C4ControlPacket() diff --git a/src/control/C4Control.h b/src/control/C4Control.h index 8cbf95f11..e211ff534 100644 --- a/src/control/C4Control.h +++ b/src/control/C4Control.h @@ -20,12 +20,12 @@ #ifndef INC_C4Control #define INC_C4Control -#include "C4Id.h" -#include "C4PacketBase.h" -#include "C4PlayerInfo.h" -#include "C4Client.h" -#include "C4KeyboardInput.h" -#include "C4ObjectList.h" +#include "object/C4Id.h" +#include "network/C4PacketBase.h" +#include "control/C4PlayerInfo.h" +#include "network/C4Client.h" +#include "gui/C4KeyboardInput.h" +#include "object/C4ObjectList.h" // *** control base classes diff --git a/src/control/C4GameControl.cpp b/src/control/C4GameControl.cpp index 68d0efd49..40056d83a 100644 --- a/src/control/C4GameControl.cpp +++ b/src/control/C4GameControl.cpp @@ -17,17 +17,17 @@ #include "C4Include.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "gui/C4MouseControl.h" +#include "platform/C4GamePadCon.h" +#include "player/C4PlayerList.h" +#include "player/C4Player.h" #ifdef _MSC_VER #pragma warning (disable: 4355) diff --git a/src/control/C4GameControl.h b/src/control/C4GameControl.h index 63ceb5da6..a9db0e4dc 100644 --- a/src/control/C4GameControl.h +++ b/src/control/C4GameControl.h @@ -18,8 +18,8 @@ #ifndef INC_C4GameControl #define INC_C4GameControl -#include "C4Control.h" -#include "C4Record.h" +#include "control/C4Control.h" +#include "control/C4Record.h" enum C4ControlMode { @@ -45,7 +45,7 @@ enum C4ControlDeliveryType // the control is actually executed within a fixed time. // * CDT_Decide is guesswork, control isn't garantueed to be faster. -#include "C4GameControlNetwork.h" +#include "network/C4GameControlNetwork.h" #ifdef _DEBUG const int32_t C4SyncCheckRate = 1, diff --git a/src/control/C4GameParameters.cpp b/src/control/C4GameParameters.cpp index 65376228b..c540a38ee 100644 --- a/src/control/C4GameParameters.cpp +++ b/src/control/C4GameParameters.cpp @@ -14,14 +14,14 @@ * for the above references. */ #include "C4Include.h" -#include "C4GameParameters.h" +#include "control/C4GameParameters.h" -#include "C4Log.h" -#include "C4Components.h" -#include "C4Def.h" -#include -#include -#include +#include "lib/C4Log.h" +#include "c4group/C4Components.h" +#include "object/C4Def.h" +#include "object/C4DefList.h" +#include "game/C4Game.h" +#include "network/C4Network2.h" // *** C4GameRes diff --git a/src/control/C4GameParameters.h b/src/control/C4GameParameters.h index f0faf6410..a3f66bee4 100644 --- a/src/control/C4GameParameters.h +++ b/src/control/C4GameParameters.h @@ -18,10 +18,10 @@ #ifndef C4GAMEPARAMETERS_H #define C4GAMEPARAMETERS_H -#include "C4IDList.h" -#include "C4PlayerInfo.h" -#include "C4Teams.h" -#include "C4InfoCore.h" +#include "object/C4IDList.h" +#include "control/C4PlayerInfo.h" +#include "control/C4Teams.h" +#include "object/C4InfoCore.h" class C4GameRes { diff --git a/src/control/C4GameSave.cpp b/src/control/C4GameSave.cpp index d50f3d0ac..617266330 100644 --- a/src/control/C4GameSave.cpp +++ b/src/control/C4GameSave.cpp @@ -15,22 +15,22 @@ */ // game saving functionality -#include -#include +#include "C4Include.h" +#include "control/C4GameSave.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "control/C4GameParameters.h" +#include "script/C4Value.h" +#include "network/C4Network2.h" // *** C4GameSave main class diff --git a/src/control/C4GameSave.h b/src/control/C4GameSave.h index 9038d8292..7b340d2a4 100644 --- a/src/control/C4GameSave.h +++ b/src/control/C4GameSave.h @@ -26,8 +26,8 @@ #ifndef INC_C4GameSave #define INC_C4GameSave -#include -#include +#include "landscape/C4Scenario.h" +#include "c4group/C4Components.h" class C4GameSave { diff --git a/src/control/C4PlayerControl.cpp b/src/control/C4PlayerControl.cpp index bb068ac01..be853090d 100644 --- a/src/control/C4PlayerControl.cpp +++ b/src/control/C4PlayerControl.cpp @@ -16,27 +16,27 @@ // Input to player control mapping #include "C4Include.h" -#include "C4PlayerControl.h" +#include "control/C4PlayerControl.h" -#include -#include "C4LangStringTable.h" -#include "C4Player.h" -#include "C4PlayerList.h" -#include "C4Control.h" -#include "C4Game.h" -#include "C4GamePadCon.h" -#include "C4Log.h" -#include "C4GraphicsResource.h" -#include "C4MouseControl.h" -#include "C4GraphicsSystem.h" -#include "C4Viewport.h" -#include "C4Object.h" -#include "C4ObjectMenu.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 "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "object/C4Object.h" +#include "object/C4ObjectMenu.h" #include "script/C4Aul.h" #include -#include "C4Record.h" +#include "control/C4Record.h" /* C4PlayerControlDef */ diff --git a/src/control/C4PlayerControl.h b/src/control/C4PlayerControl.h index 448100967..79ea5dd3a 100644 --- a/src/control/C4PlayerControl.h +++ b/src/control/C4PlayerControl.h @@ -18,10 +18,10 @@ #ifndef INC_C4PlayerControl #define INC_C4PlayerControl -#include "C4KeyboardInput.h" -#include "C4LangStringTable.h" -#include "C4Id.h" -#include "C4TimeMilliseconds.h" +#include "gui/C4KeyboardInput.h" +#include "c4group/C4LangStringTable.h" +#include "object/C4Id.h" +#include "platform/C4TimeMilliseconds.h" #include diff --git a/src/control/C4PlayerInfo.cpp b/src/control/C4PlayerInfo.cpp index 3612527f1..d8d714666 100644 --- a/src/control/C4PlayerInfo.cpp +++ b/src/control/C4PlayerInfo.cpp @@ -17,17 +17,17 @@ // permanent player information management // see header for some additional information -#include -#include +#include "C4Include.h" +#include "control/C4PlayerInfo.h" -#include -#include -#include -#include -#include -#include -#include -#include +#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" // *** C4PlayerInfo diff --git a/src/control/C4PlayerInfo.h b/src/control/C4PlayerInfo.h index 2248c97f9..3df4c1a0f 100644 --- a/src/control/C4PlayerInfo.h +++ b/src/control/C4PlayerInfo.h @@ -32,11 +32,11 @@ #ifndef INC_C4PlayerInfo #define INC_C4PlayerInfo -#include "C4PacketBase.h" -#include "C4Network2Res.h" -#include "C4Constants.h" -#include "C4InputValidation.h" -#include "C4Id.h" +#include "network/C4PacketBase.h" +#include "network/C4Network2Res.h" +#include "config/C4Constants.h" +#include "lib/C4InputValidation.h" +#include "object/C4Id.h" // information about one player at a client class C4PlayerInfo diff --git a/src/control/C4PlayerInfoConflicts.cpp b/src/control/C4PlayerInfoConflicts.cpp index 542beefe3..2146b9993 100644 --- a/src/control/C4PlayerInfoConflicts.cpp +++ b/src/control/C4PlayerInfoConflicts.cpp @@ -17,12 +17,12 @@ // e.g., changing colors if two players have the same // "There must be some easier way to do it"(tm) -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "control/C4PlayerInfo.h" +#include "game/C4Game.h" +#include "control/C4Teams.h" +#include "lib/StdColors.h" +#include "lib/C4Random.h" // number of times trying new player colors const int32_t C4MaxPlayerColorChangeTries = 100; diff --git a/src/control/C4Record.cpp b/src/control/C4Record.cpp index 695e674fd..e6b580b30 100644 --- a/src/control/C4Record.cpp +++ b/src/control/C4Record.cpp @@ -15,18 +15,18 @@ */ // scenario record functionality -#include -#include +#include "C4Include.h" +#include "control/C4Record.h" -#include -#include -#include -#include -#include -#include -#include +#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 +#include "platform/StdFile.h" #define IMMEDIATEREC diff --git a/src/control/C4Record.h b/src/control/C4Record.h index 65583e5ec..33f420502 100644 --- a/src/control/C4Record.h +++ b/src/control/C4Record.h @@ -20,8 +20,8 @@ class C4Record; -#include "C4Group.h" -#include "C4Control.h" +#include "c4group/C4Group.h" +#include "control/C4Control.h" extern int DoNoDebugRec; // debugrec disable counter in C4Record.cpp diff --git a/src/control/C4RoundResults.cpp b/src/control/C4RoundResults.cpp index b9a900fd2..159d5feb1 100644 --- a/src/control/C4RoundResults.cpp +++ b/src/control/C4RoundResults.cpp @@ -15,16 +15,16 @@ */ // Round result information to be displayed in game over dialog -#include -#include +#include "C4Include.h" +#include "control/C4RoundResults.h" -#include -#include +#include "player/C4Player.h" +#include "game/C4Game.h" #include "object/C4Def.h" -#include -#include -#include -#include +#include "object/C4Object.h" +#include "player/C4PlayerList.h" +#include "object/C4GameObjects.h" +#include "object/C4DefList.h" // *** C4RoundResultsPlayer diff --git a/src/control/C4RoundResults.h b/src/control/C4RoundResults.h index 6ffe3222a..af1486034 100644 --- a/src/control/C4RoundResults.h +++ b/src/control/C4RoundResults.h @@ -23,10 +23,10 @@ #ifndef INC_C4RoundResults #define INC_C4RoundResults -#include "C4Components.h" -#include "C4IDList.h" -#include "C4PacketBase.h" -#include "C4FacetEx.h" +#include "c4group/C4Components.h" +#include "object/C4IDList.h" +#include "network/C4PacketBase.h" +#include "graphics/C4FacetEx.h" // Contains additional data not present in C4PlayerInfo class C4RoundResultsPlayer diff --git a/src/control/C4Teams.cpp b/src/control/C4Teams.cpp index d285fda30..72428a1b1 100644 --- a/src/control/C4Teams.cpp +++ b/src/control/C4Teams.cpp @@ -15,15 +15,15 @@ */ // player team management for teamwork melees -#include -#include +#include "C4Include.h" +#include "control/C4Teams.h" -#include -#include -#include -#include -#include -#include +#include "game/C4Game.h" +#include "lib/C4Random.h" +#include "c4group/C4Components.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" +#include "control/C4GameControl.h" // --------------------------------------------------------------- // C4Team diff --git a/src/control/C4Teams.h b/src/control/C4Teams.h index eb1d9bd0a..fd5e42495 100644 --- a/src/control/C4Teams.h +++ b/src/control/C4Teams.h @@ -18,7 +18,7 @@ #ifndef INC_C4Teams #define INC_C4Teams -#include "C4InputValidation.h" +#include "lib/C4InputValidation.h" // constant used by lobby to indicate invisible, random team const int32_t TEAMID_Unknown = -1; diff --git a/src/editor/C4Console.cpp b/src/editor/C4Console.cpp index 9accd1fbd..2820264fd 100644 --- a/src/editor/C4Console.cpp +++ b/src/editor/C4Console.cpp @@ -17,26 +17,26 @@ /* Handles engine execution in developer mode */ -#include -#include +#include "C4Include.h" +#include "editor/C4Console.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "game/C4GraphicsSystem.h" +#include "game/C4Viewport.h" +#include "script/C4ScriptHost.h" +#include "player/C4PlayerList.h" +#include "control/C4GameControl.h" -#include -#include +#include "platform/StdFile.h" +#include "platform/StdRegistry.h" #define FILE_SELECT_FILTER_FOR_C4S "OpenClonk Scenario\0" \ "*.ocs;*.ocf;Scenario.txt\0" \ @@ -614,5 +614,5 @@ void C4ToolsDlg::UpdateTextures() {} void C4ToolsDlg::UpdateToolCtrls() {} bool C4Viewport::ScrollBarsByViewPosition() {return 0;} bool C4Viewport::TogglePlayerLock() {return 0;} -#include "C4ConsoleGUICommon.h" +#include "editor/C4ConsoleGUICommon.h" #endif diff --git a/src/editor/C4Console.h b/src/editor/C4Console.h index a1e8a76a2..e4ac77c79 100644 --- a/src/editor/C4Console.h +++ b/src/editor/C4Console.h @@ -20,12 +20,12 @@ #ifndef INC_C4Console #define INC_C4Console -#include "C4ConsoleGUI.h" -#include "C4ToolsDlg.h" -#include "C4ObjectListDlg.h" -#include "C4EditCursor.h" +#include "editor/C4ConsoleGUI.h" +#include "editor/C4ToolsDlg.h" +#include "editor/C4ObjectListDlg.h" +#include "editor/C4EditCursor.h" -#include +#include "platform/C4Window.h" const int C4CNS_ModePlay = 0, C4CNS_ModeEdit = 1, diff --git a/src/editor/C4ConsoleCocoa.mm b/src/editor/C4ConsoleCocoa.mm index 09911deb7..d37592ff0 100644 --- a/src/editor/C4ConsoleCocoa.mm +++ b/src/editor/C4ConsoleCocoa.mm @@ -15,25 +15,25 @@ #include -#include -#include -#include +#include "C4Include.h" +#include "editor/C4Console.h" +#include "game/C4Application.h" -#include -#include -#include -#include -#include -#include -#include +#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" -#include -#include -#include -#include +#include "game/C4GraphicsSystem.h" +#include "player/C4PlayerList.h" +#include "control/C4GameControl.h" +#include "landscape/C4Texture.h" -#include -#include +#include "platform/StdFile.h" +#include "platform/StdRegistry.h" #import #import "C4AppDelegate.h" @@ -454,4 +454,4 @@ bool C4ConsoleGUI::UpdateModeCtrls(int iMode) } #define CONSOLEGUICOMMONINCLUDE -#include "C4ConsoleGUICommon.h" +#include "editor/C4ConsoleGUICommon.h" diff --git a/src/editor/C4ConsoleGTK.cpp b/src/editor/C4ConsoleGTK.cpp index bbc48582a..59201aa62 100644 --- a/src/editor/C4ConsoleGTK.cpp +++ b/src/editor/C4ConsoleGTK.cpp @@ -17,30 +17,30 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "editor/C4Console.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "editor/C4ConsoleGTKDlg.h" +#include "c4group/C4Language.h" +#include "script/C4Aul.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 "object/C4Object.h" +#include "player/C4Player.h" +#include "landscape/C4Landscape.h" #include "landscape/C4Sky.h" -#include -#include -#include -#include -#include +#include "game/C4GraphicsSystem.h" +#include "player/C4PlayerList.h" +#include "control/C4GameControl.h" +#include "landscape/C4Texture.h" +#include "game/C4Viewport.h" -#include -#include +#include "platform/StdFile.h" +#include "platform/StdRegistry.h" #include #ifdef GDK_WINDOWING_X11 @@ -1677,4 +1677,4 @@ void C4ToolsDlg::State::OnWindowHide(GtkWidget* widget, gpointer data) static_cast(data)->GetOwner()->Active = false; } -#include "C4ConsoleGUICommon.h" +#include "editor/C4ConsoleGUICommon.h" diff --git a/src/editor/C4ConsoleGTKDlg.cpp b/src/editor/C4ConsoleGTKDlg.cpp index dd8377c0e..f2c78b827 100644 --- a/src/editor/C4ConsoleGTKDlg.cpp +++ b/src/editor/C4ConsoleGTKDlg.cpp @@ -16,8 +16,8 @@ /* Common window for drawing and property tool dialogs in console mode */ -#include -#include +#include "C4Include.h" +#include "editor/C4ConsoleGTKDlg.h" #include diff --git a/src/editor/C4ConsoleGUI.h b/src/editor/C4ConsoleGUI.h index d710f4bf5..5bac6d03f 100644 --- a/src/editor/C4ConsoleGUI.h +++ b/src/editor/C4ConsoleGUI.h @@ -17,10 +17,10 @@ #ifndef C4CONSOLEGUI_INC #define C4CONSOLEGUI_INC -#include "C4Application.h" -#include "C4Player.h" -#include "C4GameControl.h" -#include "StdBuf.h" +#include "game/C4Application.h" +#include "player/C4Player.h" +#include "control/C4GameControl.h" +#include "lib/StdBuf.h" namespace OpenFileFlags { diff --git a/src/editor/C4ConsoleWin32.cpp b/src/editor/C4ConsoleWin32.cpp index 6def3e4ba..1e9db2ea9 100644 --- a/src/editor/C4ConsoleWin32.cpp +++ b/src/editor/C4ConsoleWin32.cpp @@ -17,26 +17,26 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "editor/C4Console.h" -#include -#include "C4ConsoleGUI.h" -#include -#include -#include -#include -#include -#include -#include "C4Viewport.h" -#include +#include "platform/C4AppWin32Impl.h" +#include "editor/C4ConsoleGUI.h" +#include "graphics/C4DrawGL.h" +#include "landscape/C4Landscape.h" +#include "object/C4Object.h" +#include "player/C4PlayerList.h" +#include "landscape/C4Texture.h" +#include "C4Version.h" +#include "game/C4Viewport.h" +#include "platform/StdRegistry.h" #include "lib/StdColors.h" #include "landscape/C4Sky.h" -#include +#include "platform/C4windowswrapper.h" #include #include -#include "resource.h" +#include "res/resource.h" #define GetWideLPARAM(c) reinterpret_cast(static_cast(GetWideChar(c))) inline StdStrBuf::wchar_t_holder LoadResStrW(const char *id) { return GetWideChar(LoadResStr(id)); } @@ -1426,4 +1426,4 @@ void C4ToolsDlg::EnableControls() NeedPreviewUpdate(); } -#include "C4ConsoleGUICommon.h" +#include "editor/C4ConsoleGUICommon.h" diff --git a/src/editor/C4EditCursor.cpp b/src/editor/C4EditCursor.cpp index 77dbcd9c9..313ff32ce 100644 --- a/src/editor/C4EditCursor.cpp +++ b/src/editor/C4EditCursor.cpp @@ -17,23 +17,23 @@ /* Handles viewport editing in console mode */ -#include -#include +#include "C4Include.h" +#include "editor/C4EditCursor.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "editor/C4Console.h" +#include "object/C4Object.h" +#include "game/C4Application.h" +#include "lib/C4Random.h" +#include "gui/C4MouseControl.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4Texture.h" +#include "graphics/C4GraphicsResource.h" +#include "game/C4Game.h" +#include "object/C4GameObjects.h" +#include "control/C4GameControl.h" #ifdef _WIN32 -#include "resource.h" +#include "res/resource.h" #endif #ifdef USE_GTK diff --git a/src/editor/C4EditCursor.h b/src/editor/C4EditCursor.h index ef9fd2406..ddd7cd550 100644 --- a/src/editor/C4EditCursor.h +++ b/src/editor/C4EditCursor.h @@ -20,9 +20,9 @@ #ifndef INC_C4EditCursor #define INC_C4EditCursor -#include "C4ObjectList.h" -#include "C4Control.h" -#include "C4Rect.h" +#include "object/C4ObjectList.h" +#include "control/C4Control.h" +#include "lib/C4Rect.h" #include #ifdef USE_GTK diff --git a/src/editor/C4EditorWindowController.mm b/src/editor/C4EditorWindowController.mm index 360a6789d..ea6f21836 100644 --- a/src/editor/C4EditorWindowController.mm +++ b/src/editor/C4EditorWindowController.mm @@ -15,11 +15,11 @@ #include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "editor/C4Console.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" +#include "game/C4Game.h" #import #import diff --git a/src/editor/C4ObjectListDlg.cpp b/src/editor/C4ObjectListDlg.cpp index 9b0473d74..8fb158724 100644 --- a/src/editor/C4ObjectListDlg.cpp +++ b/src/editor/C4ObjectListDlg.cpp @@ -16,11 +16,11 @@ /* A window listing all objects in the game */ -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "editor/C4ObjectListDlg.h" +#include "editor/C4Console.h" +#include "object/C4Object.h" +#include "object/C4GameObjects.h" #ifdef USE_GTK diff --git a/src/editor/C4ObjectListDlg.h b/src/editor/C4ObjectListDlg.h index ad3394f17..fbe04c574 100644 --- a/src/editor/C4ObjectListDlg.h +++ b/src/editor/C4ObjectListDlg.h @@ -23,7 +23,7 @@ #include #endif // USE_GTK -#include "C4ObjectList.h" +#include "object/C4ObjectList.h" class C4ObjectListDlg: public C4ObjectListChangeListener { diff --git a/src/editor/C4ToolsDlg.cpp b/src/editor/C4ToolsDlg.cpp index abb63d70b..8f414a2cd 100644 --- a/src/editor/C4ToolsDlg.cpp +++ b/src/editor/C4ToolsDlg.cpp @@ -17,12 +17,12 @@ /* Drawing tools dialog for landscape editing in console mode */ -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "editor/C4ToolsDlg.h" +#include "editor/C4Console.h" +#include "landscape/C4Texture.h" +#include "landscape/C4Landscape.h" +#include "control/C4GameControl.h" bool C4ToolsDlg::Open() { diff --git a/src/editor/C4ToolsDlg.h b/src/editor/C4ToolsDlg.h index c5da73a2d..102399f10 100644 --- a/src/editor/C4ToolsDlg.h +++ b/src/editor/C4ToolsDlg.h @@ -24,7 +24,7 @@ #include #endif -#include "C4Constants.h" +#include "config/C4Constants.h" #include "landscape/C4Landscape.h" const int32_t diff --git a/src/editor/C4ViewportWindow.cpp b/src/editor/C4ViewportWindow.cpp index 7c42abb92..8fe9f5873 100644 --- a/src/editor/C4ViewportWindow.cpp +++ b/src/editor/C4ViewportWindow.cpp @@ -17,13 +17,13 @@ /* A viewport to each player */ -#include -#include +#include "C4Include.h" +#include "editor/C4ViewportWindow.h" -#include -#include -#include -#include +#include "game/C4Viewport.h" +#include "editor/C4Console.h" +#include "landscape/C4Landscape.h" +#include "player/C4PlayerList.h" #ifdef USE_GTK #include diff --git a/src/editor/C4ViewportWindow.h b/src/editor/C4ViewportWindow.h index d6d5e7cef..f792f402e 100644 --- a/src/editor/C4ViewportWindow.h +++ b/src/editor/C4ViewportWindow.h @@ -20,7 +20,7 @@ #ifndef INC_C4ViewportWindow #define INC_C4ViewportWindow -#include +#include "platform/C4Window.h" #ifdef USE_GTK #include diff --git a/src/game/C4Application.cpp b/src/game/C4Application.cpp index d4efe7f3b..a4b23b5bd 100644 --- a/src/game/C4Application.cpp +++ b/src/game/C4Application.cpp @@ -17,29 +17,29 @@ /* Main class to initialize configuration and execute the game */ -#include -#include +#include "C4Include.h" +#include "game/C4Application.h" -#include +#include "C4Version.h" #ifdef _WIN32 -#include +#include "gui/C4UpdateDlg.h" #endif -#include "C4Game.h" -#include -#include "C4GraphicsSystem.h" -#include "C4GraphicsResource.h" -#include "C4MessageInput.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "network/C4Network2.h" +#include "network/C4Network2IRC.h" +#include "landscape/C4Particles.h" +#include "graphics/StdPNG.h" #include diff --git a/src/game/C4Application.h b/src/game/C4Application.h index a5e916707..f38537af0 100644 --- a/src/game/C4Application.h +++ b/src/game/C4Application.h @@ -18,12 +18,12 @@ #ifndef INC_C4Application #define INC_C4Application -#include -#include -#include -#include -#include -#include +#include "c4group/C4Group.h" +#include "platform/C4MusicSystem.h" +#include "platform/C4SoundSystem.h" +#include "c4group/C4Components.h" +#include "network/C4InteractiveThread.h" +#include "platform/C4App.h" class C4ApplicationGameTimer; diff --git a/src/game/C4FullScreen.cpp b/src/game/C4FullScreen.cpp index e395239ba..462ceba14 100644 --- a/src/game/C4FullScreen.cpp +++ b/src/game/C4FullScreen.cpp @@ -17,21 +17,21 @@ /* Main class to execute the game fullscreen mode */ -#include -#include +#include "C4Include.h" +#include "game/C4FullScreen.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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" void C4FullScreen::CharIn(const char * c) { ::pGUI->CharIn(c); } diff --git a/src/game/C4FullScreen.h b/src/game/C4FullScreen.h index fa4baf712..de1f06873 100644 --- a/src/game/C4FullScreen.h +++ b/src/game/C4FullScreen.h @@ -20,7 +20,7 @@ #ifndef INC_C4FullScreen #define INC_C4FullScreen -#include +#include "platform/C4Window.h" bool IsKeyDown(int iKey); diff --git a/src/game/C4Game.cpp b/src/game/C4Game.cpp index 296d1408f..4884b03a2 100644 --- a/src/game/C4Game.cpp +++ b/src/game/C4Game.cpp @@ -17,65 +17,65 @@ /* Main class to run the game */ -#include -#include +#include "C4Include.h" +#include "game/C4Game.h" -#include +#include "script/C4AulDebug.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 -#include -#include -#include -#include -#include -#include -#include -#include +#include "player/C4PlayerList.h" +#include "object/C4GameObjects.h" +#include "control/C4GameControl.h" +#include "C4Version.h" +#include "script/C4AulExec.h" +#include "platform/StdFile.h" +#include "landscape/C4MapScript.h" +#include "landscape/C4SolidMask.h" +#include "landscape/fow/C4FoW.h" #include diff --git a/src/game/C4Game.h b/src/game/C4Game.h index 8784a3d3b..e315e0fd5 100644 --- a/src/game/C4Game.h +++ b/src/game/C4Game.h @@ -20,12 +20,12 @@ #ifndef INC_C4Game #define INC_C4Game -#include -#include -#include -#include "C4Scoreboard.h" -#include -#include +#include "landscape/C4Scenario.h" +#include "landscape/C4PathFinder.h" +#include "c4group/C4Extra.h" +#include "gui/C4Scoreboard.h" +#include "control/C4PlayerControl.h" +#include "landscape/C4TransferZone.h" #include diff --git a/src/game/C4GameScript.cpp b/src/game/C4GameScript.cpp index 75345136b..c9b50a4c3 100644 --- a/src/game/C4GameScript.cpp +++ b/src/game/C4GameScript.cpp @@ -17,32 +17,32 @@ /* Functions mapped by C4Script */ -#include -#include +#include "C4Include.h" +#include "game/C4GameScript.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "game/C4Viewport.h" +#include "landscape/fow/C4FoW.h" #include "landscape/C4Landscape.h" #include "landscape/C4Sky.h" diff --git a/src/game/C4GameScript.h b/src/game/C4GameScript.h index d58e35621..682d06324 100644 --- a/src/game/C4GameScript.h +++ b/src/game/C4GameScript.h @@ -20,7 +20,7 @@ #ifndef INC_C4GameScript #define INC_C4GameScript -#include +#include "script/C4Value.h" // add functions to engine void InitGameFunctionMap(C4AulScriptEngine *pEngine); diff --git a/src/game/C4GameVersion.h b/src/game/C4GameVersion.h index 8cd6b5d87..5d5772d75 100644 --- a/src/game/C4GameVersion.h +++ b/src/game/C4GameVersion.h @@ -18,7 +18,7 @@ #define C4GAMEVERSION_H #include "C4Version.h" -#include "C4InputValidation.h" +#include "lib/C4InputValidation.h" struct C4GameVersion { diff --git a/src/game/C4GraphicsSystem.cpp b/src/game/C4GraphicsSystem.cpp index 4b19ee6ae..172ec9f5c 100644 --- a/src/game/C4GraphicsSystem.cpp +++ b/src/game/C4GraphicsSystem.cpp @@ -17,23 +17,23 @@ /* Operates viewports, message board and draws the game */ -#include -#include +#include "C4Include.h" +#include "game/C4GraphicsSystem.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "game/C4Viewport.h" +#include "game/C4Application.h" +#include "editor/C4Console.h" +#include "game/C4FullScreen.h" +#include "gui/C4Gui.h" +#include "gui/C4LoaderScreen.h" +#include "graphics/C4GraphicsResource.h" +#include "landscape/C4Landscape.h" #include "landscape/C4Sky.h" -#include -#include -#include +#include "network/C4Network2.h" +#include "game/C4Game.h" +#include "object/C4GameObjects.h" -#include +#include "graphics/StdPNG.h" static const int MAX_BACKGROUND_FPS = 5; diff --git a/src/game/C4GraphicsSystem.h b/src/game/C4GraphicsSystem.h index cb7606ccb..ba3ecb18b 100644 --- a/src/game/C4GraphicsSystem.h +++ b/src/game/C4GraphicsSystem.h @@ -20,8 +20,8 @@ #ifndef INC_C4GraphicsSystem #define INC_C4GraphicsSystem -#include -#include +#include "gui/C4MessageBoard.h" +#include "gui/C4UpperBoard.h" #include diff --git a/src/game/C4Physics.h b/src/game/C4Physics.h index b527141da..e4d001db3 100644 --- a/src/game/C4Physics.h +++ b/src/game/C4Physics.h @@ -20,7 +20,7 @@ #ifndef INC_C4Physics #define INC_C4Physics -#include "C4Real.h" +#include "lib/C4Real.h" const int StableRange=10; const int AttachRange=5; diff --git a/src/game/C4Viewport.cpp b/src/game/C4Viewport.cpp index b998616eb..b965b5411 100644 --- a/src/game/C4Viewport.cpp +++ b/src/game/C4Viewport.cpp @@ -17,29 +17,29 @@ /* A viewport to each player */ -#include -#include +#include "C4Include.h" +#include "game/C4Viewport.h" -#include -#include +#include "editor/C4ViewportWindow.h" +#include "editor/C4Console.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4Object.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 -#include -#include -#include +#include "player/C4PlayerList.h" +#include "object/C4GameObjects.h" +#include "network/C4Network2.h" +#include "landscape/fow/C4FoWRegion.h" void C4Viewport::DropFile(const char* fileName, float x, float y) { diff --git a/src/game/C4Viewport.h b/src/game/C4Viewport.h index 5d278e160..17bd5a28f 100644 --- a/src/game/C4Viewport.h +++ b/src/game/C4Viewport.h @@ -20,7 +20,7 @@ #ifndef INC_C4Viewport #define INC_C4Viewport -#include +#include "graphics/C4FacetEx.h" class C4ViewportWindow; class C4FoWRegion; diff --git a/src/game/ClonkMain.cpp b/src/game/ClonkMain.cpp index 01c944a11..dc12c77f2 100644 --- a/src/game/ClonkMain.cpp +++ b/src/game/ClonkMain.cpp @@ -17,13 +17,13 @@ /* Main program entry point */ -#include -#include +#include "C4Include.h" +#include "game/C4Application.h" -#include -#include -#include -#include "C4Network2.h" +#include "lib/C4Log.h" +#include "game/C4Game.h" +#include "C4Version.h" +#include "network/C4Network2.h" #ifdef _WIN32 #include diff --git a/src/graphics/Bitmap256.cpp b/src/graphics/Bitmap256.cpp index bedaf6c95..d1d80b03e 100644 --- a/src/graphics/Bitmap256.cpp +++ b/src/graphics/Bitmap256.cpp @@ -18,8 +18,8 @@ /* A structure for handling 256-color bitmap files */ #include "C4Include.h" -#include -#include +#include "graphics/Bitmap256.h" +#include "lib/StdColors.h" void C4BMPInfo::Default() { diff --git a/src/graphics/Bitmap256.h b/src/graphics/Bitmap256.h index f7a544157..71579e67a 100644 --- a/src/graphics/Bitmap256.h +++ b/src/graphics/Bitmap256.h @@ -21,7 +21,7 @@ #define BITMAP256_H_INC #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #else #pragma pack(push,2) typedef struct tagBITMAPFILEHEADER diff --git a/src/graphics/C4Draw.cpp b/src/graphics/C4Draw.cpp index bdfbdc4fc..802bed33a 100644 --- a/src/graphics/C4Draw.cpp +++ b/src/graphics/C4Draw.cpp @@ -17,18 +17,18 @@ /* NewGfx interfaces */ #include "C4Include.h" -#include +#include "graphics/C4Draw.h" -#include "C4App.h" -#include -#include -#include -#include -#include -#include "C4Rect.h" -#include -#include "StdMesh.h" -#include +#include "platform/C4App.h" +#include "graphics/C4FontLoader.h" +#include "platform/C4Window.h" +#include "graphics/C4DrawGL.h" +#include "graphics/C4DrawT.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 diff --git a/src/graphics/C4Draw.h b/src/graphics/C4Draw.h index d35ba6765..27cf2c022 100644 --- a/src/graphics/C4Draw.h +++ b/src/graphics/C4Draw.h @@ -19,8 +19,8 @@ #ifndef INC_STDDDRAW2 #define INC_STDDDRAW2 -#include -#include +#include "graphics/C4Surface.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 c6edd4334..1a1e31ee3 100644 --- a/src/graphics/C4DrawGL.cpp +++ b/src/graphics/C4DrawGL.cpp @@ -17,14 +17,14 @@ /* OpenGL implementation of NewGfx */ #include "C4Include.h" -#include +#include "graphics/C4DrawGL.h" -#include -#include -#include -#include "C4Rect.h" -#include "C4Config.h" -#include +#include "graphics/C4Surface.h" +#include "platform/C4Window.h" +#include "landscape/fow/C4FoWRegion.h" +#include "lib/C4Rect.h" +#include "config/C4Config.h" +#include "platform/C4App.h" #include "lib/StdColors.h" #ifndef USE_CONSOLE diff --git a/src/graphics/C4DrawGL.h b/src/graphics/C4DrawGL.h index 0fdd0675f..f83cdf3d4 100644 --- a/src/graphics/C4DrawGL.h +++ b/src/graphics/C4DrawGL.h @@ -21,7 +21,7 @@ #define INC_StdGL #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #endif #include @@ -29,8 +29,8 @@ #ifdef USE_COCOA #import "ObjectiveCAssociated.h" #endif -#include -#include +#include "graphics/C4Draw.h" +#include "graphics/C4Shader.h" class C4Window; diff --git a/src/graphics/C4DrawGLCtx.cpp b/src/graphics/C4DrawGLCtx.cpp index a3075f941..6cbdb45ff 100644 --- a/src/graphics/C4DrawGLCtx.cpp +++ b/src/graphics/C4DrawGLCtx.cpp @@ -17,10 +17,10 @@ /* OpenGL implementation of NewGfx, the context */ #include "C4Include.h" -#include +#include "graphics/C4DrawGL.h" -#include -#include +#include "platform/C4Window.h" +#include "platform/C4App.h" #ifndef USE_CONSOLE diff --git a/src/graphics/C4DrawGLMac.h b/src/graphics/C4DrawGLMac.h index 8ea8f72ef..a0837f969 100644 --- a/src/graphics/C4DrawGLMac.h +++ b/src/graphics/C4DrawGLMac.h @@ -14,7 +14,7 @@ */ #import -#include +#include "platform/C4Window.h" #ifdef USE_COCOA diff --git a/src/graphics/C4DrawGLMac.mm b/src/graphics/C4DrawGLMac.mm index edc3ceac8..dba6285e0 100644 --- a/src/graphics/C4DrawGLMac.mm +++ b/src/graphics/C4DrawGLMac.mm @@ -13,20 +13,20 @@ * for the above references. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "game/C4GraphicsSystem.h" +#include "gui/C4MouseControl.h" +#include "gui/C4Gui.h" +#include "game/C4Game.h" +#include "game/C4Viewport.h" +#include "editor/C4ViewportWindow.h" +#include "editor/C4Console.h" +#include "game/C4FullScreen.h" +#include "player/C4PlayerList.h" +#include "gui/C4Gui.h" +#include "landscape/C4Landscape.h" -#include +#include "graphics/C4DrawGL.h" #import "C4DrawGLMac.h" #import "C4WindowController.h" diff --git a/src/graphics/C4DrawMeshGL.cpp b/src/graphics/C4DrawMeshGL.cpp index f48004855..2eaa919a8 100644 --- a/src/graphics/C4DrawMeshGL.cpp +++ b/src/graphics/C4DrawMeshGL.cpp @@ -17,12 +17,12 @@ /* OpenGL implementation of Mesh Rendering */ #include "C4Include.h" -#include -#include -#include -#include +#include "object/C4Object.h" +#include "graphics/C4DrawGL.h" +#include "landscape/fow/C4FoWRegion.h" +#include "lib/SHA1.h" -#include "StdMesh.h" +#include "lib/StdMesh.h" #include "graphics/C4GraphicsResource.h" #include #include diff --git a/src/graphics/C4DrawT.cpp b/src/graphics/C4DrawT.cpp index aeded3a97..72bd9bcbb 100644 --- a/src/graphics/C4DrawT.cpp +++ b/src/graphics/C4DrawT.cpp @@ -14,8 +14,8 @@ * for the above references. */ #include "C4Include.h" -#include -#include +#include "graphics/C4DrawT.h" +#include "lib/StdMeshMaterial.h" CStdNoGfx::CStdNoGfx() { diff --git a/src/graphics/C4DrawT.h b/src/graphics/C4DrawT.h index 53cee78f3..4f33e8938 100644 --- a/src/graphics/C4DrawT.h +++ b/src/graphics/C4DrawT.h @@ -18,7 +18,7 @@ #ifndef INC_StdNoGfx #define INC_StdNoGfx -#include +#include "graphics/C4Draw.h" class CStdNoGfx : public C4Draw { diff --git a/src/graphics/C4Facet.cpp b/src/graphics/C4Facet.cpp index 1b82168d4..481d15a41 100644 --- a/src/graphics/C4Facet.cpp +++ b/src/graphics/C4Facet.cpp @@ -17,11 +17,11 @@ /* A piece of a DirectDraw surface */ -#include -#include -#include +#include "C4Include.h" +#include "graphics/C4Facet.h" +#include "graphics/C4GraphicsResource.h" -#include +#include "lib/StdAdaptors.h" #ifdef WITH_GLIB #include diff --git a/src/graphics/C4Facet.h b/src/graphics/C4Facet.h index ac8ab087f..91e4bc978 100644 --- a/src/graphics/C4Facet.h +++ b/src/graphics/C4Facet.h @@ -20,7 +20,7 @@ #ifndef INC_C4Facet #define INC_C4Facet -#include +#include "graphics/C4Draw.h" const int32_t C4FCT_None = 0, diff --git a/src/graphics/C4FacetEx.cpp b/src/graphics/C4FacetEx.cpp index 7e9689913..040adc663 100644 --- a/src/graphics/C4FacetEx.cpp +++ b/src/graphics/C4FacetEx.cpp @@ -17,11 +17,11 @@ /* A facet that can hold its own surface and also target coordinates */ -#include -#include +#include "C4Include.h" +#include "graphics/C4FacetEx.h" -#include -#include +#include "lib/C4Rect.h" +#include "c4group/C4Group.h" void C4TargetFacet::Set(C4Surface * nsfc, float nx, float ny, float nwdt, float nhgt, float ntx, float nty, float Zoom) { diff --git a/src/graphics/C4FacetEx.h b/src/graphics/C4FacetEx.h index 4fac07000..345670c14 100644 --- a/src/graphics/C4FacetEx.h +++ b/src/graphics/C4FacetEx.h @@ -20,8 +20,8 @@ #ifndef INC_C4FacetEx #define INC_C4FacetEx -#include -#include +#include "graphics/C4Facet.h" +#include "graphics/C4Surface.h" const int C4FCT_Full = -1, C4FCT_Height = -2, diff --git a/src/graphics/C4FontLoader.cpp b/src/graphics/C4FontLoader.cpp index 3b48702e9..9d89b4e2f 100644 --- a/src/graphics/C4FontLoader.cpp +++ b/src/graphics/C4FontLoader.cpp @@ -16,24 +16,24 @@ // text drawing facility for C4Draw -#include -#include "C4FontLoader.h" +#include "C4Include.h" +#include "graphics/C4FontLoader.h" #ifndef USE_CONSOLE -#include -#include -#include -#include -#include -#include -#include -#include "StdColors.h" +#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 #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #endif #include diff --git a/src/graphics/C4FontLoader.h b/src/graphics/C4FontLoader.h index 0e2f4b849..781492e61 100644 --- a/src/graphics/C4FontLoader.h +++ b/src/graphics/C4FontLoader.h @@ -18,9 +18,9 @@ #ifndef INC_STDFONT #define INC_STDFONT -#include -#include -#include +#include "lib/C4Markup.h" +#include "graphics/C4Facet.h" +#include "lib/StdBuf.h" #include #include diff --git a/src/graphics/C4GraphicsResource.cpp b/src/graphics/C4GraphicsResource.cpp index 383a91ac1..cfb6a0ed0 100644 --- a/src/graphics/C4GraphicsResource.cpp +++ b/src/graphics/C4GraphicsResource.cpp @@ -17,15 +17,15 @@ /* Loads all standard graphics from Graphics.ocg */ -#include -#include +#include "C4Include.h" +#include "graphics/C4GraphicsResource.h" -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "graphics/C4FontLoader.h" +#include "lib/C4Log.h" +#include "game/C4Game.h" +#include "c4group/C4Components.h" +#include "graphics/C4DrawGL.h" /* C4GraphicsResource */ diff --git a/src/graphics/C4GraphicsResource.h b/src/graphics/C4GraphicsResource.h index 95456813e..edf70672c 100644 --- a/src/graphics/C4GraphicsResource.h +++ b/src/graphics/C4GraphicsResource.h @@ -20,11 +20,11 @@ #ifndef INC_C4GraphicsResource #define INC_C4GraphicsResource -#include -#include -#include -#include -#include +#include "c4group/C4GroupSet.h" +#include "graphics/C4Surface.h" +#include "graphics/C4FacetEx.h" +#include "gui/C4Gui.h" +#include "player/C4ScenarioParameters.h" class C4GraphicsResource { diff --git a/src/graphics/C4Shader.cpp b/src/graphics/C4Shader.cpp index 79122412f..91af2e043 100644 --- a/src/graphics/C4Shader.cpp +++ b/src/graphics/C4Shader.cpp @@ -14,8 +14,8 @@ */ #include "C4Include.h" -#include "C4Shader.h" -#include "C4Application.h" +#include "graphics/C4Shader.h" +#include "game/C4Application.h" #include "graphics/C4DrawGL.h" // How often we check whether shader files got updated diff --git a/src/graphics/C4Shader.h b/src/graphics/C4Shader.h index c7efd45e2..64bbd1433 100644 --- a/src/graphics/C4Shader.h +++ b/src/graphics/C4Shader.h @@ -18,12 +18,12 @@ #ifndef INC_C4Shader #define INC_C4Shader -#include "StdBuf.h" -#include "StdMeshMath.h" -#include "C4Surface.h" +#include "lib/StdBuf.h" +#include "lib/StdMeshMath.h" +#include "graphics/C4Surface.h" #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #endif #include diff --git a/src/graphics/C4Surface.cpp b/src/graphics/C4Surface.cpp index 24bf9a0d4..5fcbdf713 100644 --- a/src/graphics/C4Surface.cpp +++ b/src/graphics/C4Surface.cpp @@ -17,18 +17,18 @@ // a wrapper class to DirectDraw surfaces #include "C4Include.h" -#include +#include "graphics/C4Surface.h" -#include -#include -#include "C4App.h" -#include -#include -#include -#include -#include -#include -#include +#include "platform/StdFile.h" +#include "c4group/CStdFile.h" +#include "platform/C4App.h" +#include "graphics/C4DrawGL.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" diff --git a/src/graphics/C4Surface.h b/src/graphics/C4Surface.h index c36ac4558..603a27b54 100644 --- a/src/graphics/C4Surface.h +++ b/src/graphics/C4Surface.h @@ -18,7 +18,7 @@ #ifndef INC_StdSurface2 #define INC_StdSurface2 -#include +#include "lib/C4Rect.h" #include diff --git a/src/graphics/C4SurfaceLoaders.cpp b/src/graphics/C4SurfaceLoaders.cpp index b97eb4ac9..41f94e4ca 100644 --- a/src/graphics/C4SurfaceLoaders.cpp +++ b/src/graphics/C4SurfaceLoaders.cpp @@ -17,13 +17,13 @@ /* Extension to C4Surface that handles bitmaps in C4Group files */ -#include -#include +#include "C4Include.h" +#include "graphics/C4Surface.h" -#include -#include -#include -#include +#include "c4group/C4GroupSet.h" +#include "c4group/C4Group.h" +#include "lib/C4Log.h" +#include "graphics/StdPNG.h" #include "lib/StdColors.h" bool C4Surface::LoadAny(C4Group &hGroup, const char *szName, bool fOwnPal, bool fNoErrIfNotFound, int iFlags) diff --git a/src/graphics/CSurface8.cpp b/src/graphics/CSurface8.cpp index 98ec9ac22..953a669be 100644 --- a/src/graphics/CSurface8.cpp +++ b/src/graphics/CSurface8.cpp @@ -17,11 +17,11 @@ // a wrapper class to DirectDraw surfaces #include "C4Include.h" -#include +#include "graphics/CSurface8.h" -#include -#include -#include +#include "graphics/Bitmap256.h" +#include "c4group/CStdFile.h" +#include "lib/StdColors.h" CSurface8::CSurface8() { diff --git a/src/graphics/StdPNG.cpp b/src/graphics/StdPNG.cpp index 7f5e57a7c..d8840753d 100644 --- a/src/graphics/StdPNG.cpp +++ b/src/graphics/StdPNG.cpp @@ -16,10 +16,10 @@ // png file reading functionality #include "C4Include.h" -#include +#include "graphics/StdPNG.h" -#include -#include +#include "lib/StdColors.h" +#include "platform/StdScheduler.h" // png reading proc void PNGAPI CPNGFile::CPNGReadFn(png_structp png_ptr, png_bytep data, size_t length) diff --git a/src/gui/C4ChatDlg.cpp b/src/gui/C4ChatDlg.cpp index 4ce9841ad..dd371c837 100644 --- a/src/gui/C4ChatDlg.cpp +++ b/src/gui/C4ChatDlg.cpp @@ -16,13 +16,13 @@ // IRC client dialog #include "C4Include.h" -#include "C4ChatDlg.h" +#include "gui/C4ChatDlg.h" -#include -#include "C4InputValidation.h" -#include "C4Network2IRC.h" -#include "C4MessageInput.h" -#include "C4GraphicsResource.h" +#include "game/C4Application.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/C4ChatDlg.h b/src/gui/C4ChatDlg.h index fc64a133f..06548c6c2 100644 --- a/src/gui/C4ChatDlg.h +++ b/src/gui/C4ChatDlg.h @@ -18,8 +18,8 @@ #ifndef INC_C4ChatDlg #define INC_C4ChatDlg -#include "C4Gui.h" -#include "C4InteractiveThread.h" +#include "gui/C4Gui.h" +#include "network/C4InteractiveThread.h" // a GUI control to chat in class C4ChatControl : public C4GUI::Window, private C4InteractiveThread::Callback diff --git a/src/gui/C4DownloadDlg.cpp b/src/gui/C4DownloadDlg.cpp index 1095d6df7..6ab1b06bd 100644 --- a/src/gui/C4DownloadDlg.cpp +++ b/src/gui/C4DownloadDlg.cpp @@ -16,10 +16,10 @@ // HTTP download dialog; downloads a file #include "C4Include.h" -#include "C4DownloadDlg.h" +#include "gui/C4DownloadDlg.h" -#include "C4Log.h" -#include "C4GraphicsResource.h" +#include "lib/C4Log.h" +#include "graphics/C4GraphicsResource.h" C4Network2HTTPClient HTTPClient; diff --git a/src/gui/C4DownloadDlg.h b/src/gui/C4DownloadDlg.h index e2e76c34f..f09ea4fca 100644 --- a/src/gui/C4DownloadDlg.h +++ b/src/gui/C4DownloadDlg.h @@ -19,8 +19,8 @@ #ifndef INC_C4DownloadDlg #define INC_C4DownloadDlg -#include "C4Gui.h" -#include "C4Network2Reference.h" // includes HTTP client +#include "gui/C4Gui.h" +#include "network/C4Network2Reference.h" // includes HTTP client // dialog to download a file class C4DownloadDlg : public C4GUI::Dialog diff --git a/src/gui/C4FileSelDlg.cpp b/src/gui/C4FileSelDlg.cpp index 1bbfdfee0..95ded03ab 100644 --- a/src/gui/C4FileSelDlg.cpp +++ b/src/gui/C4FileSelDlg.cpp @@ -15,12 +15,12 @@ */ // file selection dialogs -#include -#include +#include "C4Include.h" +#include "gui/C4FileSelDlg.h" -#include // only for single use of ::GraphicsResource.fctOKCancel below... -#include -#include +#include "graphics/C4GraphicsResource.h" // only for single use of ::GraphicsResource.fctOKCancel below... +#include "C4Version.h" +#include "graphics/C4Draw.h" #ifdef _WIN32 #ifndef _WIN32_IE diff --git a/src/gui/C4FileSelDlg.h b/src/gui/C4FileSelDlg.h index 06416ce72..ef8465c3a 100644 --- a/src/gui/C4FileSelDlg.h +++ b/src/gui/C4FileSelDlg.h @@ -18,8 +18,8 @@ #ifndef INC_C4FileSelDlg #define INC_C4FileSelDlg -#include -#include +#include "gui/C4Gui.h" +#include "c4group/C4Components.h" // callback handler for file selection dialog class C4FileSel_BaseCB diff --git a/src/gui/C4Folder.cpp b/src/gui/C4Folder.cpp index 2b2442101..11e45c379 100644 --- a/src/gui/C4Folder.cpp +++ b/src/gui/C4Folder.cpp @@ -16,11 +16,11 @@ /* Core component of a folder */ -#include -#include +#include "C4Include.h" +#include "gui/C4Folder.h" -#include -#include +#include "c4group/C4Group.h" +#include "c4group/C4Components.h" //================= C4FolderHead ==================== diff --git a/src/gui/C4GameDialogs.cpp b/src/gui/C4GameDialogs.cpp index a8c938190..8cf6cf718 100644 --- a/src/gui/C4GameDialogs.cpp +++ b/src/gui/C4GameDialogs.cpp @@ -15,11 +15,11 @@ */ // main game dialogs (abort game dlg, observer dlg) -#include -#include +#include "C4Include.h" +#include "gui/C4GameDialogs.h" -#include -#include +#include "game/C4Game.h" +#include "network/C4Network2.h" bool C4AbortGameDialog::is_shown = false; diff --git a/src/gui/C4GameDialogs.h b/src/gui/C4GameDialogs.h index 56e2d5dd4..d00c38fcb 100644 --- a/src/gui/C4GameDialogs.h +++ b/src/gui/C4GameDialogs.h @@ -18,7 +18,7 @@ #ifndef INC_C4GameDialogs #define INC_C4GameDialogs -#include +#include "gui/C4Gui.h" class C4AbortGameDialog : public C4GUI::ConfirmationDialog { diff --git a/src/gui/C4GameLobby.cpp b/src/gui/C4GameLobby.cpp index c5418f4cf..66c70314f 100644 --- a/src/gui/C4GameLobby.cpp +++ b/src/gui/C4GameLobby.cpp @@ -15,20 +15,20 @@ */ // the ingame-lobby -#include -#include +#include "C4Include.h" +#include "gui/C4GameLobby.h" -#include -#include -#include "C4Network2Dialogs.h" -#include "C4GameOptions.h" -#include "C4ChatDlg.h" -#include "C4PlayerInfoListBox.h" -#include -#include -#include -#include "C4GraphicsResource.h" -#include "C4GameControl.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" namespace C4GameLobby { diff --git a/src/gui/C4GameLobby.h b/src/gui/C4GameLobby.h index b25c25816..bf0f9aa9c 100644 --- a/src/gui/C4GameLobby.h +++ b/src/gui/C4GameLobby.h @@ -18,8 +18,8 @@ #ifndef INC_C4GameLobby #define INC_C4GameLobby -#include "C4Gui.h" -#include +#include "gui/C4Gui.h" +#include "network/C4PacketBase.h" namespace C4GameLobby { diff --git a/src/gui/C4GameMessage.cpp b/src/gui/C4GameMessage.cpp index e6df5710d..346423c07 100644 --- a/src/gui/C4GameMessage.cpp +++ b/src/gui/C4GameMessage.cpp @@ -17,14 +17,14 @@ /* Text messages drawn inside the viewport */ -#include -#include +#include "C4Include.h" +#include "gui/C4GameMessage.h" #include "object/C4Def.h" -#include -#include -#include -#include +#include "object/C4Object.h" +#include "graphics/C4GraphicsResource.h" +#include "player/C4Player.h" +#include "player/C4PlayerList.h" const int32_t ObjectMsgDelayFactor = 2, GlobalMsgDelayFactor = 3; // frames per char message display time diff --git a/src/gui/C4GameMessage.h b/src/gui/C4GameMessage.h index d449730b7..f8c7365f4 100644 --- a/src/gui/C4GameMessage.h +++ b/src/gui/C4GameMessage.h @@ -20,8 +20,8 @@ #ifndef INC_C4GameMessage #define INC_C4GameMessage -#include -#include +#include "lib/StdColors.h" +#include "script/C4Value.h" const int32_t C4GM_MaxText = 256, C4GM_MinDelay = 20; diff --git a/src/gui/C4GameOptions.cpp b/src/gui/C4GameOptions.cpp index 032133d24..41ac98565 100644 --- a/src/gui/C4GameOptions.cpp +++ b/src/gui/C4GameOptions.cpp @@ -16,14 +16,14 @@ // Custom game options and configuration dialog #include "C4Include.h" -#include "C4GameOptions.h" +#include "gui/C4GameOptions.h" -#include -#include -#include -#include "C4GraphicsResource.h" -#include "C4GameLobby.h" -#include "C4Startup.h" +#include "game/C4Application.h" +#include "game/C4Game.h" +#include "control/C4GameControl.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4GameLobby.h" +#include "gui/C4Startup.h" // ----------- C4GameOptionsList::Option ---------------------------------------------------------------- diff --git a/src/gui/C4GameOptions.h b/src/gui/C4GameOptions.h index c88fdd522..18f3c8ddd 100644 --- a/src/gui/C4GameOptions.h +++ b/src/gui/C4GameOptions.h @@ -18,7 +18,7 @@ #ifndef INC_C4GameOptions #define INC_C4GameOptions -#include "C4Gui.h" +#include "gui/C4Gui.h" // options dialog: created as listbox inside another dialog // used to configure some standard runtime options, as well as custom game options diff --git a/src/gui/C4GameOverDlg.cpp b/src/gui/C4GameOverDlg.cpp index 761d15fca..3e0c1b616 100644 --- a/src/gui/C4GameOverDlg.cpp +++ b/src/gui/C4GameOverDlg.cpp @@ -15,20 +15,20 @@ */ // game over dialog showing winners and losers -#include -#include +#include "C4Include.h" +#include "gui/C4GameOverDlg.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "C4GraphicsResource.h" +#include "game/C4Application.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" // --------------------------------------------------- diff --git a/src/gui/C4GameOverDlg.h b/src/gui/C4GameOverDlg.h index c8e9d472d..6b3bea227 100644 --- a/src/gui/C4GameOverDlg.h +++ b/src/gui/C4GameOverDlg.h @@ -18,8 +18,8 @@ #ifndef INC_C4GameOverDlg #define INC_C4GameOverDlg -#include -#include +#include "gui/C4Gui.h" +#include "control/C4RoundResults.h" // horizontal display of goal symbols; filfilled goals marked // maybe to be reused for a game goal dialog? diff --git a/src/gui/C4GfxErrorDlg.cpp b/src/gui/C4GfxErrorDlg.cpp index d72e69443..dde145b2d 100644 --- a/src/gui/C4GfxErrorDlg.cpp +++ b/src/gui/C4GfxErrorDlg.cpp @@ -15,15 +15,15 @@ /* Functions for displaying a settings dialogue to users when the graphics system failed */ -#include +#include "C4Include.h" #ifdef _WIN32 -#include -#include -#include -#include -#include +#include "res/resource.h" +#include "C4Version.h" +#include "game/C4Application.h" +#include "platform/C4windowswrapper.h" +#include "gui/C4GfxErrorDlg.h" #include "graphics/C4Draw.h" diff --git a/src/gui/C4Gui.cpp b/src/gui/C4Gui.cpp index c5300f20d..214cd68e8 100644 --- a/src/gui/C4Gui.cpp +++ b/src/gui/C4Gui.cpp @@ -16,18 +16,18 @@ // generic user interface // all generic classes that do not fit into other C4Gui*-files -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "game/C4GraphicsSystem.h" namespace C4GUI { diff --git a/src/gui/C4Gui.h b/src/gui/C4Gui.h index f703ae872..16fee2b0c 100644 --- a/src/gui/C4Gui.h +++ b/src/gui/C4Gui.h @@ -23,14 +23,14 @@ #ifndef INC_C4Gui #define INC_C4Gui -#include -#include "C4Rect.h" -#include "C4FacetEx.h" -#include "C4LogBuf.h" -#include "C4KeyboardInput.h" -#include -#include -#include +#include "graphics/C4FontLoader.h" +#include "lib/C4Rect.h" +#include "graphics/C4FacetEx.h" +#include "lib/C4LogBuf.h" +#include "gui/C4KeyboardInput.h" +#include "platform/StdScheduler.h" +#include "object/C4Id.h" +#include "platform/C4Window.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 124fff641..a6bf1c158 100644 --- a/src/gui/C4GuiButton.cpp +++ b/src/gui/C4GuiButton.cpp @@ -16,12 +16,12 @@ // generic user interface // that which can be pressed -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" +#include "graphics/C4Draw.h" namespace C4GUI { diff --git a/src/gui/C4GuiCheckBox.cpp b/src/gui/C4GuiCheckBox.cpp index 68b253cf0..cc56f52cb 100644 --- a/src/gui/C4GuiCheckBox.cpp +++ b/src/gui/C4GuiCheckBox.cpp @@ -16,14 +16,14 @@ // generic user interface // checkbox -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include +#include "graphics/C4FacetEx.h" +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" -#include +#include "platform/C4Window.h" namespace C4GUI { diff --git a/src/gui/C4GuiComboBox.cpp b/src/gui/C4GuiComboBox.cpp index 15b013ffb..914ed3e23 100644 --- a/src/gui/C4GuiComboBox.cpp +++ b/src/gui/C4GuiComboBox.cpp @@ -17,14 +17,14 @@ // dropdown box // implemented via context menu -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include +#include "graphics/C4FacetEx.h" +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" -#include +#include "platform/C4Window.h" namespace C4GUI { diff --git a/src/gui/C4GuiContainers.cpp b/src/gui/C4GuiContainers.cpp index b52c8f9d0..0aa3d2748 100644 --- a/src/gui/C4GuiContainers.cpp +++ b/src/gui/C4GuiContainers.cpp @@ -16,11 +16,11 @@ // generic user interface // grouping elements and control base classes -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" namespace C4GUI { diff --git a/src/gui/C4GuiDialogs.cpp b/src/gui/C4GuiDialogs.cpp index 60efec242..aa5dd9b8c 100644 --- a/src/gui/C4GuiDialogs.cpp +++ b/src/gui/C4GuiDialogs.cpp @@ -17,19 +17,19 @@ // generic user interface // dialog base classes and some user dialogs -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "game/C4Application.h" +#include "game/C4Viewport.h" +#include "object/C4Def.h" +#include "graphics/C4GraphicsResource.h" +#include "game/C4Application.h" +#include "game/C4GameScript.h" -#include -#include +#include "graphics/C4DrawGL.h" +#include "platform/StdRegistry.h" namespace C4GUI { diff --git a/src/gui/C4GuiEdit.cpp b/src/gui/C4GuiEdit.cpp index a118910c0..f67414f5e 100644 --- a/src/gui/C4GuiEdit.cpp +++ b/src/gui/C4GuiEdit.cpp @@ -16,12 +16,12 @@ // generic user interface // room for textual deconvolution -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include +#include "game/C4Application.h" +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" namespace C4GUI { diff --git a/src/gui/C4GuiLabels.cpp b/src/gui/C4GuiLabels.cpp index 9db88cb0d..7759e66ad 100644 --- a/src/gui/C4GuiLabels.cpp +++ b/src/gui/C4GuiLabels.cpp @@ -16,11 +16,11 @@ // generic user interface // eye candy -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" namespace C4GUI { diff --git a/src/gui/C4GuiListBox.cpp b/src/gui/C4GuiListBox.cpp index 6471cf2dc..c0ce9fcc3 100644 --- a/src/gui/C4GuiListBox.cpp +++ b/src/gui/C4GuiListBox.cpp @@ -16,10 +16,10 @@ // generic user interface // container for a dynamic number of vertically stacked controls -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include +#include "gui/C4MouseControl.h" #include namespace C4GUI diff --git a/src/gui/C4GuiMenu.cpp b/src/gui/C4GuiMenu.cpp index 97a5378ca..16a2bf52e 100644 --- a/src/gui/C4GuiMenu.cpp +++ b/src/gui/C4GuiMenu.cpp @@ -16,14 +16,14 @@ // generic user interface // context menu -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include +#include "graphics/C4FacetEx.h" +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" -#include +#include "platform/C4Window.h" namespace C4GUI { diff --git a/src/gui/C4GuiTabular.cpp b/src/gui/C4GuiTabular.cpp index 2a1813a45..38075cf6e 100644 --- a/src/gui/C4GuiTabular.cpp +++ b/src/gui/C4GuiTabular.cpp @@ -16,12 +16,12 @@ // generic user interface // tab control -#include -#include +#include "C4Include.h" +#include "gui/C4Gui.h" -#include -#include -#include +#include "graphics/C4FacetEx.h" +#include "gui/C4MouseControl.h" +#include "graphics/C4GraphicsResource.h" namespace C4GUI { diff --git a/src/gui/C4KeyboardInput.cpp b/src/gui/C4KeyboardInput.cpp index cdb109161..779252c44 100644 --- a/src/gui/C4KeyboardInput.cpp +++ b/src/gui/C4KeyboardInput.cpp @@ -15,12 +15,12 @@ */ // Keyboard input mapping to engine functions -#include -#include +#include "C4Include.h" +#include "gui/C4KeyboardInput.h" -#include -#include -#include +#include "c4group/C4Components.h" +#include "game/C4Game.h" +#include "platform/C4Window.h" #ifdef USE_GTK #include @@ -81,7 +81,7 @@ struct C4KeyCodeMapEntry }; #if defined(USE_COCOA) -#include "CocoaKeycodeMap.h" +#include "platform/CocoaKeycodeMap.h" #else const C4KeyCodeMapEntry KeyCodeMap[] = { {K_ESCAPE, "Escape", "Esc"}, diff --git a/src/gui/C4LoaderScreen.cpp b/src/gui/C4LoaderScreen.cpp index 4affc7bc5..ad79c3106 100644 --- a/src/gui/C4LoaderScreen.cpp +++ b/src/gui/C4LoaderScreen.cpp @@ -15,16 +15,16 @@ */ // startup screen -#include -#include +#include "C4Include.h" +#include "gui/C4LoaderScreen.h" -#include -#include -#include -#include -#include -#include -#include +#include "c4group/C4Components.h" +#include "lib/C4LogBuf.h" +#include "lib/C4Log.h" +#include "graphics/C4GraphicsResource.h" +#include "lib/C4Random.h" +#include "c4group/C4GroupSet.h" +#include "game/C4Game.h" C4LoaderScreen::C4LoaderScreen() { diff --git a/src/gui/C4LoaderScreen.h b/src/gui/C4LoaderScreen.h index 58e889c77..f116956a0 100644 --- a/src/gui/C4LoaderScreen.h +++ b/src/gui/C4LoaderScreen.h @@ -18,7 +18,7 @@ #ifndef INC_C4LoaderScreen #define INC_C4LoaderScreen -#include +#include "graphics/C4FacetEx.h" class C4LoaderScreen { diff --git a/src/gui/C4MainMenu.cpp b/src/gui/C4MainMenu.cpp index dde72cbb5..e7556750d 100644 --- a/src/gui/C4MainMenu.cpp +++ b/src/gui/C4MainMenu.cpp @@ -16,22 +16,22 @@ */ // Engine internal C4Menus: Main menu, Options, Player join, Hostility, etc. -#include -#include +#include "C4Include.h" +#include "gui/C4MainMenu.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "network/C4Network2.h" +#include "control/C4GameControl.h" +#include "object/C4Def.h" // ----------------------------------------------------------- // C4MainMenu diff --git a/src/gui/C4MainMenu.h b/src/gui/C4MainMenu.h index 05bf72d22..3eaafd327 100644 --- a/src/gui/C4MainMenu.h +++ b/src/gui/C4MainMenu.h @@ -18,7 +18,7 @@ #ifndef INC_C4MainMenu #define INC_C4MainMenu -#include "C4Menu.h" +#include "gui/C4Menu.h" // Menu identification constants for main menus enum diff --git a/src/gui/C4Menu.cpp b/src/gui/C4Menu.cpp index 6c591c1d0..5422ffe14 100644 --- a/src/gui/C4Menu.cpp +++ b/src/gui/C4Menu.cpp @@ -17,19 +17,19 @@ /* In-game menu as used by objects, players, and fullscreen options */ -#include -#include +#include "C4Include.h" +#include "gui/C4Menu.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "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 diff --git a/src/gui/C4Menu.h b/src/gui/C4Menu.h index e4e8ea063..29c003e7b 100644 --- a/src/gui/C4Menu.h +++ b/src/gui/C4Menu.h @@ -20,10 +20,10 @@ #ifndef INC_C4Menu #define INC_C4Menu -#include "C4Id.h" -#include "C4FacetEx.h" -#include "C4Gui.h" -#include "C4IDList.h" +#include "object/C4Id.h" +#include "graphics/C4FacetEx.h" +#include "gui/C4Gui.h" +#include "object/C4IDList.h" enum { diff --git a/src/gui/C4MessageBoard.cpp b/src/gui/C4MessageBoard.cpp index 35f66f210..571333dbf 100644 --- a/src/gui/C4MessageBoard.cpp +++ b/src/gui/C4MessageBoard.cpp @@ -17,19 +17,19 @@ /* Fullscreen startup log and chat type-in */ -#include -#include +#include "C4Include.h" +#include "gui/C4MessageBoard.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "gui/C4MessageInput.h" +#include "game/C4Game.h" +#include "player/C4PlayerList.h" +#include "game/C4FullScreen.h" #include "lib/StdColors.h" const int C4LogSize=30000, C4LogMaxLines=1000; diff --git a/src/gui/C4MessageBoard.h b/src/gui/C4MessageBoard.h index 617507fbe..49376f95b 100644 --- a/src/gui/C4MessageBoard.h +++ b/src/gui/C4MessageBoard.h @@ -22,8 +22,8 @@ const int C4MSGB_MaxMsgFading = 6; -#include -#include +#include "graphics/C4Facet.h" +#include "lib/C4LogBuf.h" class C4CustomKey; class C4MessageBoard diff --git a/src/gui/C4MessageInput.cpp b/src/gui/C4MessageInput.cpp index b906f7191..7e455adf5 100644 --- a/src/gui/C4MessageInput.cpp +++ b/src/gui/C4MessageInput.cpp @@ -15,21 +15,21 @@ */ // handles input dialogs, last-message-buffer, MessageBoard-commands -#include -#include +#include "C4Include.h" +#include "gui/C4MessageInput.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "game/C4Game.h" +#include "object/C4Object.h" +#include "gui/C4Gui.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" // -------------------------------------------------- // C4ChatInputDialog diff --git a/src/gui/C4MessageInput.h b/src/gui/C4MessageInput.h index cdd2c0c65..ab9bb60ed 100644 --- a/src/gui/C4MessageInput.h +++ b/src/gui/C4MessageInput.h @@ -18,8 +18,8 @@ #ifndef INC_C4MessageInput #define INC_C4MessageInput -#include "C4Gui.h" -#include "C4ObjectPtr.h" +#include "gui/C4Gui.h" +#include "object/C4ObjectPtr.h" const int32_t C4MSGB_BackBufferMax = 20; diff --git a/src/gui/C4MouseControl.cpp b/src/gui/C4MouseControl.cpp index f8a102fa1..a42d0b5b8 100644 --- a/src/gui/C4MouseControl.cpp +++ b/src/gui/C4MouseControl.cpp @@ -17,23 +17,23 @@ /* Mouse input */ -#include -#include +#include "C4Include.h" +#include "gui/C4MouseControl.h" -#include +#include "game/C4Viewport.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include "C4ChatDlg.h" -#include -#include -#include -#include +#include "object/C4Object.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 "player/C4PlayerList.h" +#include "control/C4GameControl.h" +#include "gui/C4ScriptGuiWindow.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 70f42fe20..e1b220025 100644 --- a/src/gui/C4MouseControl.h +++ b/src/gui/C4MouseControl.h @@ -20,8 +20,8 @@ #ifndef INC_C4MouseControl #define INC_C4MouseControl -#include -#include "C4ObjectList.h" +#include "graphics/C4Facet.h" +#include "object/C4ObjectList.h" const int32_t C4MC_Button_None = 0, C4MC_Button_LeftDown = 1, diff --git a/src/gui/C4PlayerInfoListBox.cpp b/src/gui/C4PlayerInfoListBox.cpp index aef6bdcf0..ec3e54eac 100644 --- a/src/gui/C4PlayerInfoListBox.cpp +++ b/src/gui/C4PlayerInfoListBox.cpp @@ -15,20 +15,20 @@ */ // player listbox used in lobby and game over dlg -#include -#include +#include "C4Include.h" +#include "gui/C4PlayerInfoListBox.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "control/C4PlayerInfo.h" +#include "network/C4Network2Dialogs.h" +#include "control/C4Teams.h" +#include "game/C4Game.h" +#include "gui/C4FileSelDlg.h" +#include "graphics/C4GraphicsResource.h" +#include "gui/C4MouseControl.h" +#include "network/C4Network2.h" +#include "control/C4GameControl.h" +#include "control/C4RoundResults.h" +#include "gui/C4GameLobby.h" DWORD GenerateRandomPlayerColor(int32_t iTry); // in C4PlayerInfoConflicts.cpp diff --git a/src/gui/C4PlayerInfoListBox.h b/src/gui/C4PlayerInfoListBox.h index cc78ce9bc..fec4d49cf 100644 --- a/src/gui/C4PlayerInfoListBox.h +++ b/src/gui/C4PlayerInfoListBox.h @@ -18,7 +18,7 @@ #ifndef INC_C4PlayerInfoListBox #define INC_C4PlayerInfoListBox -#include "C4Gui.h" +#include "gui/C4Gui.h" class C4PlayerInfoListBox : public C4GUI::ListBox { diff --git a/src/gui/C4Scoreboard.cpp b/src/gui/C4Scoreboard.cpp index 7fdfb15b8..a5f1180b0 100644 --- a/src/gui/C4Scoreboard.cpp +++ b/src/gui/C4Scoreboard.cpp @@ -16,11 +16,11 @@ // script-controlled InGame dialog to show player infos #include "C4Include.h" -#include "C4Scoreboard.h" +#include "gui/C4Scoreboard.h" -#include "C4Gui.h" -#include "C4GameOverDlg.h" -#include +#include "gui/C4Gui.h" +#include "gui/C4GameOverDlg.h" +#include "graphics/C4GraphicsResource.h" class C4ScoreboardDlg : public C4GUI::Dialog diff --git a/src/gui/C4ScriptGuiWindow.cpp b/src/gui/C4ScriptGuiWindow.cpp index 8711fdc5d..eb4a16568 100644 --- a/src/gui/C4ScriptGuiWindow.cpp +++ b/src/gui/C4ScriptGuiWindow.cpp @@ -26,21 +26,21 @@ serialized correctly and cleaned up if necessary when a menu window is closed or the property is overwritten by a script call! */ -#include -#include +#include "C4Include.h" +#include "gui/C4ScriptGuiWindow.h" -#include +#include "game/C4Application.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "game/C4GraphicsSystem.h" +#include "graphics/C4GraphicsResource.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 diff --git a/src/gui/C4ScriptGuiWindow.h b/src/gui/C4ScriptGuiWindow.h index f86ddc819..009e10c28 100644 --- a/src/gui/C4ScriptGuiWindow.h +++ b/src/gui/C4ScriptGuiWindow.h @@ -18,10 +18,10 @@ #ifndef INC_C4ScriptGuiWindow #define INC_C4ScriptGuiWindow -#include -#include +#include "graphics/C4Surface.h" +#include "gui/C4Gui.h" -#include +#include "script/C4Value.h" #include diff --git a/src/gui/C4Startup.cpp b/src/gui/C4Startup.cpp index 840d92af0..0c87107d4 100644 --- a/src/gui/C4Startup.cpp +++ b/src/gui/C4Startup.cpp @@ -15,21 +15,21 @@ */ // Startup screen for non-parameterized engine start -#include -#include +#include "C4Include.h" +#include "gui/C4Startup.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "graphics/C4FontLoader.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" bool C4StartupGraphics::LoadFile(C4FacetID &rToFct, const char *szFilename) { diff --git a/src/gui/C4Startup.h b/src/gui/C4Startup.h index 83ffa1af8..6d59be02e 100644 --- a/src/gui/C4Startup.h +++ b/src/gui/C4Startup.h @@ -18,7 +18,7 @@ #ifndef INC_C4Startup #define INC_C4Startup -#include "C4Gui.h" +#include "gui/C4Gui.h" #define C4CFN_StartupBackgroundMain "StartupMainMenuBG" diff --git a/src/gui/C4StartupAboutDlg.cpp b/src/gui/C4StartupAboutDlg.cpp index ba06d9301..d939c5a99 100644 --- a/src/gui/C4StartupAboutDlg.cpp +++ b/src/gui/C4StartupAboutDlg.cpp @@ -15,12 +15,12 @@ */ // About/credits screen -#include -#include +#include "C4Include.h" +#include "gui/C4StartupAboutDlg.h" -#include -#include -#include +#include "gui/C4UpdateDlg.h" +#include "graphics/C4GraphicsResource.h" +#include "C4Version.h" // ------------------------------------------------ // --- C4StartupAboutDlg diff --git a/src/gui/C4StartupAboutDlg.h b/src/gui/C4StartupAboutDlg.h index 4e8e3e793..b1ba20d5b 100644 --- a/src/gui/C4StartupAboutDlg.h +++ b/src/gui/C4StartupAboutDlg.h @@ -18,7 +18,7 @@ #ifndef INC_C4StartupAboutDlg #define INC_C4StartupAboutDlg -#include "C4Startup.h" +#include "gui/C4Startup.h" // startup dialog: credits class C4StartupAboutDlg : public C4StartupDlg diff --git a/src/gui/C4StartupMainDlg.cpp b/src/gui/C4StartupMainDlg.cpp index 26bc4aa20..af04c9de4 100644 --- a/src/gui/C4StartupMainDlg.cpp +++ b/src/gui/C4StartupMainDlg.cpp @@ -15,23 +15,23 @@ */ // Startup screen for non-parameterized engine start (stub) -#include -#include +#include "C4Include.h" +#include "gui/C4StartupMainDlg.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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" C4StartupMainDlg::C4StartupMainDlg() : C4StartupDlg(NULL) // create w/o title; it is drawn in custom draw proc diff --git a/src/gui/C4StartupMainDlg.h b/src/gui/C4StartupMainDlg.h index 1aa3c9128..7d19a5e8f 100644 --- a/src/gui/C4StartupMainDlg.h +++ b/src/gui/C4StartupMainDlg.h @@ -18,7 +18,7 @@ #ifndef INC_C4StartupMainDlg #define INC_C4StartupMainDlg -#include "C4Startup.h" +#include "gui/C4Startup.h" class C4StartupMainDlg : public C4StartupDlg { diff --git a/src/gui/C4StartupNetDlg.cpp b/src/gui/C4StartupNetDlg.cpp index 74e73e210..48fdc468d 100644 --- a/src/gui/C4StartupNetDlg.cpp +++ b/src/gui/C4StartupNetDlg.cpp @@ -15,16 +15,16 @@ */ // Startup screen for non-parameterized engine start: Network game selection dialog -#include -#include +#include "C4Include.h" +#include "gui/C4StartupNetDlg.h" -#include -#include -#include -#include -#include "C4ChatDlg.h" -#include -#include +#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 "network/C4Network2Reference.h" // ----------- C4StartupNetListEntry ----------------------------------------------------------------------- diff --git a/src/gui/C4StartupNetDlg.h b/src/gui/C4StartupNetDlg.h index 0e3330ce1..eef40005e 100644 --- a/src/gui/C4StartupNetDlg.h +++ b/src/gui/C4StartupNetDlg.h @@ -18,9 +18,9 @@ #ifndef INC_C4StartupNetDlg #define INC_C4StartupNetDlg -#include "C4Startup.h" -#include "C4Network2Discover.h" -#include "C4Network2Reference.h" +#include "gui/C4Startup.h" +#include "network/C4Network2Discover.h" +#include "network/C4Network2Reference.h" // ----------------------------------------------- diff --git a/src/gui/C4StartupOptionsDlg.cpp b/src/gui/C4StartupOptionsDlg.cpp index 9403dddf0..f3f0a041d 100644 --- a/src/gui/C4StartupOptionsDlg.cpp +++ b/src/gui/C4StartupOptionsDlg.cpp @@ -15,20 +15,20 @@ */ // Startup screen for non-parameterized engine start: Options dialog -#include -#include +#include "C4Include.h" +#include "gui/C4StartupOptionsDlg.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "network/C4Network2.h" +#include "gui/C4MouseControl.h" -#include +#include "graphics/C4DrawGL.h" // ------------------------------------------------ // --- C4StartupOptionsDlg::SmallButton diff --git a/src/gui/C4StartupOptionsDlg.h b/src/gui/C4StartupOptionsDlg.h index 0a4e332d9..405a0529c 100644 --- a/src/gui/C4StartupOptionsDlg.h +++ b/src/gui/C4StartupOptionsDlg.h @@ -18,7 +18,7 @@ #ifndef INC_C4StartupOptionsDlg #define INC_C4StartupOptionsDlg -#include "C4Startup.h" +#include "gui/C4Startup.h" // startup dialog: Options class C4StartupOptionsDlg : public C4StartupDlg diff --git a/src/gui/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp index 0f95bd5a9..6943ebb53 100644 --- a/src/gui/C4StartupPlrSelDlg.cpp +++ b/src/gui/C4StartupPlrSelDlg.cpp @@ -16,20 +16,20 @@ // Startup screen for non-parameterized engine start: Player selection dialog // Also contains player creation, editing and crew management -#include +#include "C4Include.h" #include -#include +#include "gui/C4StartupPlrSelDlg.h" -#include -#include -#include -#include -#include -#include -#include -#include +#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 "player/C4RankSystem.h" #include "gui/C4MouseControl.h" #include "lib/StdColors.h" #include diff --git a/src/gui/C4StartupPlrSelDlg.h b/src/gui/C4StartupPlrSelDlg.h index a91b2834c..623213cc0 100644 --- a/src/gui/C4StartupPlrSelDlg.h +++ b/src/gui/C4StartupPlrSelDlg.h @@ -20,8 +20,8 @@ #define INC_C4StartupPlrSelDlg #include -#include "C4Startup.h" -#include "C4InfoCore.h" +#include "gui/C4Startup.h" +#include "object/C4InfoCore.h" // startup dialog: Player selection class C4StartupPlrSelDlg : public C4StartupDlg diff --git a/src/gui/C4StartupScenSelDlg.cpp b/src/gui/C4StartupScenSelDlg.cpp index 7906b12b1..f9fbe3246 100644 --- a/src/gui/C4StartupScenSelDlg.cpp +++ b/src/gui/C4StartupScenSelDlg.cpp @@ -15,23 +15,23 @@ */ // Startup screen for non-parameterized engine start: Scenario selection dialog -#include -#include +#include "C4Include.h" +#include "gui/C4StartupScenSelDlg.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 // singleton diff --git a/src/gui/C4StartupScenSelDlg.h b/src/gui/C4StartupScenSelDlg.h index f18a6578c..a12229c5a 100644 --- a/src/gui/C4StartupScenSelDlg.h +++ b/src/gui/C4StartupScenSelDlg.h @@ -18,10 +18,10 @@ #ifndef INC_C4StartupScenSelDlg #define INC_C4StartupScenSelDlg -#include "C4Startup.h" -#include "C4Scenario.h" -#include "C4Folder.h" -#include "C4ScenarioParameters.h" +#include "gui/C4Startup.h" +#include "landscape/C4Scenario.h" +#include "gui/C4Folder.h" +#include "player/C4ScenarioParameters.h" #include #include diff --git a/src/gui/C4UpdateDlg.cpp b/src/gui/C4UpdateDlg.cpp index 940ceb0bd..3a49b5683 100644 --- a/src/gui/C4UpdateDlg.cpp +++ b/src/gui/C4UpdateDlg.cpp @@ -17,12 +17,12 @@ // is only compiled WITH_AUTOMATIC_UPDATE #include "C4Include.h" -#include "C4UpdateDlg.h" +#include "gui/C4UpdateDlg.h" -#include -#include -#include "C4DownloadDlg.h" -#include +#include "game/C4Application.h" +#include "c4group/C4Components.h" +#include "gui/C4DownloadDlg.h" +#include "lib/C4Log.h" #ifdef _WIN32 #include diff --git a/src/gui/C4UpdateDlg.h b/src/gui/C4UpdateDlg.h index ebaf7ef95..904cc4364 100644 --- a/src/gui/C4UpdateDlg.h +++ b/src/gui/C4UpdateDlg.h @@ -20,9 +20,9 @@ #ifdef WITH_AUTOMATIC_UPDATE -#include "C4Gui.h" -#include "C4GameVersion.h" -#include "C4Network2Reference.h" +#include "gui/C4Gui.h" +#include "game/C4GameVersion.h" +#include "network/C4Network2Reference.h" // dialog showing info about a connected client class C4UpdateDlg : public C4GUI::InfoDialog diff --git a/src/gui/C4UpperBoard.cpp b/src/gui/C4UpperBoard.cpp index 6d566d1ba..382d4d704 100644 --- a/src/gui/C4UpperBoard.cpp +++ b/src/gui/C4UpperBoard.cpp @@ -13,12 +13,12 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include +#include "C4Include.h" +#include "gui/C4UpperBoard.h" -#include -#include -#include +#include "game/C4Game.h" +#include "config/C4Config.h" +#include "graphics/C4GraphicsResource.h" C4UpperBoard::C4UpperBoard() { diff --git a/src/gui/C4UpperBoard.h b/src/gui/C4UpperBoard.h index dc47c0c2d..7beada643 100644 --- a/src/gui/C4UpperBoard.h +++ b/src/gui/C4UpperBoard.h @@ -16,7 +16,7 @@ #ifndef INC_C4UpperBoard #define INC_C4UpperBoard -#include +#include "graphics/C4Facet.h" class C4UpperBoard { diff --git a/src/landscape/C4Landscape.h b/src/landscape/C4Landscape.h index 1c6be6a14..9c798e0fc 100644 --- a/src/landscape/C4Landscape.h +++ b/src/landscape/C4Landscape.h @@ -21,7 +21,7 @@ #define INC_C4Landscape #include "C4Prototypes.h" -#include "C4Constants.h" +#include "config/C4Constants.h" const int32_t C4MaxMaterial = 125; diff --git a/src/landscape/C4LandscapeRender.cpp b/src/landscape/C4LandscapeRender.cpp index ff9a2b95f..28cb660ef 100644 --- a/src/landscape/C4LandscapeRender.cpp +++ b/src/landscape/C4LandscapeRender.cpp @@ -14,17 +14,17 @@ */ #include "C4Include.h" -#include "C4LandscapeRender.h" +#include "landscape/C4LandscapeRender.h" -#include "C4Landscape.h" -#include "C4Texture.h" -#include "C4FoWRegion.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4Texture.h" +#include "landscape/fow/C4FoWRegion.h" -#include "C4GroupSet.h" -#include "C4Components.h" +#include "c4group/C4GroupSet.h" +#include "c4group/C4Components.h" -#include "C4DrawGL.h" -#include "StdColors.h" +#include "graphics/C4DrawGL.h" +#include "lib/StdColors.h" #include diff --git a/src/landscape/C4LandscapeRender.h b/src/landscape/C4LandscapeRender.h index a459efc39..67a8f34df 100644 --- a/src/landscape/C4LandscapeRender.h +++ b/src/landscape/C4LandscapeRender.h @@ -17,9 +17,9 @@ #ifndef C4LANDSCAPE_RENDER_H #define C4LANDSCAPE_RENDER_H -#include "C4Surface.h" -#include "C4FacetEx.h" -#include "C4Shader.h" +#include "graphics/C4Surface.h" +#include "graphics/C4FacetEx.h" +#include "graphics/C4Shader.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 3ca2ffdd0..c0360fe08 100644 --- a/src/landscape/C4Map.cpp +++ b/src/landscape/C4Map.cpp @@ -17,12 +17,12 @@ /* Create map from dynamic landscape data in scenario */ -#include -#include +#include "C4Include.h" +#include "landscape/C4Map.h" -#include -#include -#include +#include "lib/C4Random.h" +#include "landscape/C4Texture.h" +#include "graphics/CSurface8.h" C4MapCreator::C4MapCreator() { diff --git a/src/landscape/C4MapCreatorS2.cpp b/src/landscape/C4MapCreatorS2.cpp index 0b2d00a59..f715b9187 100644 --- a/src/landscape/C4MapCreatorS2.cpp +++ b/src/landscape/C4MapCreatorS2.cpp @@ -15,14 +15,14 @@ */ // complex dynamic landscape creator -#include -#include -#include -#include -#include -#include -#include -#include +#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" namespace { // node attribute entry for SetField search diff --git a/src/landscape/C4MapScript.cpp b/src/landscape/C4MapScript.cpp index 54be86c44..1e062834f 100644 --- a/src/landscape/C4MapScript.cpp +++ b/src/landscape/C4MapScript.cpp @@ -17,13 +17,13 @@ /* Handles scripted map creation */ -#include -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "landscape/C4MapScript.h" +#include "script/C4AulDefFunc.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4Texture.h" +#include "lib/C4Random.h" +#include "game/C4GameScript.h" C4MapScriptAlgo *FnParAlgo(C4PropList *algo_par); diff --git a/src/landscape/C4MapScript.h b/src/landscape/C4MapScript.h index 8e0b30617..c3123dc73 100644 --- a/src/landscape/C4MapScript.h +++ b/src/landscape/C4MapScript.h @@ -20,12 +20,12 @@ #ifndef INC_C4MapScript #define INC_C4MapScript -#include -#include -#include -#include -#include -#include +#include "c4group/C4ComponentHost.h" +#include "script/C4Aul.h" +#include "script/C4ScriptHost.h" +#include "lib/C4Rect.h" +#include "graphics/CSurface8.h" +#include "landscape/C4Landscape.h" // mattex masks: Array of bools for each possible material-texture index class C4MapScriptMatTexMask diff --git a/src/landscape/C4MapScriptAlgo.cpp b/src/landscape/C4MapScriptAlgo.cpp index 249de0f8a..13958552f 100644 --- a/src/landscape/C4MapScriptAlgo.cpp +++ b/src/landscape/C4MapScriptAlgo.cpp @@ -17,9 +17,9 @@ /* Handles scripted map creation */ -#include -#include -#include +#include "C4Include.h" +#include "landscape/C4MapScript.h" +#include "lib/C4Random.h" C4MapScriptAlgo *FnParAlgo(C4PropList *algo_par); diff --git a/src/landscape/C4MassMover.cpp b/src/landscape/C4MassMover.cpp index 9c0144ce7..8575d6b66 100644 --- a/src/landscape/C4MassMover.cpp +++ b/src/landscape/C4MassMover.cpp @@ -17,14 +17,14 @@ /* Move liquids in the landscape using individual transport spots */ -#include -#include +#include "C4Include.h" +#include "landscape/C4MassMover.h" -#include -#include -#include -#include -#include +#include "c4group/C4Components.h" +#include "lib/C4Random.h" +#include "landscape/C4Material.h" +#include "landscape/C4Landscape.h" +#include "control/C4Record.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 34ddf75dc..f7c300ed1 100644 --- a/src/landscape/C4Material.cpp +++ b/src/landscape/C4Material.cpp @@ -17,21 +17,21 @@ /* Material definitions used by the landscape */ -#include -#include -#include +#include "C4Include.h" +#include "landscape/C4Material.h" +#include "c4group/C4Components.h" -#include -#include -#include -#include // For C4TLS_MatSky... -#include -#include -#include -#include -#include -#include -#include // For GravAccel +#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 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 4508edc34..7197eb90d 100644 --- a/src/landscape/C4Material.h +++ b/src/landscape/C4Material.h @@ -21,11 +21,11 @@ #define INC_C4Material #include "config/C4Constants.h" -#include "C4Real.h" -#include -#include -#include -#include +#include "lib/C4Real.h" +#include "object/C4Id.h" +#include "object/C4Shape.h" +#include "graphics/C4Facet.h" +#include "graphics/CSurface8.h" #include #define C4MatOv_Default 0 diff --git a/src/landscape/C4MaterialList.cpp b/src/landscape/C4MaterialList.cpp index e86897c75..76071aeae 100644 --- a/src/landscape/C4MaterialList.cpp +++ b/src/landscape/C4MaterialList.cpp @@ -17,8 +17,8 @@ /* A primitive list to store one amount value per mapped material */ -#include -#include +#include "C4Include.h" +#include "landscape/C4MaterialList.h" C4MaterialList::C4MaterialList() { diff --git a/src/landscape/C4MaterialList.h b/src/landscape/C4MaterialList.h index 7775f1312..77d71aa20 100644 --- a/src/landscape/C4MaterialList.h +++ b/src/landscape/C4MaterialList.h @@ -20,7 +20,7 @@ #ifndef INC_C4MaterialList #define INC_C4MaterialList -#include +#include "landscape/C4Landscape.h" class C4MaterialList { diff --git a/src/landscape/C4PXS.cpp b/src/landscape/C4PXS.cpp index 3d4e83803..ac1e9d042 100644 --- a/src/landscape/C4PXS.cpp +++ b/src/landscape/C4PXS.cpp @@ -17,15 +17,15 @@ /* Pixel Sprite system for tiny bits of moving material */ -#include -#include +#include "C4Include.h" +#include "landscape/C4PXS.h" -#include -#include -#include -#include -#include -#include +#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" static const C4Real WindDrift_Factor = itofix(1, 800); diff --git a/src/landscape/C4PXS.h b/src/landscape/C4PXS.h index 920d6230c..0126059d4 100644 --- a/src/landscape/C4PXS.h +++ b/src/landscape/C4PXS.h @@ -20,7 +20,7 @@ #ifndef INC_C4PXS #define INC_C4PXS -#include +#include "landscape/C4Material.h" class C4PXS { diff --git a/src/landscape/C4Particles.cpp b/src/landscape/C4Particles.cpp index b1aa072af..c5b18cba8 100644 --- a/src/landscape/C4Particles.cpp +++ b/src/landscape/C4Particles.cpp @@ -13,27 +13,27 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "landscape/C4Particles.h" // headers for particle loading -#include -#include -#include +#include "lib/C4Log.h" +#include "c4group/C4Components.h" +#include "config/C4Config.h" #ifndef USE_CONSOLE // headers for particle execution #include "script/C4Aul.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "game/C4Application.h" +#include "script/C4Value.h" +#include "script/C4ValueArray.h" +#include "landscape/C4Material.h" +#include "object/C4MeshAnimation.h" +#include "graphics/C4DrawGL.h" +#include "lib/C4Random.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4Weather.h" +#include "object/C4Object.h" #endif diff --git a/src/landscape/C4Particles.h b/src/landscape/C4Particles.h index 1884fa949..e18810653 100644 --- a/src/landscape/C4Particles.h +++ b/src/landscape/C4Particles.h @@ -13,9 +13,9 @@ * for the above references. */ -#include +#include "graphics/C4FacetEx.h" -#include +#include "platform/StdScheduler.h" #ifndef INC_C4Particles diff --git a/src/landscape/C4PathFinder.cpp b/src/landscape/C4PathFinder.cpp index 821c1320f..2f75a2984 100644 --- a/src/landscape/C4PathFinder.cpp +++ b/src/landscape/C4PathFinder.cpp @@ -43,11 +43,11 @@ */ -#include -#include +#include "C4Include.h" +#include "landscape/C4PathFinder.h" -#include -#include +#include "graphics/C4FacetEx.h" +#include "game/C4GraphicsSystem.h" #include "lib/StdColors.h" const int32_t C4PF_MaxDepth = 35, diff --git a/src/landscape/C4Scenario.cpp b/src/landscape/C4Scenario.cpp index da63adbfe..1e6fc95b1 100644 --- a/src/landscape/C4Scenario.cpp +++ b/src/landscape/C4Scenario.cpp @@ -17,14 +17,14 @@ /* Core component of a scenario file */ -#include -#include +#include "C4Include.h" +#include "landscape/C4Scenario.h" -#include -#include -#include -#include -#include +#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/C4Scenario.h b/src/landscape/C4Scenario.h index a40dea436..ad984ec15 100644 --- a/src/landscape/C4Scenario.h +++ b/src/landscape/C4Scenario.h @@ -20,8 +20,8 @@ #ifndef INC_C4Scenario #define INC_C4Scenario -#include -#include +#include "lib/C4NameList.h" +#include "object/C4IDList.h" class C4SVal { diff --git a/src/landscape/C4ScenarioSection.cpp b/src/landscape/C4ScenarioSection.cpp index dc975d56a..9d1b17841 100644 --- a/src/landscape/C4ScenarioSection.cpp +++ b/src/landscape/C4ScenarioSection.cpp @@ -15,10 +15,10 @@ * for the above references. */ -#include -#include -#include -#include +#include "C4Include.h" +#include "landscape/C4Scenario.h" +#include "c4group/C4Components.h" +#include "script/C4ScriptHost.h" // scenario sections diff --git a/src/landscape/C4Sky.cpp b/src/landscape/C4Sky.cpp index 2d4e08862..b64a835f1 100644 --- a/src/landscape/C4Sky.cpp +++ b/src/landscape/C4Sky.cpp @@ -17,14 +17,14 @@ /* Small member of the landscape class to handle the sky background */ -#include -#include +#include "C4Include.h" +#include "landscape/C4Sky.h" -#include -#include -#include -#include -#include +#include "game/C4Game.h" +#include "lib/C4Random.h" +#include "c4group/C4Components.h" +#include "landscape/C4Weather.h" +#include "graphics/C4GraphicsResource.h" #include "lib/StdColors.h" void C4Sky::SetFadePalette(int32_t *ipColors) diff --git a/src/landscape/C4Sky.h b/src/landscape/C4Sky.h index 798c99dae..c60623c89 100644 --- a/src/landscape/C4Sky.h +++ b/src/landscape/C4Sky.h @@ -20,8 +20,8 @@ #ifndef INC_C4Sky #define INC_C4Sky -#include "C4Real.h" -#include "C4Shader.h" +#include "lib/C4Real.h" +#include "graphics/C4Shader.h" #define C4SkyPM_Fixed 0 // sky parallax mode: fixed #define C4SkyPM_Wind 1 // sky parallax mode: blown by the wind diff --git a/src/landscape/C4SolidMask.cpp b/src/landscape/C4SolidMask.cpp index 3cfb93ac9..d46ca24c0 100644 --- a/src/landscape/C4SolidMask.cpp +++ b/src/landscape/C4SolidMask.cpp @@ -16,16 +16,16 @@ /* Solid areas of objects, put into the landscape */ -#include -#include +#include "C4Include.h" +#include "landscape/C4SolidMask.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include +#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 "landscape/C4Material.h" diff --git a/src/landscape/C4SolidMask.h b/src/landscape/C4SolidMask.h index 64ed4fab2..738de0e21 100644 --- a/src/landscape/C4SolidMask.h +++ b/src/landscape/C4SolidMask.h @@ -19,8 +19,8 @@ #ifndef INC_C4SolidMask #define INC_C4SolidMask -#include -#include +#include "object/C4ObjectList.h" +#include "object/C4Shape.h" class C4SolidMask { diff --git a/src/landscape/C4Texture.cpp b/src/landscape/C4Texture.cpp index ac5ae458e..8a9efc40b 100644 --- a/src/landscape/C4Texture.cpp +++ b/src/landscape/C4Texture.cpp @@ -17,17 +17,17 @@ /* Textures used by the landscape */ -#include -#include -#include +#include "C4Include.h" +#include "landscape/C4Texture.h" +#include "landscape/C4TextureShape.h" -#include -#include -#include -#include -#include -#include -#include +#include "c4group/C4Group.h" +#include "game/C4Game.h" +#include "config/C4Config.h" +#include "c4group/C4Components.h" +#include "landscape/C4Material.h" +#include "landscape/C4Landscape.h" +#include "lib/C4Log.h" #include "lib/StdColors.h" #include diff --git a/src/landscape/C4Texture.h b/src/landscape/C4Texture.h index 8b0d4a319..92337a3bf 100644 --- a/src/landscape/C4Texture.h +++ b/src/landscape/C4Texture.h @@ -20,10 +20,10 @@ #ifndef INC_C4Texture #define INC_C4Texture -#include -#include -#include -#include +#include "landscape/C4TextureShape.h" +#include "graphics/C4Surface.h" +#include "config/C4Constants.h" +#include "landscape/C4Material.h" class C4Texture { diff --git a/src/landscape/C4TextureShape.cpp b/src/landscape/C4TextureShape.cpp index 7bb960ac0..ceb8c620d 100644 --- a/src/landscape/C4TextureShape.cpp +++ b/src/landscape/C4TextureShape.cpp @@ -17,13 +17,13 @@ /* Textures used by the landscape */ -#include -#include +#include "C4Include.h" +#include "landscape/C4TextureShape.h" -#include -#include -#include -#include +#include "c4group/C4Group.h" +#include "landscape/C4Landscape.h" +#include "lib/C4Log.h" +#include "graphics/StdPNG.h" // -------------------------------------- C4TextureShape diff --git a/src/landscape/C4TextureShape.h b/src/landscape/C4TextureShape.h index 9e9169b13..20b1ff959 100644 --- a/src/landscape/C4TextureShape.h +++ b/src/landscape/C4TextureShape.h @@ -20,7 +20,7 @@ #ifndef INC_C4TextureShape #define INC_C4TextureShape -#include +#include "graphics/CSurface8.h" // Custom texture drawing shape for Map2Landscape zooming class C4TextureShape diff --git a/src/landscape/C4TransferZone.cpp b/src/landscape/C4TransferZone.cpp index a899ed3d8..5e0058c6a 100644 --- a/src/landscape/C4TransferZone.cpp +++ b/src/landscape/C4TransferZone.cpp @@ -17,12 +17,12 @@ /* Special regions to extend the pathfinder */ -#include -#include +#include "C4Include.h" +#include "landscape/C4TransferZone.h" -#include -#include -#include +#include "graphics/C4FacetEx.h" +#include "landscape/C4Landscape.h" +#include "object/C4GameObjects.h" #include "lib/StdColors.h" C4TransferZone::C4TransferZone() diff --git a/src/landscape/C4Weather.cpp b/src/landscape/C4Weather.cpp index 2c90a6d4b..b4be993db 100644 --- a/src/landscape/C4Weather.cpp +++ b/src/landscape/C4Weather.cpp @@ -17,14 +17,14 @@ /* Controls temperature, wind, and natural disasters */ -#include -#include +#include "C4Include.h" +#include "landscape/C4Weather.h" -#include -#include -#include -#include -#include +#include "object/C4Object.h" +#include "lib/C4Random.h" +#include "game/C4GraphicsSystem.h" +#include "game/C4Game.h" +#include "platform/C4SoundSystem.h" C4Weather::C4Weather() { diff --git a/src/landscape/C4Weather.h b/src/landscape/C4Weather.h index 635fe1fff..5c34da5c8 100644 --- a/src/landscape/C4Weather.h +++ b/src/landscape/C4Weather.h @@ -20,7 +20,7 @@ #ifndef INC_C4Weather #define INC_C4Weather -#include +#include "landscape/C4Landscape.h" class C4Weather { public: diff --git a/src/landscape/fow/C4FoW.cpp b/src/landscape/fow/C4FoW.cpp index d13a51307..13d41730a 100644 --- a/src/landscape/fow/C4FoW.cpp +++ b/src/landscape/fow/C4FoW.cpp @@ -14,7 +14,7 @@ */ #include "C4Include.h" -#include "C4FoW.h" +#include "landscape/fow/C4FoW.h" #include diff --git a/src/landscape/fow/C4FoW.h b/src/landscape/fow/C4FoW.h index 07aa34caf..80ab13de4 100644 --- a/src/landscape/fow/C4FoW.h +++ b/src/landscape/fow/C4FoW.h @@ -16,13 +16,13 @@ #ifndef C4FOW_H #define C4FOW_H -#include "C4Surface.h" -#include "C4FacetEx.h" -#include "C4Rect.h" -#include "C4Object.h" -#include "C4FoWLight.h" -#include "C4FoWAmbient.h" -#include "C4Shader.h" +#include "graphics/C4Surface.h" +#include "graphics/C4FacetEx.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/C4FoWAmbient.cpp b/src/landscape/fow/C4FoWAmbient.cpp index 67fcbc71a..ab1cfd98f 100644 --- a/src/landscape/fow/C4FoWAmbient.cpp +++ b/src/landscape/fow/C4FoWAmbient.cpp @@ -14,8 +14,8 @@ */ #include "C4Include.h" -#include "C4FoWAmbient.h" -#include "C4FoW.h" +#include "landscape/fow/C4FoWAmbient.h" +#include "landscape/fow/C4FoW.h" namespace { diff --git a/src/landscape/fow/C4FoWAmbient.h b/src/landscape/fow/C4FoWAmbient.h index 5e80c1962..12e28c4f8 100644 --- a/src/landscape/fow/C4FoWAmbient.h +++ b/src/landscape/fow/C4FoWAmbient.h @@ -16,7 +16,7 @@ #ifndef C4FOWAMBIENT_H #define C4FOWAMBIENT_H -#include +#include "landscape/C4Landscape.h" #ifndef USE_CONSOLE #include #endif diff --git a/src/landscape/fow/C4FoWBeam.cpp b/src/landscape/fow/C4FoWBeam.cpp index d6757616f..f2975b699 100644 --- a/src/landscape/fow/C4FoWBeam.cpp +++ b/src/landscape/fow/C4FoWBeam.cpp @@ -16,7 +16,7 @@ #include "C4Include.h" #ifndef USE_CONSOLE -#include "C4FoWBeam.h" +#include "landscape/fow/C4FoWBeam.h" // Maximum error allowed while merging beams. const int32_t C4FoWMergeThreshold = 10; // (in landscape pixels * 2) diff --git a/src/landscape/fow/C4FoWBeam.h b/src/landscape/fow/C4FoWBeam.h index 531e7a4eb..2cdafcf16 100644 --- a/src/landscape/fow/C4FoWBeam.h +++ b/src/landscape/fow/C4FoWBeam.h @@ -17,7 +17,7 @@ #define C4FOWBEAM_H #ifndef USE_CONSOLE -#include "StdBuf.h" +#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.cpp b/src/landscape/fow/C4FoWDrawStrategy.cpp index 371372e7c..d4330a385 100644 --- a/src/landscape/fow/C4FoWDrawStrategy.cpp +++ b/src/landscape/fow/C4FoWDrawStrategy.cpp @@ -17,10 +17,10 @@ #ifndef USE_CONSOLE -#include "C4FoWDrawStrategy.h" -#include "C4FoWLight.h" -#include "C4FoWRegion.h" -#include "C4DrawGL.h" +#include "landscape/fow/C4FoWDrawStrategy.h" +#include "landscape/fow/C4FoWLight.h" +#include "landscape/fow/C4FoWRegion.h" +#include "graphics/C4DrawGL.h" C4FoWDrawTriangulator::C4FoWDrawTriangulator(): mode(M_Fan), cur_vertices(0), begin_vertices(0) diff --git a/src/landscape/fow/C4FoWDrawStrategy.h b/src/landscape/fow/C4FoWDrawStrategy.h index bf8e9b8fa..7f1d22aa6 100644 --- a/src/landscape/fow/C4FoWDrawStrategy.h +++ b/src/landscape/fow/C4FoWDrawStrategy.h @@ -18,8 +18,8 @@ #ifndef USE_CONSOLE -#include "C4DrawGL.h" -#include "C4Shader.h" +#include "graphics/C4DrawGL.h" +#include "graphics/C4Shader.h" #include class C4FoWRegion; diff --git a/src/landscape/fow/C4FoWLight.cpp b/src/landscape/fow/C4FoWLight.cpp index 1f2156855..a99273213 100644 --- a/src/landscape/fow/C4FoWLight.cpp +++ b/src/landscape/fow/C4FoWLight.cpp @@ -17,12 +17,12 @@ #ifndef USE_CONSOLE -#include "C4FoWLight.h" -#include "C4FoWLightSection.h" -#include "C4FoWBeamTriangle.h" -#include "C4FoWDrawStrategy.h" -#include "C4PlayerList.h" -#include "C4Player.h" +#include "landscape/fow/C4FoWLight.h" +#include "landscape/fow/C4FoWLightSection.h" +#include "landscape/fow/C4FoWBeamTriangle.h" +#include "landscape/fow/C4FoWDrawStrategy.h" +#include "player/C4PlayerList.h" +#include "player/C4Player.h" #include "lib/StdColors.h" #include diff --git a/src/landscape/fow/C4FoWLight.h b/src/landscape/fow/C4FoWLight.h index 72f445162..369ea88e0 100644 --- a/src/landscape/fow/C4FoWLight.h +++ b/src/landscape/fow/C4FoWLight.h @@ -17,12 +17,12 @@ #ifndef USE_CONSOLE -#include "C4Object.h" -#include "C4Surface.h" -#include "C4FacetEx.h" -#include "C4FoWLightSection.h" -#include "C4FoWDrawStrategy.h" -#include "C4Rect.h" +#include "object/C4Object.h" +#include "graphics/C4Surface.h" +#include "graphics/C4FacetEx.h" +#include "landscape/fow/C4FoWLightSection.h" +#include "landscape/fow/C4FoWDrawStrategy.h" +#include "lib/C4Rect.h" #include diff --git a/src/landscape/fow/C4FoWLightSection.cpp b/src/landscape/fow/C4FoWLightSection.cpp index 8e37c57ed..8ee9226b4 100644 --- a/src/landscape/fow/C4FoWLightSection.cpp +++ b/src/landscape/fow/C4FoWLightSection.cpp @@ -17,12 +17,12 @@ #ifndef USE_CONSOLE -#include "C4FoWLightSection.h" -#include "C4FoWBeamTriangle.h" -#include "C4FoWBeam.h" -#include "C4FoWLight.h" -#include "C4FoWRegion.h" -#include "C4Landscape.h" +#include "landscape/fow/C4FoWLightSection.h" +#include "landscape/fow/C4FoWBeamTriangle.h" +#include "landscape/fow/C4FoWBeam.h" +#include "landscape/fow/C4FoWLight.h" +#include "landscape/fow/C4FoWRegion.h" +#include "landscape/C4Landscape.h" #include "float.h" diff --git a/src/landscape/fow/C4FoWLightSection.h b/src/landscape/fow/C4FoWLightSection.h index fbf9af6a5..03423fb38 100644 --- a/src/landscape/fow/C4FoWLightSection.h +++ b/src/landscape/fow/C4FoWLightSection.h @@ -18,7 +18,7 @@ #ifndef USE_CONSOLE -#include "C4Rect.h" +#include "lib/C4Rect.h" #include class C4FoWLight; diff --git a/src/landscape/fow/C4FoWRegion.cpp b/src/landscape/fow/C4FoWRegion.cpp index d86b9720a..642bc680f 100644 --- a/src/landscape/fow/C4FoWRegion.cpp +++ b/src/landscape/fow/C4FoWRegion.cpp @@ -14,8 +14,8 @@ */ #include "C4Include.h" -#include "C4FoWRegion.h" -#include "C4DrawGL.h" +#include "landscape/fow/C4FoWRegion.h" +#include "graphics/C4DrawGL.h" C4FoWRegion::C4FoWRegion(C4FoW *pFoW, C4Player *pPlayer) : pFoW(pFoW) diff --git a/src/landscape/fow/C4FoWRegion.h b/src/landscape/fow/C4FoWRegion.h index 28f54f29c..6ecfbcdb1 100644 --- a/src/landscape/fow/C4FoWRegion.h +++ b/src/landscape/fow/C4FoWRegion.h @@ -16,10 +16,10 @@ #ifndef C4FOWREGION_H #define C4FOWREGION_H -#include "C4Rect.h" -#include "C4FacetEx.h" -#include "C4Player.h" -#include "C4FoW.h" +#include "lib/C4Rect.h" +#include "graphics/C4FacetEx.h" +#include "player/C4Player.h" +#include "landscape/fow/C4FoW.h" class C4Surface; diff --git a/src/lib/C4InputValidation.cpp b/src/lib/C4InputValidation.cpp index 00143b3c4..9ae16f264 100644 --- a/src/lib/C4InputValidation.cpp +++ b/src/lib/C4InputValidation.cpp @@ -16,9 +16,9 @@ // user input validation functions #include "C4Include.h" -#include -#include -#include "C4Markup.h" +#include "lib/C4InputValidation.h" +#include "lib/C4Log.h" +#include "lib/C4Markup.h" #include diff --git a/src/lib/C4InputValidation.h b/src/lib/C4InputValidation.h index da31a6c0d..b3d071532 100644 --- a/src/lib/C4InputValidation.h +++ b/src/lib/C4InputValidation.h @@ -18,9 +18,9 @@ #ifndef INC_C4InputValidation #define INC_C4InputValidation -#include "StdBuf.h" -#include "StdFile.h" -#include "StdAdaptors.h" +#include "lib/StdBuf.h" +#include "platform/StdFile.h" +#include "lib/StdAdaptors.h" const unsigned int C4MaxName = 30; // player names, etc. const unsigned int C4MaxLongName = 120; // scenario titles, etc. - may include markup diff --git a/src/lib/C4Log.cpp b/src/lib/C4Log.cpp index 3c5caf834..9b0780d50 100644 --- a/src/lib/C4Log.cpp +++ b/src/lib/C4Log.cpp @@ -17,21 +17,21 @@ /* Log file handling */ -#include -#include +#include "C4Include.h" +#include "lib/C4Log.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "graphics/C4Shader.h" #ifdef HAVE_SYS_FILE_H #include diff --git a/src/lib/C4Log.h b/src/lib/C4Log.h index f7535ebba..3fc6118b3 100644 --- a/src/lib/C4Log.h +++ b/src/lib/C4Log.h @@ -19,7 +19,7 @@ #ifndef INC_C4Log #define INC_C4Log -#include +#include "lib/StdBuf.h" bool OpenLog(); bool OpenExtraLogs(); diff --git a/src/lib/C4LogBuf.cpp b/src/lib/C4LogBuf.cpp index c799a0762..c252161df 100644 --- a/src/lib/C4LogBuf.cpp +++ b/src/lib/C4LogBuf.cpp @@ -16,9 +16,9 @@ // a buffer holding a log history #include "C4Include.h" -#include "C4LogBuf.h" +#include "lib/C4LogBuf.h" -#include +#include "graphics/C4FontLoader.h" C4LogBuffer::C4LogBuffer(int iSize, int iMaxLines, int iLBWidth, const char *szIndentChars, bool fDynamicGrow, bool fMarkup) : iBufSize(iSize), iFirstLinePos(0), iAfterLastLinePos(0), iLineDataPos(0), diff --git a/src/lib/C4Markup.cpp b/src/lib/C4Markup.cpp index 79cd99110..936d6a370 100644 --- a/src/lib/C4Markup.cpp +++ b/src/lib/C4Markup.cpp @@ -16,8 +16,8 @@ // markup tags for fonts #include "C4Include.h" -#include -#include +#include "lib/C4Markup.h" +#include "graphics/C4Draw.h" void C4MarkupTagItalic::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr) { diff --git a/src/lib/C4NameList.cpp b/src/lib/C4NameList.cpp index e7ba12526..294848bda 100644 --- a/src/lib/C4NameList.cpp +++ b/src/lib/C4NameList.cpp @@ -18,7 +18,7 @@ /* A static list of strings and integer values, i.e. for material amounts */ #include "C4Include.h" -#include +#include "lib/C4NameList.h" void C4NameList::Clear() { diff --git a/src/lib/C4NameList.h b/src/lib/C4NameList.h index e9adc36a0..ddeb888f7 100644 --- a/src/lib/C4NameList.h +++ b/src/lib/C4NameList.h @@ -22,8 +22,8 @@ const int C4MaxNameList = 10; -#include "C4Constants.h" -#include "C4InputValidation.h" +#include "config/C4Constants.h" +#include "lib/C4InputValidation.h" #include class C4NameList diff --git a/src/lib/C4Random.cpp b/src/lib/C4Random.cpp index 4102ac040..446976759 100644 --- a/src/lib/C4Random.cpp +++ b/src/lib/C4Random.cpp @@ -18,8 +18,8 @@ /* Network-safe random number generator */ #include "C4Include.h" -#include -#include +#include "lib/C4Random.h" +#include "control/C4Record.h" int RandomCount = 0; static unsigned int RandomHold = 0; diff --git a/src/lib/C4Real.cpp b/src/lib/C4Real.cpp index ca01e7bc1..b01e80d74 100644 --- a/src/lib/C4Real.cpp +++ b/src/lib/C4Real.cpp @@ -16,10 +16,10 @@ // fixed numbers - sine functions #include "C4Include.h" -#include "C4Real.h" +#include "lib/C4Real.h" -#include "StdCompiler.h" -#include "StdAdaptors.h" +#include "lib/StdCompiler.h" +#include "lib/StdAdaptors.h" #ifdef C4REAL_USE_FIXNUM diff --git a/src/lib/C4Rect.cpp b/src/lib/C4Rect.cpp index c65fbdfea..b658fbe8a 100644 --- a/src/lib/C4Rect.cpp +++ b/src/lib/C4Rect.cpp @@ -18,10 +18,10 @@ /* Basic classes for rectangles and vertex outlines */ #include "C4Include.h" -#include "C4Rect.h" -#include "C4FacetEx.h" -#include "StdCompiler.h" -#include "StdAdaptors.h" +#include "lib/C4Rect.h" +#include "graphics/C4FacetEx.h" +#include "lib/StdCompiler.h" +#include "lib/StdAdaptors.h" void C4Rect::Default() { diff --git a/src/lib/C4SimpleLog.cpp b/src/lib/C4SimpleLog.cpp index 203d07a52..26580cf64 100644 --- a/src/lib/C4SimpleLog.cpp +++ b/src/lib/C4SimpleLog.cpp @@ -19,8 +19,8 @@ // C4Log.cpp into the small utility programs because it pulls in a whole // lot of other dependencies. -#include -#include +#include "C4Include.h" +#include "lib/C4Log.h" bool fQuiet = false; diff --git a/src/lib/C4Stat.cpp b/src/lib/C4Stat.cpp index 4318544e6..92e658c7c 100644 --- a/src/lib/C4Stat.cpp +++ b/src/lib/C4Stat.cpp @@ -16,7 +16,7 @@ // statistics #include "C4Include.h" -#include +#include "lib/C4Stat.h" // ** implemetation of C4MainStat diff --git a/src/lib/Standard.h b/src/lib/Standard.h index a8e44fb91..c227540fc 100644 --- a/src/lib/Standard.h +++ b/src/lib/Standard.h @@ -41,7 +41,7 @@ inline InplaceReconstruct(T *obj) } #pragma pop_macro("new") -#include "PlatformAbstraction.h" +#include "platform/PlatformAbstraction.h" // Small helpers template inline T Abs(T val) { return val > 0 ? val : -val; } diff --git a/src/lib/StdAdaptors.h b/src/lib/StdAdaptors.h index cc7223e5e..2838d659e 100644 --- a/src/lib/StdAdaptors.h +++ b/src/lib/StdAdaptors.h @@ -16,8 +16,8 @@ #ifndef STDADAPTORS_H #define STDADAPTORS_H -#include "Standard.h" -#include "StdCompiler.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 d389316b1..819f5204e 100644 --- a/src/lib/StdBuf.cpp +++ b/src/lib/StdBuf.cpp @@ -14,16 +14,16 @@ * for the above references. */ #include "C4Include.h" -#include -#include -#include -#include +#include "lib/StdBuf.h" +#include "lib/StdCompiler.h" +#include "lib/StdAdaptors.h" +#include "platform/StdFile.h" #include #include #ifdef _WIN32 #include -#include +#include "platform/C4windowswrapper.h" #define vsnprintf _vsnprintf #else #define O_BINARY 0 diff --git a/src/lib/StdBuf.h b/src/lib/StdBuf.h index ef9bbb243..fdc7f75aa 100644 --- a/src/lib/StdBuf.h +++ b/src/lib/StdBuf.h @@ -18,7 +18,7 @@ #ifndef STDBUF_H #define STDBUF_H -#include "PlatformAbstraction.h" +#include "platform/PlatformAbstraction.h" #include diff --git a/src/lib/StdCompiler.cpp b/src/lib/StdCompiler.cpp index 0b339c3e1..b1d06d79a 100644 --- a/src/lib/StdCompiler.cpp +++ b/src/lib/StdCompiler.cpp @@ -14,12 +14,12 @@ * for the above references. */ #include "C4Include.h" -#include "StdCompiler.h" +#include "lib/StdCompiler.h" #include #include #include -#include +#include "lib/C4Log.h" // *** StdCompiler diff --git a/src/lib/StdCompiler.h b/src/lib/StdCompiler.h index 0dc7105fe..e8532919b 100644 --- a/src/lib/StdCompiler.h +++ b/src/lib/StdCompiler.h @@ -16,8 +16,8 @@ #ifndef STDCOMPILER_H #define STDCOMPILER_H -#include "StdBuf.h" -#include "C4Log.h" +#include "lib/StdBuf.h" +#include "lib/C4Log.h" #include #include diff --git a/src/lib/StdMesh.cpp b/src/lib/StdMesh.cpp index e859c90d8..9e748c4d8 100644 --- a/src/lib/StdMesh.cpp +++ b/src/lib/StdMesh.cpp @@ -15,8 +15,8 @@ */ #include "C4Include.h" -#include -#include +#include "graphics/C4DrawGL.h" +#include "lib/StdMesh.h" #include namespace diff --git a/src/lib/StdMesh.h b/src/lib/StdMesh.h index c7c9f4e5c..2c44f52f6 100644 --- a/src/lib/StdMesh.h +++ b/src/lib/StdMesh.h @@ -17,8 +17,8 @@ #ifndef INC_StdMesh #define INC_StdMesh -#include -#include +#include "lib/StdMeshMath.h" +#include "lib/StdMeshMaterial.h" #include diff --git a/src/lib/StdMeshLoader.cpp b/src/lib/StdMeshLoader.cpp index eaccceafe..a6f4628f6 100644 --- a/src/lib/StdMeshLoader.cpp +++ b/src/lib/StdMeshLoader.cpp @@ -15,9 +15,9 @@ // A loader for the OGRE .mesh binary file format -#include +#include "C4Include.h" -#include +#include "lib/StdMeshLoader.h" namespace { diff --git a/src/lib/StdMeshLoader.h b/src/lib/StdMeshLoader.h index e63ae55fe..9e3b1de9d 100644 --- a/src/lib/StdMeshLoader.h +++ b/src/lib/StdMeshLoader.h @@ -14,7 +14,7 @@ */ // A loader for the OGRE .mesh binary file format -#include +#include "lib/StdMesh.h" #ifndef INC_StdMeshLoader #define INC_StdMeshLoader diff --git a/src/lib/StdMeshLoaderBinary.cpp b/src/lib/StdMeshLoaderBinary.cpp index 25ac9b5f6..f5e0e067c 100644 --- a/src/lib/StdMeshLoaderBinary.cpp +++ b/src/lib/StdMeshLoaderBinary.cpp @@ -16,11 +16,11 @@ // A loader for the OGRE .mesh binary file format #include "C4Include.h" -#include "StdMesh.h" -#include "StdMeshLoader.h" -#include "StdMeshLoaderBinaryChunks.h" -#include "StdMeshLoaderDataStream.h" -#include "StdMeshMaterial.h" +#include "lib/StdMesh.h" +#include "lib/StdMeshLoader.h" +#include "lib/StdMeshLoaderBinaryChunks.h" +#include "lib/StdMeshLoaderDataStream.h" +#include "lib/StdMeshMaterial.h" #include #include diff --git a/src/lib/StdMeshLoaderBinaryChunks.cpp b/src/lib/StdMeshLoaderBinaryChunks.cpp index 33817994e..f2dba695b 100644 --- a/src/lib/StdMeshLoaderBinaryChunks.cpp +++ b/src/lib/StdMeshLoaderBinaryChunks.cpp @@ -14,8 +14,8 @@ */ #include "C4Include.h" -#include "StdMeshLoaderBinaryChunks.h" -#include "StdMeshLoaderDataStream.h" +#include "lib/StdMeshLoaderBinaryChunks.h" +#include "lib/StdMeshLoaderDataStream.h" #include #include #include diff --git a/src/lib/StdMeshLoaderBinaryChunks.h b/src/lib/StdMeshLoaderBinaryChunks.h index 1f2f2d538..b14481b79 100644 --- a/src/lib/StdMeshLoaderBinaryChunks.h +++ b/src/lib/StdMeshLoaderBinaryChunks.h @@ -16,8 +16,8 @@ #ifndef INC_StdMeshLoaderChunks #define INC_StdMeshLoaderChunks -#include "StdMesh.h" -#include "StdMeshLoaderDataStream.h" +#include "lib/StdMesh.h" +#include "lib/StdMeshLoaderDataStream.h" // ==== Ogre file format ==== // The Ogre file format is a chunked format similar to PNG. diff --git a/src/lib/StdMeshLoaderDataStream.h b/src/lib/StdMeshLoaderDataStream.h index 65da88047..99cf062ef 100644 --- a/src/lib/StdMeshLoaderDataStream.h +++ b/src/lib/StdMeshLoaderDataStream.h @@ -16,7 +16,7 @@ #ifndef INC_StdMeshLoaderDataStream #define INC_StdMeshLoaderDataStream -#include "StdMeshLoader.h" +#include "lib/StdMeshLoader.h" namespace Ogre { diff --git a/src/lib/StdMeshLoaderXml.cpp b/src/lib/StdMeshLoaderXml.cpp index a45834fac..5e27a1e06 100644 --- a/src/lib/StdMeshLoaderXml.cpp +++ b/src/lib/StdMeshLoaderXml.cpp @@ -17,8 +17,8 @@ // A loader for the OGRE .mesh XML file format #include "C4Include.h" -#include "StdMesh.h" -#include "StdMeshLoader.h" +#include "lib/StdMesh.h" +#include "lib/StdMeshLoader.h" #include // Helper class to load things from an XML file with error checking diff --git a/src/lib/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp index 06c4a8950..ac4923bfa 100644 --- a/src/lib/StdMeshMaterial.cpp +++ b/src/lib/StdMeshMaterial.cpp @@ -15,9 +15,9 @@ */ #include "C4Include.h" -#include -#include -#include +#include "lib/StdMeshMaterial.h" +#include "lib/StdMeshUpdate.h" +#include "graphics/C4DrawGL.h" #include #include diff --git a/src/lib/StdMeshMaterial.h b/src/lib/StdMeshMaterial.h index 0c38ee2a9..36fa3d5b1 100644 --- a/src/lib/StdMeshMaterial.h +++ b/src/lib/StdMeshMaterial.h @@ -17,9 +17,9 @@ #ifndef INC_StdMeshMaterial #define INC_StdMeshMaterial -#include -#include -#include +#include "lib/StdBuf.h" +#include "graphics/C4Surface.h" +#include "graphics/C4Shader.h" #include #include diff --git a/src/lib/StdMeshMath.cpp b/src/lib/StdMeshMath.cpp index 56b816870..3a02136b0 100644 --- a/src/lib/StdMeshMath.cpp +++ b/src/lib/StdMeshMath.cpp @@ -14,14 +14,14 @@ * for the above references. */ -#include +#include "C4Include.h" #ifdef _MSC_VER # define _USE_MATH_DEFINES # include #endif -#include +#include "lib/StdMeshMath.h" StdMeshVector StdMeshVector::Zero() { diff --git a/src/lib/StdMeshUpdate.cpp b/src/lib/StdMeshUpdate.cpp index b168a0e9d..a4039879f 100644 --- a/src/lib/StdMeshUpdate.cpp +++ b/src/lib/StdMeshUpdate.cpp @@ -14,10 +14,10 @@ */ #include "C4Include.h" -#include -#include -#include -#include +#include "lib/StdMesh.h" +#include "lib/StdMeshMaterial.h" +#include "lib/StdMeshUpdate.h" +#include "lib/StdMeshLoader.h" StdMeshMaterialUpdate::StdMeshMaterialUpdate(StdMeshMatManager& manager): MaterialManager(manager) diff --git a/src/lib/StdMeshUpdate.h b/src/lib/StdMeshUpdate.h index 6b9f7d7ff..d0310e15b 100644 --- a/src/lib/StdMeshUpdate.h +++ b/src/lib/StdMeshUpdate.h @@ -16,8 +16,8 @@ #ifndef INC_StdMeshUpdate #define INC_StdMeshUpdate -#include -#include +#include "lib/StdMesh.h" +#include "lib/StdMeshMaterial.h" // This is a helper class to fix pointers after an update of StdMeshMaterials. // To update one or more materials, remove them from the MaterialManager with diff --git a/src/lib/StdResStr2.cpp b/src/lib/StdResStr2.cpp index 7c57784eb..1f6fe92f5 100644 --- a/src/lib/StdResStr2.cpp +++ b/src/lib/StdResStr2.cpp @@ -17,7 +17,7 @@ /* Load strings from a primitive memory string table */ #include "C4Include.h" -#include "C4Language.h" +#include "c4group/C4Language.h" const int ResStrMaxLen = 4096; static char strResult[ResStrMaxLen + 1]; diff --git a/src/mape/cpp-handles/c4def-handle.cpp b/src/mape/cpp-handles/c4def-handle.cpp index 00c8fdc41..41fb2211b 100644 --- a/src/mape/cpp-handles/c4def-handle.cpp +++ b/src/mape/cpp-handles/c4def-handle.cpp @@ -15,8 +15,8 @@ #include "C4Include.h" -#include "C4Def.h" -#include "C4DefList.h" +#include "object/C4Def.h" +#include "object/C4DefList.h" /* This is a simple implementation of C4DefList for what is required by * mape. We cannot link the full implementation since it would introduce diff --git a/src/mape/cpp-handles/group-handle.cpp b/src/mape/cpp-handles/group-handle.cpp index a6d1aa004..7dea33110 100644 --- a/src/mape/cpp-handles/group-handle.cpp +++ b/src/mape/cpp-handles/group-handle.cpp @@ -14,7 +14,7 @@ */ #include "C4Include.h" -#include "C4Group.h" +#include "c4group/C4Group.h" #include "mape/cpp-handles/group-handle.h" #define GROUP_TO_HANDLE(group) (reinterpret_cast(group)) diff --git a/src/mape/cpp-handles/log-handle.cpp b/src/mape/cpp-handles/log-handle.cpp index a47421a60..505657075 100644 --- a/src/mape/cpp-handles/log-handle.cpp +++ b/src/mape/cpp-handles/log-handle.cpp @@ -13,8 +13,8 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "lib/C4Log.h" // This implements the Log engine function such that the first log message // is stored and can be retrieved later by the C API. diff --git a/src/mape/cpp-handles/mapgen-handle.cpp b/src/mape/cpp-handles/mapgen-handle.cpp index c3aa30442..e4494e595 100644 --- a/src/mape/cpp-handles/mapgen-handle.cpp +++ b/src/mape/cpp-handles/mapgen-handle.cpp @@ -14,12 +14,12 @@ */ #include "C4Include.h" -#include -#include -#include -#include -#include -#include +#include "landscape/C4MapScript.h" +#include "landscape/C4MapCreatorS2.h" +#include "script/C4ScriptHost.h" +#include "object/C4DefList.h" +#include "object/C4Def.h" +#include "script/C4Aul.h" #include "mape/cpp-handles/material-handle.h" #include "mape/cpp-handles/texture-handle.h" diff --git a/src/mape/cpp-handles/material-handle.cpp b/src/mape/cpp-handles/material-handle.cpp index efaea4e80..4890abe6b 100644 --- a/src/mape/cpp-handles/material-handle.cpp +++ b/src/mape/cpp-handles/material-handle.cpp @@ -14,8 +14,8 @@ */ #include "C4Include.h" -#include "C4Material.h" -#include "C4Texture.h" +#include "landscape/C4Material.h" +#include "landscape/C4Texture.h" #include "mape/cpp-handles/material-handle.h" #define MATERIAL_MAP_TO_HANDLE(material_map) (reinterpret_cast(material_map)) diff --git a/src/mape/cpp-handles/random-handle.cpp b/src/mape/cpp-handles/random-handle.cpp index af7b6597d..7d829a9a6 100644 --- a/src/mape/cpp-handles/random-handle.cpp +++ b/src/mape/cpp-handles/random-handle.cpp @@ -14,7 +14,7 @@ */ #include "C4Include.h" -#include "C4Random.h" +#include "lib/C4Random.h" #include "mape/cpp-handles/random-handle.h" extern "C" { diff --git a/src/mape/cpp-handles/stub-handle.cpp b/src/mape/cpp-handles/stub-handle.cpp index 5eadafb44..db6a962e9 100644 --- a/src/mape/cpp-handles/stub-handle.cpp +++ b/src/mape/cpp-handles/stub-handle.cpp @@ -15,20 +15,20 @@ #include "C4Include.h" -#include "C4Aul.h" -#include "C4AulDebug.h" -#include "C4GameControl.h" -#include "C4Def.h" -#include "C4DefList.h" -#include "C4Facet.h" -#include "C4GameObjects.h" -#include "C4GameParameters.h" -#include "C4GraphicsResource.h" -#include "C4Landscape.h" -#include "C4PXS.h" -#include "C4Record.h" -#include "C4RoundResults.h" -#include "C4TextureShape.h" +#include "script/C4Aul.h" +#include "script/C4AulDebug.h" +#include "control/C4GameControl.h" +#include "object/C4Def.h" +#include "object/C4DefList.h" +#include "graphics/C4Facet.h" +#include "object/C4GameObjects.h" +#include "control/C4GameParameters.h" +#include "graphics/C4GraphicsResource.h" +#include "landscape/C4Landscape.h" +#include "landscape/C4PXS.h" +#include "control/C4Record.h" +#include "control/C4RoundResults.h" +#include "landscape/C4TextureShape.h" #include "landscape/C4Sky.h" /* This file implements stubs for the parts of the engine that are not used diff --git a/src/mape/cpp-handles/texture-handle.cpp b/src/mape/cpp-handles/texture-handle.cpp index 1f5e8205a..cc8eddb7a 100644 --- a/src/mape/cpp-handles/texture-handle.cpp +++ b/src/mape/cpp-handles/texture-handle.cpp @@ -14,7 +14,7 @@ */ #include "C4Include.h" -#include "C4Texture.h" +#include "landscape/C4Texture.h" #include "mape/cpp-handles/texture-handle.h" #define TEXTURE_MAP_TO_HANDLE(texture_map) (reinterpret_cast(texture_map)) diff --git a/src/netio/TstC4NetIO.cpp b/src/netio/TstC4NetIO.cpp index 7bdd95f0c..12744eaae 100644 --- a/src/netio/TstC4NetIO.cpp +++ b/src/netio/TstC4NetIO.cpp @@ -15,14 +15,14 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "network/C4NetIO.h" #include #include #include #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #include #else #include diff --git a/src/network/C4Client.cpp b/src/network/C4Client.cpp index 480bbdf66..db26eb18e 100644 --- a/src/network/C4Client.cpp +++ b/src/network/C4Client.cpp @@ -13,16 +13,16 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include +#include "C4Include.h" +#include "network/C4Client.h" -#include -#include -#include -#include -#include -#include -#include +#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" #ifndef HAVE_WINSOCK #include diff --git a/src/network/C4Client.h b/src/network/C4Client.h index 5da1d9558..dcd99d0a3 100644 --- a/src/network/C4Client.h +++ b/src/network/C4Client.h @@ -16,9 +16,9 @@ #ifndef C4CLIENT_H #define C4CLIENT_H -#include "C4NetIO.h" -#include "C4PacketBase.h" -#include "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 a43246436..f8781618a 100644 --- a/src/network/C4GameControlNetwork.cpp +++ b/src/network/C4GameControlNetwork.cpp @@ -16,13 +16,13 @@ /* control managament: network part */ #include "C4Include.h" -#include +#include "network/C4GameControlNetwork.h" -#include -#include -#include -#include -#include +#include "game/C4Application.h" +#include "control/C4GameControl.h" +#include "game/C4Game.h" +#include "lib/C4Log.h" +#include "game/C4GraphicsSystem.h" // *** C4GameControlNetwork diff --git a/src/network/C4GameControlNetwork.h b/src/network/C4GameControlNetwork.h index 410496db3..8fc637769 100644 --- a/src/network/C4GameControlNetwork.h +++ b/src/network/C4GameControlNetwork.h @@ -13,14 +13,14 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include "C4GameControl.h" +#include "control/C4GameControl.h" #ifndef INC_C4GameControlNetwork #define INC_C4GameControlNetwork -#include "C4Control.h" -#include "C4PacketBase.h" -#include "C4Network2.h" +#include "control/C4Control.h" +#include "network/C4PacketBase.h" +#include "network/C4Network2.h" // constants const int32_t C4ControlBacklog = 100, // (ctrl ticks) diff --git a/src/network/C4InteractiveThread.cpp b/src/network/C4InteractiveThread.cpp index 1d336a6a1..126fc253f 100644 --- a/src/network/C4InteractiveThread.cpp +++ b/src/network/C4InteractiveThread.cpp @@ -14,11 +14,11 @@ * for the above references. */ #include "C4Include.h" -#include "C4InteractiveThread.h" -#include "C4Application.h" -#include "C4Log.h" +#include "network/C4InteractiveThread.h" +#include "game/C4Application.h" +#include "lib/C4Log.h" -#include +#include "game/C4Game.h" // *** C4InteractiveThread diff --git a/src/network/C4InteractiveThread.h b/src/network/C4InteractiveThread.h index 671af70a1..da0b08ea2 100644 --- a/src/network/C4InteractiveThread.h +++ b/src/network/C4InteractiveThread.h @@ -16,8 +16,8 @@ #ifndef C4INTERACTIVETHREAD_H #define C4INTERACTIVETHREAD_H -#include "StdScheduler.h" -#include "StdSync.h" +#include "platform/StdScheduler.h" +#include "platform/StdSync.h" // Event types enum C4InteractiveEventType diff --git a/src/network/C4League.cpp b/src/network/C4League.cpp index e120ed51e..256c8924a 100644 --- a/src/network/C4League.cpp +++ b/src/network/C4League.cpp @@ -16,12 +16,12 @@ /* engine handler of league system */ -#include -#include +#include "C4Include.h" +#include "network/C4League.h" -#include -#include -#include +#include "game/C4Game.h" +#include "control/C4RoundResults.h" +#include "graphics/C4GraphicsResource.h" // *** C4LeagueRequestHead diff --git a/src/network/C4League.h b/src/network/C4League.h index b42404904..8e1ac80cd 100644 --- a/src/network/C4League.h +++ b/src/network/C4League.h @@ -19,9 +19,9 @@ #ifndef C4LEAGUE_H_INCLUDED #define C4LEAGUE_H_INCLUDED -#include -#include -#include +#include "network/C4Network2Reference.h" +#include "gui/C4Gui.h" +#include "lib/SHA1.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 8ed0c8858..1ede4364b 100644 --- a/src/network/C4NetIO.cpp +++ b/src/network/C4NetIO.cpp @@ -14,10 +14,10 @@ * for the above references. */ #include "C4Include.h" -#include "C4NetIO.h" +#include "network/C4NetIO.h" -#include "C4Constants.h" -#include "C4Config.h" +#include "config/C4Constants.h" +#include "config/C4Config.h" #include #include diff --git a/src/network/C4NetIO.h b/src/network/C4NetIO.h index b5d7e841d..f904eaf48 100644 --- a/src/network/C4NetIO.h +++ b/src/network/C4NetIO.h @@ -18,13 +18,13 @@ #ifndef C4NETIO_H #define C4NETIO_H -#include "StdSync.h" -#include "StdBuf.h" -#include "StdCompiler.h" -#include "StdScheduler.h" +#include "platform/StdSync.h" +#include "lib/StdBuf.h" +#include "lib/StdCompiler.h" +#include "platform/StdScheduler.h" #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #include #include #ifndef WINSOCK_VERSION diff --git a/src/network/C4Network2.cpp b/src/network/C4Network2.cpp index b0e5919aa..f298937c2 100644 --- a/src/network/C4Network2.cpp +++ b/src/network/C4Network2.cpp @@ -14,26 +14,26 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "network/C4Network2.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "C4Version.h" +#include "lib/C4Log.h" +#include "game/C4Application.h" +#include "editor/C4Console.h" +#include "control/C4GameSave.h" +#include "control/C4RoundResults.h" +#include "game/C4Game.h" +#include "game/C4GraphicsSystem.h" +#include "graphics/C4GraphicsResource.h" +#include "control/C4GameControl.h" // lobby -#include -#include +#include "gui/C4Gui.h" +#include "gui/C4GameLobby.h" -#include -#include +#include "network/C4Network2Dialogs.h" +#include "network/C4League.h" #ifdef _WIN32 #include diff --git a/src/network/C4Network2.h b/src/network/C4Network2.h index 038bf64e7..70da2f0aa 100644 --- a/src/network/C4Network2.h +++ b/src/network/C4Network2.h @@ -16,14 +16,14 @@ #ifndef INC_C4Network2 #define INC_C4Network2 -#include "C4NetIO.h" -#include "C4Network2Players.h" -#include "C4Network2IO.h" -#include "C4Network2Res.h" -#include "C4Network2Client.h" -#include "C4Control.h" -#include "C4Gui.h" -#include "C4GameParameters.h" +#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" // standard ports const int16_t C4NetStdPortTCP = 11112, diff --git a/src/network/C4Network2Client.cpp b/src/network/C4Network2Client.cpp index 093679d94..33242dbac 100644 --- a/src/network/C4Network2Client.cpp +++ b/src/network/C4Network2Client.cpp @@ -13,17 +13,17 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include +#include "C4Include.h" +#include "network/C4Network2Client.h" -#include -#include -#include -#include -#include -#include // fullscreen network lobby -#include -#include +#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 "player/C4PlayerList.h" #ifndef _WIN32 #include diff --git a/src/network/C4Network2Client.h b/src/network/C4Network2Client.h index daa58babd..ada7a506c 100644 --- a/src/network/C4Network2Client.h +++ b/src/network/C4Network2Client.h @@ -16,10 +16,10 @@ #ifndef INC_C4Network2Client #define INC_C4Network2Client -#include "C4NetIO.h" -#include "C4Network2IO.h" -#include "C4PacketBase.h" -#include "C4Client.h" +#include "network/C4NetIO.h" +#include "network/C4Network2IO.h" +#include "network/C4PacketBase.h" +#include "network/C4Client.h" class C4Network2; class C4Network2IOConnection; diff --git a/src/network/C4Network2Dialogs.cpp b/src/network/C4Network2Dialogs.cpp index d63a77b96..1f7cd7152 100644 --- a/src/network/C4Network2Dialogs.cpp +++ b/src/network/C4Network2Dialogs.cpp @@ -16,17 +16,17 @@ // dialogs for network information #include "C4Include.h" -#include "C4Network2Dialogs.h" +#include "network/C4Network2Dialogs.h" -#include "C4Network2.h" -#include "C4Network2Stats.h" -#include "C4Viewport.h" -#include "C4GameOptions.h" -#include -#include -#include -#include -#include +#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 "graphics/C4GraphicsResource.h" +#include "gui/C4Startup.h" #include "lib/StdColors.h" #ifndef HAVE_WINSOCK diff --git a/src/network/C4Network2Dialogs.h b/src/network/C4Network2Dialogs.h index 7e281ebc7..5b0d8fa97 100644 --- a/src/network/C4Network2Dialogs.h +++ b/src/network/C4Network2Dialogs.h @@ -18,10 +18,10 @@ #ifndef INC_C4Network2Dialogs #define INC_C4Network2Dialogs -#include "C4Gui.h" +#include "gui/C4Gui.h" -#include "C4Scenario.h" -#include "C4Network2Res.h" +#include "landscape/C4Scenario.h" +#include "network/C4Network2Res.h" class C4Graph; diff --git a/src/network/C4Network2Discover.cpp b/src/network/C4Network2Discover.cpp index ee0f5d84a..dafc127fd 100644 --- a/src/network/C4Network2Discover.cpp +++ b/src/network/C4Network2Discover.cpp @@ -14,7 +14,7 @@ * for the above references. */ #include "C4Include.h" -#include "C4Network2Discover.h" +#include "network/C4Network2Discover.h" // *** C4Network2IODiscover diff --git a/src/network/C4Network2Discover.h b/src/network/C4Network2Discover.h index 702cd2974..d0641e9f0 100644 --- a/src/network/C4Network2Discover.h +++ b/src/network/C4Network2Discover.h @@ -16,7 +16,7 @@ #ifndef INC_C4Network2Discover #define INC_C4Network2Discover -#include "C4NetIO.h" +#include "network/C4NetIO.h" const int C4NetMaxDiscover = 64; diff --git a/src/network/C4Network2IO.cpp b/src/network/C4Network2IO.cpp index af6e2a16d..6ee14111b 100644 --- a/src/network/C4Network2IO.cpp +++ b/src/network/C4Network2IO.cpp @@ -13,15 +13,15 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include -#include +#include "C4Include.h" +#include "network/C4Network2IO.h" +#include "network/C4Network2Reference.h" -#include -#include -#include -#include -#include +#include "network/C4Network2Discover.h" +#include "game/C4Application.h" +#include "lib/C4Log.h" +#include "game/C4Game.h" +#include "control/C4GameControl.h" #include "network/C4Network2UPnP.h" diff --git a/src/network/C4Network2IO.h b/src/network/C4Network2IO.h index e1f9ec45b..f48b66f15 100644 --- a/src/network/C4Network2IO.h +++ b/src/network/C4Network2IO.h @@ -16,9 +16,9 @@ #ifndef INC_C4Network2IO #define INC_C4Network2IO -#include "C4NetIO.h" -#include "C4Client.h" -#include "C4InteractiveThread.h" +#include "network/C4NetIO.h" +#include "network/C4Client.h" +#include "network/C4InteractiveThread.h" class C4Network2IOConnection; diff --git a/src/network/C4Network2IRC.cpp b/src/network/C4Network2IRC.cpp index 317b6812f..b37d543f5 100644 --- a/src/network/C4Network2IRC.cpp +++ b/src/network/C4Network2IRC.cpp @@ -15,13 +15,13 @@ */ #include "C4Include.h" -#include "C4Network2IRC.h" +#include "network/C4Network2IRC.h" -#include -#include "C4Config.h" +#include "game/C4Application.h" +#include "config/C4Config.h" #include "C4Version.h" -#include "C4InteractiveThread.h" -#include "C4Gui.h" // for clearly visi +#include "network/C4InteractiveThread.h" +#include "gui/C4Gui.h" // for clearly visi #include // for isdigit diff --git a/src/network/C4Network2IRC.h b/src/network/C4Network2IRC.h index 7c013b659..96283be56 100644 --- a/src/network/C4Network2IRC.h +++ b/src/network/C4Network2IRC.h @@ -16,7 +16,7 @@ #ifndef C4NETWORK2IRC_H #define C4NETWORK2IRC_H -#include "C4NetIO.h" +#include "network/C4NetIO.h" #include enum C4Network2IRCMessageType diff --git a/src/network/C4Network2Players.cpp b/src/network/C4Network2Players.cpp index 5aeb0a1fe..24df5f10c 100644 --- a/src/network/C4Network2Players.cpp +++ b/src/network/C4Network2Players.cpp @@ -19,15 +19,15 @@ // Those will not receive a player info list right in time #include "C4Include.h" -#include "C4Network2Players.h" -#include "C4PlayerInfo.h" -#include "C4GameLobby.h" -#include -#include -#include -#include +#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 "C4Control.h" +#include "control/C4Control.h" // *** C4Network2Players diff --git a/src/network/C4Network2Players.h b/src/network/C4Network2Players.h index 36e06485d..e12893320 100644 --- a/src/network/C4Network2Players.h +++ b/src/network/C4Network2Players.h @@ -30,7 +30,7 @@ #ifndef INC_C4Network2Players #define INC_C4Network2Players -#include "C4PacketBase.h" +#include "network/C4PacketBase.h" // class predefs class C4Network2Players; diff --git a/src/network/C4Network2Reference.cpp b/src/network/C4Network2Reference.cpp index 479bbdf66..72bc8f91c 100644 --- a/src/network/C4Network2Reference.cpp +++ b/src/network/C4Network2Reference.cpp @@ -14,10 +14,10 @@ * for the above references. */ #include "C4Include.h" -#include "C4Network2Reference.h" +#include "network/C4Network2Reference.h" -#include -#include +#include "game/C4Game.h" +#include "control/C4RoundResults.h" #include "C4Version.h" #include diff --git a/src/network/C4Network2Reference.h b/src/network/C4Network2Reference.h index 84a749deb..cacf8fbf7 100644 --- a/src/network/C4Network2Reference.h +++ b/src/network/C4Network2Reference.h @@ -16,12 +16,12 @@ #ifndef C4NETWORK2REFERENCE_H #define C4NETWORK2REFERENCE_H -#include "C4Network2.h" -#include "C4Network2Client.h" -#include "C4GameParameters.h" +#include "network/C4Network2.h" +#include "network/C4Network2Client.h" +#include "control/C4GameParameters.h" #include "C4Version.h" -#include "C4GameVersion.h" -#include "C4InputValidation.h" +#include "game/C4GameVersion.h" +#include "lib/C4InputValidation.h" const int C4Network2HTTPQueryTimeout = 10; // (s) diff --git a/src/network/C4Network2Res.cpp b/src/network/C4Network2Res.cpp index e6c5641cb..9b62a784b 100644 --- a/src/network/C4Network2Res.cpp +++ b/src/network/C4Network2Res.cpp @@ -13,17 +13,17 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include +#include "C4Include.h" +#include "network/C4Network2Res.h" -#include -#include -#include -#include -#include -#include -#include -#include +#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 "control/C4GameControl.h" #include #include diff --git a/src/network/C4Network2Res.h b/src/network/C4Network2Res.h index 2fdb1c97d..de869e3cd 100644 --- a/src/network/C4Network2Res.h +++ b/src/network/C4Network2Res.h @@ -18,10 +18,10 @@ #ifndef INC_C4Network2Res #define INC_C4Network2Res -#include -#include +#include "lib/StdAdaptors.h" +#include "platform/StdSync.h" -#include +#include "lib/SHA1.h" const uint32_t C4NetResChunkSize = 10U * 1024U; @@ -57,8 +57,8 @@ const StdEnumEntry C4Network2ResType_EnumMap[] = }; // damn circular dependencies -#include "C4PacketBase.h" -#include "C4Network2IO.h" +#include "network/C4PacketBase.h" +#include "network/C4Network2IO.h" class C4Network2ResList; class C4Network2ResChunk; diff --git a/src/network/C4Network2ResDlg.cpp b/src/network/C4Network2ResDlg.cpp index 44e1ee640..635c499c3 100644 --- a/src/network/C4Network2ResDlg.cpp +++ b/src/network/C4Network2ResDlg.cpp @@ -16,15 +16,15 @@ // resource display list box #include "C4Include.h" -#include "C4Network2Dialogs.h" +#include "network/C4Network2Dialogs.h" -#include -#include "C4GameLobby.h" -#include "C4FullScreen.h" -#include "C4Network2.h" -#include "C4PlayerInfo.h" -#include "C4Network2Players.h" -#include +#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 "graphics/C4GraphicsResource.h" // ----------- C4Network2ResDlg::ListItem ---------------------------------------------------------------- diff --git a/src/network/C4Network2Stats.cpp b/src/network/C4Network2Stats.cpp index d6bca1740..8458c2e36 100644 --- a/src/network/C4Network2Stats.cpp +++ b/src/network/C4Network2Stats.cpp @@ -15,15 +15,15 @@ */ // network statistics and information dialogs -#include -#include +#include "C4Include.h" +#include "network/C4Network2Stats.h" -#include -#include -#include -#include -#include -#include +#include "game/C4Game.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 d192502c4..73c06ad7d 100644 --- a/src/network/C4Network2Stats.h +++ b/src/network/C4Network2Stats.h @@ -18,8 +18,8 @@ #ifndef INC_C4Network2Stats #define INC_C4Network2Stats -#include "C4Application.h" -#include "StdBuf.h" +#include "game/C4Application.h" +#include "lib/StdBuf.h" #include diff --git a/src/network/C4Network2UPnPLinux.cpp b/src/network/C4Network2UPnPLinux.cpp index 671ff713c..9e64a7278 100644 --- a/src/network/C4Network2UPnPLinux.cpp +++ b/src/network/C4Network2UPnPLinux.cpp @@ -14,15 +14,15 @@ */ /* Linux implementation of a UPnP port mapper (using libupnp) */ -#include -#include -#include +#include "C4Include.h" +#include "game/C4Application.h" +#include "C4Version.h" #include #include #include -#include // must come after upnp.h +#include "network/C4Network2UPnP.h" // must come after upnp.h namespace { diff --git a/src/network/C4Packet2.cpp b/src/network/C4Packet2.cpp index 2d803fc95..365815099 100644 --- a/src/network/C4Packet2.cpp +++ b/src/network/C4Packet2.cpp @@ -16,12 +16,12 @@ #include "C4Include.h" -#include "C4Network2Res.h" +#include "network/C4Network2Res.h" #include "C4Version.h" -#include "C4GameLobby.h" -#include -#include -#include +#include "gui/C4GameLobby.h" +#include "network/C4Network2.h" +#include "control/C4RoundResults.h" +#include "network/C4GameControlNetwork.h" // *** constants diff --git a/src/network/C4PacketBase.h b/src/network/C4PacketBase.h index bed7d41a9..5ef94d2e6 100644 --- a/src/network/C4PacketBase.h +++ b/src/network/C4PacketBase.h @@ -16,7 +16,7 @@ #ifndef INC_C4PacketBase #define INC_C4PacketBase -#include "C4NetIO.h" +#include "network/C4NetIO.h" // *** packet base class diff --git a/src/object/C4Action.cpp b/src/object/C4Action.cpp index 4900d5b3b..13026f58a 100644 --- a/src/object/C4Action.cpp +++ b/src/object/C4Action.cpp @@ -17,8 +17,8 @@ /* The C4Action class is merely a simple data structure */ -#include -#include +#include "C4Include.h" +#include "object/C4Object.h" C4Action::C4Action() { diff --git a/src/object/C4Command.cpp b/src/object/C4Command.cpp index cad7f39a3..0e1e40878 100644 --- a/src/object/C4Command.cpp +++ b/src/object/C4Command.cpp @@ -17,23 +17,23 @@ /* The command stack controls an object's complex and independent behavior */ -#include -#include +#include "C4Include.h" +#include "object/C4Command.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.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/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/C4Command.h b/src/object/C4Command.h index 4706cfbff..478170a99 100644 --- a/src/object/C4Command.h +++ b/src/object/C4Command.h @@ -20,8 +20,8 @@ #ifndef INC_C4Command #define INC_C4Command -#include "C4ObjectPtr.h" -#include "C4Value.h" +#include "object/C4ObjectPtr.h" +#include "script/C4Value.h" enum C4CMD { diff --git a/src/object/C4Def.cpp b/src/object/C4Def.cpp index 813ca1ee5..36c0ba5c1 100644 --- a/src/object/C4Def.cpp +++ b/src/object/C4Def.cpp @@ -17,20 +17,20 @@ /* Object definition */ -#include -#include -#include -#include +#include "C4Include.h" +#include "object/C4Def.h" +#include "graphics/C4DrawGL.h" +#include "graphics/C4GraphicsResource.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "graphics/CSurface8.h" #include "lib/StdColors.h" // Helper class to load additional resources required for meshes from diff --git a/src/object/C4Def.h b/src/object/C4Def.h index 3935c809d..f4f46f138 100644 --- a/src/object/C4Def.h +++ b/src/object/C4Def.h @@ -20,19 +20,19 @@ #ifndef INC_C4Def #define INC_C4Def -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4Shape.h" +#include "object/C4InfoCore.h" +#include "object/C4IDList.h" +#include "script/C4ValueMap.h" +#include "graphics/C4Facet.h" +#include "graphics/C4Surface.h" +#include "c4group/C4ComponentHost.h" +#include "script/C4PropList.h" -#include -#include -#include "C4LangStringTable.h" -#include "C4InputValidation.h" +#include "script/C4ScriptHost.h" +#include "object/C4DefGraphics.h" +#include "c4group/C4LangStringTable.h" +#include "lib/C4InputValidation.h" #include #include diff --git a/src/object/C4DefGraphics.cpp b/src/object/C4DefGraphics.cpp index 7b198059d..6f2d97c80 100644 --- a/src/object/C4DefGraphics.cpp +++ b/src/object/C4DefGraphics.cpp @@ -15,28 +15,28 @@ */ // graphics used by object definitions (object and portraits) -#include -#include +#include "C4Include.h" +#include "object/C4DefGraphics.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "StdMeshLoader.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 "gui/C4Menu.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 "object/C4MeshAnimation.h" +#include "lib/StdMeshLoader.h" //-------------------------------- C4DefGraphics ----------------------------------------------- diff --git a/src/object/C4DefGraphics.h b/src/object/C4DefGraphics.h index c657cf094..6ad13a4f2 100644 --- a/src/object/C4DefGraphics.h +++ b/src/object/C4DefGraphics.h @@ -18,12 +18,12 @@ #ifndef INC_C4DefGraphics #define INC_C4DefGraphics -#include "C4FacetEx.h" -#include "C4Surface.h" -#include "C4ObjectPtr.h" -#include "C4InputValidation.h" -#include "C4Id.h" -#include "StdMeshUpdate.h" +#include "graphics/C4FacetEx.h" +#include "graphics/C4Surface.h" +#include "object/C4ObjectPtr.h" +#include "lib/C4InputValidation.h" +#include "object/C4Id.h" +#include "lib/StdMeshUpdate.h" // defintion graphics class C4AdditionalDefGraphics; diff --git a/src/object/C4DefList.cpp b/src/object/C4DefList.cpp index 557f6899d..9e01b595b 100644 --- a/src/object/C4DefList.cpp +++ b/src/object/C4DefList.cpp @@ -17,19 +17,19 @@ /* Object definition */ -#include -#include +#include "C4Include.h" +#include "object/C4DefList.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "c4group/C4Components.h" +#include "config/C4Config.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 +#include "lib/StdMeshLoader.h" namespace { diff --git a/src/object/C4DefList.h b/src/object/C4DefList.h index 8f376ca62..917ba4f18 100644 --- a/src/object/C4DefList.h +++ b/src/object/C4DefList.h @@ -20,9 +20,9 @@ #ifndef INC_C4DefList #define INC_C4DefList -#include -#include -#include +#include "graphics/C4FontLoader.h" +#include "lib/StdMesh.h" +#include "lib/StdMeshLoader.h" class C4DefList: public CStdFont::CustomImages { diff --git a/src/object/C4FindObject.cpp b/src/object/C4FindObject.cpp index 9aabbf666..fad1311b5 100644 --- a/src/object/C4FindObject.cpp +++ b/src/object/C4FindObject.cpp @@ -13,16 +13,16 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include +#include "C4Include.h" +#include "object/C4FindObject.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "object/C4Object.h" +#include "game/C4Game.h" +#include "lib/C4Random.h" +#include "player/C4PlayerList.h" +#include "object/C4GameObjects.h" // *** C4FindObject diff --git a/src/object/C4FindObject.h b/src/object/C4FindObject.h index fc494268a..b1e24ed89 100644 --- a/src/object/C4FindObject.h +++ b/src/object/C4FindObject.h @@ -16,8 +16,8 @@ #ifndef C4FINDOBJECT_H #define C4FINDOBJECT_H -#include -#include +#include "script/C4Value.h" +#include "lib/C4Rect.h" // Condition map enum C4FindObjectCondID diff --git a/src/object/C4GameObjects.cpp b/src/object/C4GameObjects.cpp index d20e56774..2f7592aeb 100644 --- a/src/object/C4GameObjects.cpp +++ b/src/object/C4GameObjects.cpp @@ -16,20 +16,20 @@ */ // game object lists -#include -#include +#include "C4Include.h" +#include "object/C4GameObjects.h" -#include +#include "script/C4Effect.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4Object.h" +#include "object/C4ObjectCom.h" +#include "game/C4Physics.h" +#include "lib/C4Random.h" +#include "network/C4Network2Stats.h" +#include "game/C4Game.h" +#include "lib/C4Log.h" +#include "player/C4PlayerList.h" +#include "control/C4Record.h" C4GameObjects::C4GameObjects() { diff --git a/src/object/C4GameObjects.h b/src/object/C4GameObjects.h index af153e14f..715ed0857 100644 --- a/src/object/C4GameObjects.h +++ b/src/object/C4GameObjects.h @@ -18,9 +18,9 @@ #ifndef INC_C4GameObjects #define INC_C4GameObjects -#include -#include -#include +#include "object/C4ObjectList.h" +#include "object/C4FindObject.h" +#include "object/C4Sector.h" // main object list class class C4GameObjects : public C4NotifyingObjectList diff --git a/src/object/C4IDList.cpp b/src/object/C4IDList.cpp index d2c4c8537..a8898f585 100644 --- a/src/object/C4IDList.cpp +++ b/src/object/C4IDList.cpp @@ -17,12 +17,12 @@ /* At static list of C4IDs */ -#include -#include +#include "C4Include.h" +#include "object/C4IDList.h" -#include -#include -#include +#include "object/C4Def.h" +#include "object/C4DefList.h" +#include "graphics/C4GraphicsResource.h" C4IDListChunk::C4IDListChunk() { diff --git a/src/object/C4IDList.h b/src/object/C4IDList.h index 4429db22d..5988d4aca 100644 --- a/src/object/C4IDList.h +++ b/src/object/C4IDList.h @@ -20,7 +20,7 @@ #ifndef INC_C4IDList #define INC_C4IDList -#include +#include "object/C4Id.h" // note that setting the chunk size for ID-Lists so low looks like an enormous waste // at first glance - however, due there's an incredibly large number of small ID-Lists diff --git a/src/object/C4Id.cpp b/src/object/C4Id.cpp index 8f5de2412..d88bcf518 100644 --- a/src/object/C4Id.cpp +++ b/src/object/C4Id.cpp @@ -18,8 +18,8 @@ /* Value to identify object definitions */ #include "C4Include.h" -#include "C4Id.h" -#include "StdCompiler.h" +#include "object/C4Id.h" +#include "lib/StdCompiler.h" #include diff --git a/src/object/C4Id.h b/src/object/C4Id.h index 84b43fb0f..b756633ce 100644 --- a/src/object/C4Id.h +++ b/src/object/C4Id.h @@ -20,7 +20,7 @@ #ifndef INC_C4Id #define INC_C4Id -#include "StdAdaptors.h" +#include "lib/StdAdaptors.h" #include #include #include diff --git a/src/object/C4InfoCore.cpp b/src/object/C4InfoCore.cpp index 12ad7c04c..71f1a41ff 100644 --- a/src/object/C4InfoCore.cpp +++ b/src/object/C4InfoCore.cpp @@ -17,19 +17,19 @@ /* Structures for object and player info components */ -#include -#include +#include "C4Include.h" +#include "object/C4InfoCore.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4Def.h" +#include "object/C4DefList.h" +#include "lib/C4Random.h" +#include "player/C4RankSystem.h" +#include "c4group/C4Group.h" +#include "c4group/C4Components.h" +#include "game/C4Game.h" +#include "object/C4GameObjects.h" -#include +#include "lib/C4Random.h" //------------------------------- Player Info ---------------------------------------- diff --git a/src/object/C4InfoCore.h b/src/object/C4InfoCore.h index acd21505b..87b0b72f0 100644 --- a/src/object/C4InfoCore.h +++ b/src/object/C4InfoCore.h @@ -20,11 +20,11 @@ #ifndef INC_C4InfoCore #define INC_C4InfoCore -#include -#include -#include "C4Real.h" -#include "C4InputValidation.h" -#include "C4ScenarioParameters.h" +#include "object/C4Id.h" +#include "script/C4ValueMap.h" +#include "lib/C4Real.h" +#include "lib/C4InputValidation.h" +#include "player/C4ScenarioParameters.h" const int32_t C4MaxPhysical = 100000, C4MaxDeathMsg = 75; diff --git a/src/object/C4MeshAnimation.cpp b/src/object/C4MeshAnimation.cpp index d9208d763..e6acd9060 100644 --- a/src/object/C4MeshAnimation.cpp +++ b/src/object/C4MeshAnimation.cpp @@ -16,10 +16,10 @@ #include "C4Include.h" #include "script/C4Aul.h" -#include "C4MeshAnimation.h" -#include "C4Object.h" -#include "C4ValueArray.h" -#include "C4Game.h" +#include "object/C4MeshAnimation.h" +#include "object/C4Object.h" +#include "script/C4ValueArray.h" +#include "game/C4Game.h" namespace { diff --git a/src/object/C4MeshAnimation.h b/src/object/C4MeshAnimation.h index 16f7351f8..5214ba02e 100644 --- a/src/object/C4MeshAnimation.h +++ b/src/object/C4MeshAnimation.h @@ -19,8 +19,8 @@ #ifndef INC_C4MeshAnimation #define INC_C4MeshAnimation -#include "StdMesh.h" -#include "C4ObjectPtr.h" +#include "lib/StdMesh.h" +#include "object/C4ObjectPtr.h" enum C4AnimationValueProviderID { diff --git a/src/object/C4Movement.cpp b/src/object/C4Movement.cpp index 529c3cbc0..0f0a13dd1 100644 --- a/src/object/C4Movement.cpp +++ b/src/object/C4Movement.cpp @@ -17,15 +17,15 @@ /* Object motion, collision, friction */ -#include +#include "C4Include.h" #include "object/C4Def.h" -#include +#include "object/C4Object.h" -#include -#include -#include -#include -#include +#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 924411340..4686454a8 100644 --- a/src/object/C4Object.cpp +++ b/src/object/C4Object.cpp @@ -17,37 +17,37 @@ /* That which fills the world with life */ -#include -#include +#include "C4Include.h" +#include "object/C4Object.h" -#include +#include "script/C4AulExec.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "game/C4GraphicsSystem.h" +#include "game/C4Game.h" +#include "player/C4PlayerList.h" +#include "object/C4GameObjects.h" +#include "control/C4Record.h" +#include "object/C4MeshAnimation.h" +#include "landscape/fow/C4FoW.h" namespace { diff --git a/src/object/C4ObjectCom.cpp b/src/object/C4ObjectCom.cpp index edd79fd1c..735ac6eb8 100644 --- a/src/object/C4ObjectCom.cpp +++ b/src/object/C4ObjectCom.cpp @@ -17,23 +17,23 @@ /* Lots of handler functions for object action */ -#include -#include +#include "C4Include.h" +#include "object/C4ObjectCom.h" -#include +#include "script/C4Effect.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4Object.h" +#include "game/C4Physics.h" +#include "object/C4Command.h" +#include "lib/C4Random.h" +#include "gui/C4GameMessage.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" bool SimFlightHitsLiquid(C4Real fcx, C4Real fcy, C4Real xdir, C4Real ydir); diff --git a/src/object/C4ObjectCom.h b/src/object/C4ObjectCom.h index a0dad56c8..33fa2afcb 100644 --- a/src/object/C4ObjectCom.h +++ b/src/object/C4ObjectCom.h @@ -20,7 +20,7 @@ #ifndef INC_C4ObjectCom #define INC_C4ObjectCom -#include "C4Real.h" +#include "lib/C4Real.h" bool ComDirLike(int32_t iComDir, int32_t iSample); diff --git a/src/object/C4ObjectInfo.cpp b/src/object/C4ObjectInfo.cpp index 77b1c7ca5..508c054d4 100644 --- a/src/object/C4ObjectInfo.cpp +++ b/src/object/C4ObjectInfo.cpp @@ -17,21 +17,21 @@ /* Holds crew member information */ -#include -#include +#include "C4Include.h" +#include "object/C4ObjectInfo.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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" #ifdef _MSC_VER #define snprintf _snprintf diff --git a/src/object/C4ObjectInfo.h b/src/object/C4ObjectInfo.h index 72b8b7c1e..6719af33f 100644 --- a/src/object/C4ObjectInfo.h +++ b/src/object/C4ObjectInfo.h @@ -20,10 +20,10 @@ #ifndef INC_C4ObjectInfo #define INC_C4ObjectInfo -#include -#include -#include -#include +#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 8cabde661..bf242cc9a 100644 --- a/src/object/C4ObjectInfoList.cpp +++ b/src/object/C4ObjectInfoList.cpp @@ -17,17 +17,17 @@ /* Dynamic list for crew member info */ -#include -#include +#include "C4Include.h" +#include "object/C4ObjectInfoList.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include +#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" C4ObjectInfoList::C4ObjectInfoList() { diff --git a/src/object/C4ObjectInfoList.h b/src/object/C4ObjectInfoList.h index b970b5c98..844207db9 100644 --- a/src/object/C4ObjectInfoList.h +++ b/src/object/C4ObjectInfoList.h @@ -20,7 +20,7 @@ #ifndef INC_C4ObjectInfoList #define INC_C4ObjectInfoList -#include +#include "object/C4Id.h" class C4ObjectInfoList { diff --git a/src/object/C4ObjectList.cpp b/src/object/C4ObjectList.cpp index 63b8db860..17317f38a 100644 --- a/src/object/C4ObjectList.cpp +++ b/src/object/C4ObjectList.cpp @@ -17,16 +17,16 @@ /* Dynamic object list */ -#include -#include +#include "C4Include.h" +#include "object/C4ObjectList.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "object/C4Object.h" +#include "game/C4Application.h" +#include "graphics/C4GraphicsResource.h" +#include "game/C4Game.h" +#include "object/C4GameObjects.h" static const C4ObjectLink NULL_LINK = { NULL, NULL, NULL }; diff --git a/src/object/C4ObjectList.h b/src/object/C4ObjectList.h index 115cf7ddf..4810f8546 100644 --- a/src/object/C4ObjectList.h +++ b/src/object/C4ObjectList.h @@ -20,7 +20,7 @@ #ifndef INC_C4ObjectList #define INC_C4ObjectList -#include +#include "object/C4Id.h" class C4ObjectLink { diff --git a/src/object/C4ObjectMenu.cpp b/src/object/C4ObjectMenu.cpp index a818bf79c..38398ad72 100644 --- a/src/object/C4ObjectMenu.cpp +++ b/src/object/C4ObjectMenu.cpp @@ -17,20 +17,20 @@ // Menus attached to objects; script created or internal #include "C4Include.h" -#include "C4ObjectMenu.h" +#include "object/C4ObjectMenu.h" -#include "C4Control.h" +#include "control/C4Control.h" #include "object/C4Def.h" -#include "C4Object.h" -#include "C4ObjectCom.h" -#include "C4Player.h" -#include "C4Viewport.h" -#include "C4MouseControl.h" -#include "C4GraphicsResource.h" -#include "C4Game.h" -#include "C4PlayerList.h" -#include "C4GameObjects.h" -#include "C4AulExec.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" // ----------------------------------------------------------- // C4ObjectMenu diff --git a/src/object/C4ObjectMenu.h b/src/object/C4ObjectMenu.h index 5b92dc0bb..0ef509993 100644 --- a/src/object/C4ObjectMenu.h +++ b/src/object/C4ObjectMenu.h @@ -20,7 +20,7 @@ #ifndef INC_C4ObjectMenu #define INC_C4ObjectMenu -#include "C4Menu.h" +#include "gui/C4Menu.h" enum { diff --git a/src/object/C4ObjectPtr.cpp b/src/object/C4ObjectPtr.cpp index 10029f144..827b601ed 100644 --- a/src/object/C4ObjectPtr.cpp +++ b/src/object/C4ObjectPtr.cpp @@ -15,10 +15,10 @@ /* A convenient way to (de)serialize object pointers */ -#include -#include -#include -#include +#include "C4Include.h" +#include "object/C4ObjectPtr.h" +#include "object/C4Object.h" +#include "object/C4GameObjects.h" #include diff --git a/src/object/C4ObjectScript.cpp b/src/object/C4ObjectScript.cpp index 9a9a2311d..d2043a369 100644 --- a/src/object/C4ObjectScript.cpp +++ b/src/object/C4ObjectScript.cpp @@ -15,26 +15,26 @@ * for the above references. */ -#include +#include "C4Include.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "script/C4Aul.h" +#include "script/C4AulDefFunc.h" +#include "object/C4Command.h" +#include "object/C4DefList.h" +#include "graphics/C4Draw.h" +#include "gui/C4GameMessage.h" +#include "graphics/C4GraphicsResource.h" +#include "landscape/C4Material.h" +#include "object/C4MeshAnimation.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" bool C4ValueToMatrix(C4Value& value, StdMeshMatrix* matrix) { diff --git a/src/object/C4Sector.cpp b/src/object/C4Sector.cpp index e69408459..80b3af79e 100644 --- a/src/object/C4Sector.cpp +++ b/src/object/C4Sector.cpp @@ -15,14 +15,14 @@ */ // landscape sector base class -#include -#include +#include "C4Include.h" +#include "object/C4Sector.h" -#include -#include -#include -#include -#include +#include "game/C4Game.h" +#include "object/C4Object.h" +#include "lib/C4Log.h" +#include "control/C4Record.h" +#include "object/C4GameObjects.h" /* sector */ diff --git a/src/object/C4Sector.h b/src/object/C4Sector.h index 8eb3f4603..941342d6f 100644 --- a/src/object/C4Sector.h +++ b/src/object/C4Sector.h @@ -19,8 +19,8 @@ #ifndef INC_C4Sector #define INC_C4Sector -#include -#include +#include "object/C4ObjectList.h" +#include "lib/C4Rect.h" // class predefs class C4LSector; diff --git a/src/object/C4Shape.cpp b/src/object/C4Shape.cpp index 26f92151e..27fd430f8 100644 --- a/src/object/C4Shape.cpp +++ b/src/object/C4Shape.cpp @@ -17,13 +17,13 @@ /* Basic classes for rectangles and vertex outlines */ -#include -#include +#include "C4Include.h" +#include "object/C4Shape.h" -#include -#include -#include -#include +#include "game/C4Physics.h" +#include "landscape/C4Material.h" +#include "landscape/C4Landscape.h" +#include "control/C4Record.h" bool C4Shape::AddVertex(int32_t iX, int32_t iY) { diff --git a/src/object/C4Shape.h b/src/object/C4Shape.h index 8a6249e65..c44d03a39 100644 --- a/src/object/C4Shape.h +++ b/src/object/C4Shape.h @@ -20,9 +20,9 @@ #ifndef INC_C4Shape #define INC_C4Shape -#include "C4FacetEx.h" -#include "C4Constants.h" -#include "C4Rect.h" +#include "graphics/C4FacetEx.h" +#include "config/C4Constants.h" +#include "lib/C4Rect.h" #define C4D_VertexCpyPos (C4D_MaxVertex/2) diff --git a/src/platform/C4App.cpp b/src/platform/C4App.cpp index 1676ba7d1..6b0cae17a 100644 --- a/src/platform/C4App.cpp +++ b/src/platform/C4App.cpp @@ -14,9 +14,9 @@ * for the above references. */ -#include -#include "C4App.h" -#include "C4Window.h" +#include "C4Include.h" +#include "platform/C4App.h" +#include "platform/C4Window.h" void C4AbstractApp::Run() { diff --git a/src/platform/C4App.h b/src/platform/C4App.h index 6acd86ec0..9fad17862 100644 --- a/src/platform/C4App.h +++ b/src/platform/C4App.h @@ -19,9 +19,9 @@ #ifndef INC_STDAPP #define INC_STDAPP -#include -#include -#include +#include "platform/StdScheduler.h" +#include "platform/StdSync.h" +#include "platform/C4StdInProc.h" #ifdef HAVE_PTHREAD #include diff --git a/src/platform/C4AppDelegate+MainMenuActions.mm b/src/platform/C4AppDelegate+MainMenuActions.mm index 45bbd9674..21d4ac06d 100644 --- a/src/platform/C4AppDelegate+MainMenuActions.mm +++ b/src/platform/C4AppDelegate+MainMenuActions.mm @@ -15,10 +15,10 @@ #include -#include -#include -#include -#include +#include "C4Include.h" +#include "editor/C4Console.h" +#include "game/C4Viewport.h" +#include "game/C4GraphicsSystem.h" #import "C4AppDelegate+MainMenuActions.h" #import "C4DrawGLMac.h" diff --git a/src/platform/C4AppDelegate.h b/src/platform/C4AppDelegate.h index 12dfe41e6..98d97e5d9 100644 --- a/src/platform/C4AppDelegate.h +++ b/src/platform/C4AppDelegate.h @@ -22,8 +22,8 @@ #include -#include -#include +#include "C4Include.h" +#include "gui/C4KeyboardInput.h" #import #ifdef USE_COCOA diff --git a/src/platform/C4AppDelegate.mm b/src/platform/C4AppDelegate.mm index 36cabe861..a7565de2a 100644 --- a/src/platform/C4AppDelegate.mm +++ b/src/platform/C4AppDelegate.mm @@ -16,9 +16,9 @@ // Roughly adapted from the original C4AppDelegate.m; haxxed to death by teh Gurkendoktor. // Look at main() to get an idea for what happens here. -#include -#include -#include +#include "C4Include.h" +#include "game/C4Application.h" +#include "game/C4Game.h" #import "C4AppDelegate.h" #import "C4AppDelegate+MainMenuActions.h" diff --git a/src/platform/C4AppGTK.cpp b/src/platform/C4AppGTK.cpp index 9f5dbf0a0..5956cd5d9 100644 --- a/src/platform/C4AppGTK.cpp +++ b/src/platform/C4AppGTK.cpp @@ -16,14 +16,14 @@ /* A wrapper class to OS dependent event and window interfaces, X11 version */ -#include -#include +#include "C4Include.h" +#include "platform/C4App.h" -#include -#include -#include -#include -#include +#include "platform/C4Window.h" +#include "graphics/C4DrawGL.h" +#include "graphics/C4Draw.h" +#include "platform/StdFile.h" +#include "lib/StdBuf.h" #include #include diff --git a/src/platform/C4AppMac.mm b/src/platform/C4AppMac.mm index 459f844e3..6a4f6d297 100644 --- a/src/platform/C4AppMac.mm +++ b/src/platform/C4AppMac.mm @@ -19,11 +19,11 @@ #include #include -#include -#include -#include +#include "C4Include.h" +#include "platform/C4Window.h" +#include "graphics/C4Draw.h" -#include "C4App.h" +#include "platform/C4App.h" #import #ifndef USE_CONSOLE diff --git a/src/platform/C4AppSDL.cpp b/src/platform/C4AppSDL.cpp index 74109d2ab..0bb7b8f74 100644 --- a/src/platform/C4AppSDL.cpp +++ b/src/platform/C4AppSDL.cpp @@ -16,18 +16,18 @@ /* A wrapper class to OS dependent event and window interfaces, SDL version */ -#include -#include "C4App.h" +#include "C4Include.h" +#include "platform/C4App.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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" 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 436ee93bb..81e493101 100644 --- a/src/platform/C4AppT.cpp +++ b/src/platform/C4AppT.cpp @@ -16,12 +16,12 @@ /* A wrapper class to OS dependent event and window interfaces, Text version */ -#include -#include "C4App.h" +#include "C4Include.h" +#include "platform/C4App.h" -#include -#include -#include +#include "platform/C4Window.h" +#include "graphics/C4Draw.h" +#include "game/C4Application.h" /* C4AbstractApp */ diff --git a/src/platform/C4CrashHandlerWin32.cpp b/src/platform/C4CrashHandlerWin32.cpp index 25a836d02..888a70aa7 100644 --- a/src/platform/C4CrashHandlerWin32.cpp +++ b/src/platform/C4CrashHandlerWin32.cpp @@ -22,8 +22,8 @@ #ifdef HAVE_DBGHELP // Dump generation on crash -#include -#include +#include "C4Version.h" +#include "platform/C4windowswrapper.h" #include #include #include diff --git a/src/platform/C4FileMonitor.cpp b/src/platform/C4FileMonitor.cpp index d3f840739..d549e37cd 100644 --- a/src/platform/C4FileMonitor.cpp +++ b/src/platform/C4FileMonitor.cpp @@ -16,11 +16,11 @@ // An inotify wrapper -#include -#include -#include +#include "C4Include.h" +#include "platform/C4FileMonitor.h" +#include "game/C4Application.h" -#include +#include "platform/StdFile.h" #ifdef HAVE_SYS_INOTIFY_H #include @@ -103,7 +103,7 @@ void C4FileMonitor::GetFDs(std::vector & fds) } #elif defined(_WIN32) -#include +#include "platform/C4windowswrapper.h" C4FileMonitor::C4FileMonitor(ChangeNotify pCallback) : fStarted(false), pCallback(pCallback), pWatches(NULL) diff --git a/src/platform/C4FileMonitor.h b/src/platform/C4FileMonitor.h index 9208c491c..c8eed6c70 100644 --- a/src/platform/C4FileMonitor.h +++ b/src/platform/C4FileMonitor.h @@ -19,8 +19,8 @@ #ifndef STD_FILE_MONITOR_H_INC #define STD_FILE_MONITOR_H_INC -#include -#include +#include "platform/StdScheduler.h" +#include "network/C4InteractiveThread.h" #include #ifdef __APPLE__ diff --git a/src/platform/C4FileMonitorMac.mm b/src/platform/C4FileMonitorMac.mm index 7182d3f3b..4fb0e73c8 100644 --- a/src/platform/C4FileMonitorMac.mm +++ b/src/platform/C4FileMonitorMac.mm @@ -15,11 +15,11 @@ #ifdef __APPLE__ -#include -#include -#include +#include "C4Include.h" +#include "platform/C4FileMonitor.h" +#include "game/C4Application.h" -#include +#include "platform/StdFile.h" #import diff --git a/src/platform/C4GamePadCon.cpp b/src/platform/C4GamePadCon.cpp index 2eda982e8..bbdcda6ee 100644 --- a/src/platform/C4GamePadCon.cpp +++ b/src/platform/C4GamePadCon.cpp @@ -17,13 +17,13 @@ /* Gamepad control */ -#include -#include +#include "C4Include.h" +#include "platform/C4GamePadCon.h" -#include -#include -#include -#include +#include "config/C4Config.h" +#include "object/C4ObjectCom.h" +#include "lib/C4Log.h" +#include "game/C4Game.h" #if defined(HAVE_SDL) && !defined(USE_CONSOLE) diff --git a/src/platform/C4GamePadCon.h b/src/platform/C4GamePadCon.h index fe8e7e55f..e60002773 100644 --- a/src/platform/C4GamePadCon.h +++ b/src/platform/C4GamePadCon.h @@ -23,7 +23,7 @@ #include #ifdef HAVE_SDL -#include +#include "gui/C4KeyboardInput.h" #include #include diff --git a/src/platform/C4MusicFile.cpp b/src/platform/C4MusicFile.cpp index 3ae3026b8..fc7adeb5c 100644 --- a/src/platform/C4MusicFile.cpp +++ b/src/platform/C4MusicFile.cpp @@ -15,11 +15,11 @@ */ /* Handles Music Files */ -#include -#include +#include "C4Include.h" +#include "platform/C4MusicFile.h" -#include -#include +#include "game/C4Application.h" +#include "lib/C4Log.h" #if AUDIO_TK == AUDIO_TK_OPENAL #if defined(__APPLE__) diff --git a/src/platform/C4MusicFile.h b/src/platform/C4MusicFile.h index bdc8165ae..09d36c0ed 100644 --- a/src/platform/C4MusicFile.h +++ b/src/platform/C4MusicFile.h @@ -18,8 +18,8 @@ #ifndef INC_C4MusicFile #define INC_C4MusicFile -#include -#include +#include "platform/C4SoundIncludes.h" +#include "platform/C4SoundLoaders.h" /* Base class */ diff --git a/src/platform/C4MusicSystem.cpp b/src/platform/C4MusicSystem.cpp index d0789f1c9..86b4ce625 100644 --- a/src/platform/C4MusicSystem.cpp +++ b/src/platform/C4MusicSystem.cpp @@ -17,16 +17,16 @@ /* Handles Music.ocg and randomly plays songs */ -#include -#include +#include "C4Include.h" +#include "platform/C4MusicSystem.h" -#include -#include -#include -#include -#include -#include -#include +#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" C4MusicSystem::C4MusicSystem(): Songs(NULL), diff --git a/src/platform/C4MusicSystem.h b/src/platform/C4MusicSystem.h index bc0fb19fd..5fab718a1 100644 --- a/src/platform/C4MusicSystem.h +++ b/src/platform/C4MusicSystem.h @@ -20,8 +20,8 @@ #ifndef INC_C4MusicSystem #define INC_C4MusicSystem -#include -#include +#include "c4group/C4Group.h" +#include "platform/C4SoundIncludes.h" class C4MusicFileInfoNode; class C4MusicFile; diff --git a/src/platform/C4SoundInstance.cpp b/src/platform/C4SoundInstance.cpp index 270ef15b0..7d352e79c 100644 --- a/src/platform/C4SoundInstance.cpp +++ b/src/platform/C4SoundInstance.cpp @@ -17,17 +17,17 @@ /* Handles the sound bank and plays effects using DSoundX */ -#include -#include +#include "C4Include.h" +#include "platform/C4SoundInstance.h" -#include -#include -#include -#include -#include -#include -#include -#include +#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 "platform/C4SoundIncludes.h" +#include "platform/C4SoundLoaders.h" using namespace C4SoundLoaders; diff --git a/src/platform/C4SoundInstance.h b/src/platform/C4SoundInstance.h index 84dcf0c4f..3425514e2 100644 --- a/src/platform/C4SoundInstance.h +++ b/src/platform/C4SoundInstance.h @@ -17,9 +17,9 @@ /* Helper classes for individual sounds and effects in sound system. */ -#include +#include "C4Include.h" -#include +#include "platform/C4SoundSystem.h" class C4Object; class C4SoundModifier; diff --git a/src/platform/C4SoundLoaders.cpp b/src/platform/C4SoundLoaders.cpp index 18769e6a9..ab77ab7da 100644 --- a/src/platform/C4SoundLoaders.cpp +++ b/src/platform/C4SoundLoaders.cpp @@ -14,11 +14,11 @@ * for the above references. */ -#include -#include "C4SoundLoaders.h" -#include +#include "C4Include.h" +#include "platform/C4SoundLoaders.h" +#include "platform/C4MusicFile.h" -#include +#include "game/C4Application.h" using namespace C4SoundLoaders; diff --git a/src/platform/C4SoundLoaders.h b/src/platform/C4SoundLoaders.h index 1c4877f76..96151828b 100644 --- a/src/platform/C4SoundLoaders.h +++ b/src/platform/C4SoundLoaders.h @@ -17,8 +17,8 @@ #define INC_C4SoundLoaders #include -#include -#include +#include "platform/C4SoundIncludes.h" +#include "platform/C4SoundSystem.h" namespace C4SoundLoaders { diff --git a/src/platform/C4SoundModifiers.cpp b/src/platform/C4SoundModifiers.cpp index df695fb05..2e554ff97 100644 --- a/src/platform/C4SoundModifiers.cpp +++ b/src/platform/C4SoundModifiers.cpp @@ -17,13 +17,13 @@ /* Handles the sound bank and plays effects using DSoundX */ -#include -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "platform/C4SoundModifiers.h" +#include "platform/C4SoundSystem.h" +#include "platform/C4SoundInstance.h" +#include "platform/C4SoundIncludes.h" +#include "game/C4Application.h" +#include "script/C4Value.h" #if (AUDIO_TK == AUDIO_TK_OPENAL) && defined(HAVE_ALEXT) static LPALGENEFFECTS alGenEffects; diff --git a/src/platform/C4SoundModifiers.h b/src/platform/C4SoundModifiers.h index ab62168c3..ebc267f94 100644 --- a/src/platform/C4SoundModifiers.h +++ b/src/platform/C4SoundModifiers.h @@ -20,8 +20,8 @@ #ifndef INC_C4SoundModifiers #define INC_C4SoundModifiers -#include -#include +#include "platform/C4SoundIncludes.h" +#include "script/C4PropList.h" class C4SoundModifier { diff --git a/src/platform/C4SoundSystem.cpp b/src/platform/C4SoundSystem.cpp index 05f5ee06b..177790aa4 100644 --- a/src/platform/C4SoundSystem.cpp +++ b/src/platform/C4SoundSystem.cpp @@ -17,18 +17,18 @@ /* Handles the sound bank and plays effects using DSoundX */ -#include -#include +#include "C4Include.h" +#include "platform/C4SoundSystem.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "platform/C4SoundIncludes.h" +#include "platform/C4SoundLoaders.h" C4SoundSystem::C4SoundSystem(): FirstSound (NULL) diff --git a/src/platform/C4SoundSystem.h b/src/platform/C4SoundSystem.h index 0c35dbc78..2e1b570e6 100644 --- a/src/platform/C4SoundSystem.h +++ b/src/platform/C4SoundSystem.h @@ -20,8 +20,8 @@ #ifndef INC_C4SoundSystem #define INC_C4SoundSystem -#include -#include +#include "c4group/C4Group.h" +#include "platform/C4SoundModifiers.h" const int32_t C4MaxSoundName=100, diff --git a/src/platform/C4StdInProc.cpp b/src/platform/C4StdInProc.cpp index 5546d32dc..000b15146 100644 --- a/src/platform/C4StdInProc.cpp +++ b/src/platform/C4StdInProc.cpp @@ -15,10 +15,10 @@ * for the above references. */ -#include -#include "C4StdInProc.h" +#include "C4Include.h" +#include "platform/C4StdInProc.h" -#include +#include "game/C4Application.h" #ifdef HAVE_LIBREADLINE #include diff --git a/src/platform/C4StdInProc.h b/src/platform/C4StdInProc.h index 564787fcd..01c4198df 100644 --- a/src/platform/C4StdInProc.h +++ b/src/platform/C4StdInProc.h @@ -16,7 +16,7 @@ #ifndef INC_C4STDINPROC #define INC_C4STDINPROC -#include +#include "platform/StdScheduler.h" // A simple alertable proc class C4StdInProc : public StdSchedulerProc diff --git a/src/platform/C4TimeMilliseconds.cpp b/src/platform/C4TimeMilliseconds.cpp index 09f335914..0ece89b1b 100644 --- a/src/platform/C4TimeMilliseconds.cpp +++ b/src/platform/C4TimeMilliseconds.cpp @@ -14,13 +14,13 @@ * for the above references. */ -#include -#include "C4TimeMilliseconds.h" +#include "C4Include.h" +#include "platform/C4TimeMilliseconds.h" #include #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #include C4TimeMilliseconds C4TimeMilliseconds::Now() diff --git a/src/platform/C4Window.h b/src/platform/C4Window.h index fc31019ac..e18d0c418 100644 --- a/src/platform/C4Window.h +++ b/src/platform/C4Window.h @@ -19,7 +19,7 @@ #ifndef INC_STDWINDOW #define INC_STDWINDOW -#include +#include "lib/StdBuf.h" #if defined(USE_GTK) #ifdef _WIN32 @@ -49,7 +49,7 @@ extern int MK_SHIFT; extern int MK_CONTROL; extern int MK_ALT; #elif defined(USE_WIN32_WINDOWS) -#include +#include "platform/C4windowswrapper.h" #ifndef MK_ALT #define MK_ALT 0x20 // as defined in oleidl.h #endif diff --git a/src/platform/C4WindowController.mm b/src/platform/C4WindowController.mm index 9716c5bec..46dadf552 100644 --- a/src/platform/C4WindowController.mm +++ b/src/platform/C4WindowController.mm @@ -15,12 +15,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "game/C4Application.h" +#include "game/C4Viewport.h" +#include "editor/C4ViewportWindow.h" +#include "game/C4FullScreen.h" +#include "landscape/C4Landscape.h" #import "C4WindowController.h" #import "C4DrawGLMac.h" diff --git a/src/platform/C4WindowGTK.cpp b/src/platform/C4WindowGTK.cpp index 8ea9e9ba7..afa5fb0c1 100644 --- a/src/platform/C4WindowGTK.cpp +++ b/src/platform/C4WindowGTK.cpp @@ -16,24 +16,24 @@ /* A wrapper class to OS dependent event and window interfaces, GTK+ version */ -#include -#include +#include "C4Include.h" +#include "platform/C4Window.h" -#include +#include "platform/C4App.h" #include "C4Version.h" -#include +#include "config/C4Config.h" -#include -#include -#include -#include +#include "graphics/C4DrawGL.h" +#include "graphics/C4Draw.h" +#include "platform/StdFile.h" +#include "lib/StdBuf.h" -#include +#include "lib/C4Rect.h" -#include -#include -#include -#include "C4MouseControl.h" +#include "editor/C4Console.h" +#include "editor/C4ViewportWindow.h" +#include "game/C4Viewport.h" +#include "gui/C4MouseControl.h" #include #include @@ -113,7 +113,7 @@ GLXFBConfig PickGLXFBConfig(Display* dpy, int multisampling) } } #elif defined(GDK_WINDOWING_WIN32) -#include +#include "platform/C4windowswrapper.h" #include #endif // GDK_WINDOWING_X11 diff --git a/src/platform/C4WindowMac.mm b/src/platform/C4WindowMac.mm index 2cb110c11..93031893c 100644 --- a/src/platform/C4WindowMac.mm +++ b/src/platform/C4WindowMac.mm @@ -13,13 +13,13 @@ * for the above references. */ -#include -#include -#include -#include -#include -#include -#include +#include "C4Include.h" +#include "graphics/C4DrawGL.h" +#include "platform/C4Window.h" +#include "C4Version.h" +#include "game/C4Application.h" +#include "lib/C4Rect.h" +#include "game/C4FullScreen.h" #import #import diff --git a/src/platform/C4WindowSDL.cpp b/src/platform/C4WindowSDL.cpp index 977d6aa52..cffd63205 100644 --- a/src/platform/C4WindowSDL.cpp +++ b/src/platform/C4WindowSDL.cpp @@ -16,17 +16,17 @@ /* A wrapper class to OS dependent event and window interfaces, SDL version */ -#include -#include +#include "C4Include.h" +#include "platform/C4Window.h" -#include -#include -#include -#include +#include "game/C4Application.h" +#include "graphics/C4DrawGL.h" +#include "platform/StdFile.h" +#include "lib/StdBuf.h" #include "C4Version.h" -#include -#include +#include "lib/C4Rect.h" +#include "config/C4Config.h" /* C4Window */ diff --git a/src/platform/C4WindowWin32.cpp b/src/platform/C4WindowWin32.cpp index 31120a7d6..7add841f2 100644 --- a/src/platform/C4WindowWin32.cpp +++ b/src/platform/C4WindowWin32.cpp @@ -18,24 +18,24 @@ /* A wrapper class to OS dependent event and window interfaces, WIN32 version */ #include "C4Include.h" -#include +#include "platform/C4Window.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "resource.h" +#include "game/C4Application.h" +#include "platform/C4AppWin32Impl.h" +#include "config/C4Config.h" +#include "editor/C4Console.h" +#include "graphics/C4DrawGL.h" +#include "game/C4FullScreen.h" +#include "game/C4GraphicsSystem.h" +#include "gui/C4MouseControl.h" +#include "lib/C4Rect.h" +#include "C4Version.h" +#include "game/C4Viewport.h" +#include "editor/C4ViewportWindow.h" +#include "platform/StdRegistry.h" +#include "res/resource.h" -#include +#include "platform/C4windowswrapper.h" #include #include diff --git a/src/platform/PlatformAbstraction.cpp b/src/platform/PlatformAbstraction.cpp index bd47b47bb..eeffb3990 100644 --- a/src/platform/PlatformAbstraction.cpp +++ b/src/platform/PlatformAbstraction.cpp @@ -14,10 +14,10 @@ * for the above references. */ -#include +#include "C4Include.h" #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #include bool OpenURL(const char *szURL) { diff --git a/src/platform/StdFile.cpp b/src/platform/StdFile.cpp index 105be60d0..1540323b2 100644 --- a/src/platform/StdFile.cpp +++ b/src/platform/StdFile.cpp @@ -18,8 +18,8 @@ /* Lots of file helpers */ #include "C4Include.h" -#include -#include +#include "platform/StdFile.h" +#include "lib/StdBuf.h" #include #ifdef HAVE_IO_H @@ -32,7 +32,7 @@ #include #endif #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #endif #include #include diff --git a/src/platform/StdRegistry.cpp b/src/platform/StdRegistry.cpp index 60624b524..8ac5c3301 100644 --- a/src/platform/StdRegistry.cpp +++ b/src/platform/StdRegistry.cpp @@ -18,10 +18,10 @@ /* Some wrappers for easier access to the Windows registry */ #include "C4Include.h" -#include +#include "platform/StdRegistry.h" #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" #include StdCopyStrBuf GetRegistryString(const char *szSubKey, const char *szValueName) diff --git a/src/platform/StdRegistry.h b/src/platform/StdRegistry.h index 1968fbe02..01c03876f 100644 --- a/src/platform/StdRegistry.h +++ b/src/platform/StdRegistry.h @@ -21,8 +21,8 @@ #define INC_STDREGISTRY #ifdef _WIN32 -#include "StdCompiler.h" -#include +#include "lib/StdCompiler.h" +#include "platform/C4windowswrapper.h" StdCopyStrBuf GetRegistryString(const char *szSubKey, const char *szValueName); bool SetRegistryString(const char *szSubKey, const char *szValueName, const char *szValue); diff --git a/src/platform/StdScheduler.cpp b/src/platform/StdScheduler.cpp index ed9e276f2..f2309d9c9 100644 --- a/src/platform/StdScheduler.cpp +++ b/src/platform/StdScheduler.cpp @@ -14,7 +14,7 @@ * for the above references. */ #include "C4Include.h" -#include "StdScheduler.h" +#include "platform/StdScheduler.h" #include diff --git a/src/platform/StdScheduler.h b/src/platform/StdScheduler.h index 12ebdc74f..41a4e169b 100644 --- a/src/platform/StdScheduler.h +++ b/src/platform/StdScheduler.h @@ -18,7 +18,7 @@ #ifndef STDSCHEDULER_H #define STDSCHEDULER_H -#include "StdSync.h" +#include "platform/StdSync.h" // Events are Windows-specific #ifdef _WIN32 @@ -27,7 +27,7 @@ #define STDSCHEDULER_EVENT_MESSAGE INVALID_HANDLE_VALUE struct pollfd; #ifndef STDSCHEDULER_USE_EVENTS -#include +#include "platform/C4windowswrapper.h" #include #endif // STDSCHEDULER_USE_EVENTS #else // _WIN32 diff --git a/src/platform/StdSchedulerMac.mm b/src/platform/StdSchedulerMac.mm index 3cd3e4d29..3b183440b 100644 --- a/src/platform/StdSchedulerMac.mm +++ b/src/platform/StdSchedulerMac.mm @@ -13,8 +13,8 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "platform/StdScheduler.h" #import using namespace std; diff --git a/src/platform/StdSchedulerPoll.cpp b/src/platform/StdSchedulerPoll.cpp index 79bae5e6c..e8f102341 100644 --- a/src/platform/StdSchedulerPoll.cpp +++ b/src/platform/StdSchedulerPoll.cpp @@ -15,7 +15,7 @@ */ #include "C4Include.h" -#include "StdScheduler.h" +#include "platform/StdScheduler.h" #ifdef HAVE_POLL_H #include diff --git a/src/platform/StdSchedulerWin32.cpp b/src/platform/StdSchedulerWin32.cpp index fb4424d44..5ab0f2072 100644 --- a/src/platform/StdSchedulerWin32.cpp +++ b/src/platform/StdSchedulerWin32.cpp @@ -15,8 +15,8 @@ */ // Events are Windows-specific -#include -#include +#include "C4Include.h" +#include "platform/StdScheduler.h" #ifdef STDSCHEDULER_USE_EVENTS #include diff --git a/src/platform/StdSync.h b/src/platform/StdSync.h index 112c17ddf..549790868 100644 --- a/src/platform/StdSync.h +++ b/src/platform/StdSync.h @@ -19,7 +19,7 @@ #define INC_StdSync #ifdef _WIN32 -#include +#include "platform/C4windowswrapper.h" class CStdCSec { diff --git a/src/player/C4Player.cpp b/src/player/C4Player.cpp index fb00c5b70..b37191299 100644 --- a/src/player/C4Player.cpp +++ b/src/player/C4Player.cpp @@ -17,34 +17,34 @@ /* Player data at runtime */ -#include -#include +#include "C4Include.h" +#include "player/C4Player.h" -#include +#include "game/C4Application.h" #include "object/C4Def.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "object/C4Object.h" +#include "object/C4ObjectInfo.h" +#include "object/C4Command.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/C4GameObjects.h" +#include "control/C4GameControl.h" +#include "game/C4Viewport.h" C4Player::C4Player() : C4PlayerInfoCore() { diff --git a/src/player/C4Player.h b/src/player/C4Player.h index a4586dabb..4df4085a2 100644 --- a/src/player/C4Player.h +++ b/src/player/C4Player.h @@ -20,13 +20,13 @@ #ifndef INC_C4Player #define INC_C4Player -#include "C4MainMenu.h" -#include "C4ObjectInfoList.h" -#include "C4InfoCore.h" -#include "C4ObjectList.h" -#include "C4ObjectPtr.h" -#include "C4PlayerControl.h" -#include +#include "gui/C4MainMenu.h" +#include "object/C4ObjectInfoList.h" +#include "object/C4InfoCore.h" +#include "object/C4ObjectList.h" +#include "object/C4ObjectPtr.h" +#include "control/C4PlayerControl.h" +#include "script/C4Value.h" #include #include diff --git a/src/player/C4PlayerList.cpp b/src/player/C4PlayerList.cpp index 255dff0dd..062d4162e 100644 --- a/src/player/C4PlayerList.cpp +++ b/src/player/C4PlayerList.cpp @@ -17,21 +17,21 @@ /* Dynamic list to hold runtime player data */ -#include -#include +#include "C4Include.h" +#include "player/C4PlayerList.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 "lib/StdColors.h" C4PlayerList::C4PlayerList() diff --git a/src/player/C4PlayerList.h b/src/player/C4PlayerList.h index 09c38118c..24c4195fc 100644 --- a/src/player/C4PlayerList.h +++ b/src/player/C4PlayerList.h @@ -20,7 +20,7 @@ #ifndef INC_C4PlayerList #define INC_C4PlayerList -#include "C4PlayerInfo.h" +#include "control/C4PlayerInfo.h" class C4PlayerList { diff --git a/src/player/C4RankSystem.cpp b/src/player/C4RankSystem.cpp index d3b88fe52..d3b23e0a7 100644 --- a/src/player/C4RankSystem.cpp +++ b/src/player/C4RankSystem.cpp @@ -17,17 +17,17 @@ /* Rank list for players or crew members */ -#include -#include +#include "C4Include.h" +#include "player/C4RankSystem.h" -#include -#include -#include -#include -#include -#include +#include "lib/C4Log.h" +#include "c4group/C4Group.h" +#include "c4group/C4ComponentHost.h" +#include "graphics/C4FacetEx.h" +#include "game/C4Game.h" +#include "graphics/C4GraphicsResource.h" -#include +#include "platform/StdRegistry.h" C4RankSystem::C4RankSystem() : pszRankNames(NULL), szRankNames(NULL), pszRankExtensions(NULL) diff --git a/src/player/C4RankSystem.h b/src/player/C4RankSystem.h index 91dcf8c9d..c6c105a5f 100644 --- a/src/player/C4RankSystem.h +++ b/src/player/C4RankSystem.h @@ -20,7 +20,7 @@ #ifndef INC_C4RankSystem #define INC_C4RankSystem -#include "C4InputValidation.h" +#include "lib/C4InputValidation.h" class C4RankSystem { diff --git a/src/player/C4ScenarioParameters.cpp b/src/player/C4ScenarioParameters.cpp index aeb65ef24..d74ef17fc 100644 --- a/src/player/C4ScenarioParameters.cpp +++ b/src/player/C4ScenarioParameters.cpp @@ -14,10 +14,10 @@ * for the above references. */ #include "C4Include.h" -#include "C4ScenarioParameters.h" -#include "C4Components.h" -#include "C4Aul.h" -#include "C4FacetEx.h" +#include "player/C4ScenarioParameters.h" +#include "c4group/C4Components.h" +#include "script/C4Aul.h" +#include "graphics/C4FacetEx.h" /* C4AchievementGraphics */ diff --git a/src/script/C4Aul.cpp b/src/script/C4Aul.cpp index 09d13180f..1a1cde352 100644 --- a/src/script/C4Aul.cpp +++ b/src/script/C4Aul.cpp @@ -15,16 +15,16 @@ */ // Miscellaneous script engine bits -#include -#include -#include -#include +#include "C4Include.h" +#include "script/C4Aul.h" +#include "script/C4AulExec.h" +#include "script/C4AulDebug.h" -#include -#include -#include -#include -#include +#include "config/C4Config.h" +#include "object/C4Def.h" +#include "lib/C4Log.h" +#include "c4group/C4Components.h" +#include "c4group/C4LangStringTable.h" C4AulError::C4AulError(): shown(false) {} diff --git a/src/script/C4Aul.h b/src/script/C4Aul.h index 29b7fb320..994629f15 100644 --- a/src/script/C4Aul.h +++ b/src/script/C4Aul.h @@ -17,10 +17,10 @@ #ifndef INC_C4Aul #define INC_C4Aul -#include -#include -#include -#include +#include "object/C4Id.h" +#include "script/C4StringTable.h" +#include "script/C4Value.h" +#include "script/C4ValueMap.h" #include #include diff --git a/src/script/C4AulDebug.cpp b/src/script/C4AulDebug.cpp index b7557ef50..3f8cf8d7c 100644 --- a/src/script/C4AulDebug.cpp +++ b/src/script/C4AulDebug.cpp @@ -13,18 +13,18 @@ * for the above references. */ -#include -#include "C4AulDebug.h" +#include "C4Include.h" +#include "script/C4AulDebug.h" -#include -#include -#include -#include -#include -#include +#include "game/C4Application.h" +#include "C4Version.h" +#include "control/C4GameControl.h" +#include "game/C4Game.h" +#include "gui/C4MessageInput.h" +#include "lib/C4Log.h" #include "object/C4Def.h" -#include -#include "C4AulExec.h" +#include "object/C4Object.h" +#include "script/C4AulExec.h" #ifndef NOAULDEBUG diff --git a/src/script/C4AulDebug.h b/src/script/C4AulDebug.h index ce9703335..0b0056450 100644 --- a/src/script/C4AulDebug.h +++ b/src/script/C4AulDebug.h @@ -18,7 +18,7 @@ #ifndef NOAULDEBUG -#include "C4NetIO.h" +#include "network/C4NetIO.h" // manages a debugging interface class C4AulDebug : public C4NetIOTCP, private C4NetIO::CBClass diff --git a/src/script/C4AulDefFunc.h b/src/script/C4AulDefFunc.h index 35b44bc0e..5fd40e7b8 100644 --- a/src/script/C4AulDefFunc.h +++ b/src/script/C4AulDefFunc.h @@ -18,10 +18,10 @@ #ifndef INC_C4AulDefFunc #define INC_C4AulDefFunc -#include -#include -#include -#include +#include "script/C4Aul.h" +#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 4706c640b..0e67ac2b3 100644 --- a/src/script/C4AulExec.cpp +++ b/src/script/C4AulExec.cpp @@ -15,17 +15,17 @@ */ // executes script functions -#include -#include +#include "C4Include.h" +#include "script/C4AulExec.h" -#include -#include -#include -#include -#include -#include -#include -#include +#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 diff --git a/src/script/C4AulExec.h b/src/script/C4AulExec.h index 269083003..9278d059f 100644 --- a/src/script/C4AulExec.h +++ b/src/script/C4AulExec.h @@ -19,9 +19,9 @@ #ifndef C4AULEXEC_H #define C4AULEXEC_H -#include -#include "C4TimeMilliseconds.h" -#include +#include "script/C4Aul.h" +#include "platform/C4TimeMilliseconds.h" +#include "script/C4AulScriptFunc.h" const int MAX_CONTEXT_STACK = 512; const int MAX_VALUE_STACK = 1024; diff --git a/src/script/C4AulFunc.cpp b/src/script/C4AulFunc.cpp index 676785a16..a2a43b438 100644 --- a/src/script/C4AulFunc.cpp +++ b/src/script/C4AulFunc.cpp @@ -14,10 +14,10 @@ * for the above references. */ -#include -#include -#include -#include +#include "C4Include.h" +#include "script/C4Value.h" +#include "script/C4AulFunc.h" +#include "script/C4Aul.h" C4AulFunc::C4AulFunc(C4PropListStatic * Parent, const char *pName): Parent(Parent), diff --git a/src/script/C4AulFunc.h b/src/script/C4AulFunc.h index 84f2bb173..75140fe2c 100644 --- a/src/script/C4AulFunc.h +++ b/src/script/C4AulFunc.h @@ -21,7 +21,7 @@ #error Include C4Value.h instead of C4AulFunc.h #endif -#include +#include "script/C4StringTable.h" #define C4AUL_MAX_Par 10 // max number of parameters diff --git a/src/script/C4AulLink.cpp b/src/script/C4AulLink.cpp index edeef6aa9..b3106a4ab 100644 --- a/src/script/C4AulLink.cpp +++ b/src/script/C4AulLink.cpp @@ -15,14 +15,14 @@ */ // links aul scripts; i.e. resolves includes & appends, etc -#include -#include +#include "C4Include.h" +#include "script/C4Aul.h" -#include -#include -#include -#include -#include +#include "object/C4Def.h" +#include "object/C4DefList.h" +#include "landscape/C4Material.h" +#include "game/C4Game.h" +#include "object/C4GameObjects.h" // ResolveAppends and ResolveIncludes must be called both // for each script. ResolveAppends has to be called first! diff --git a/src/script/C4AulParse.cpp b/src/script/C4AulParse.cpp index 244a8402e..13640a869 100644 --- a/src/script/C4AulParse.cpp +++ b/src/script/C4AulParse.cpp @@ -15,17 +15,17 @@ */ // parses scripts -#include +#include "C4Include.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "script/C4Aul.h" +#include "script/C4AulDebug.h" +#include "script/C4AulExec.h" +#include "script/C4AulScriptFunc.h" +#include "object/C4Def.h" +#include "game/C4Game.h" +#include "lib/C4Log.h" +#include "config/C4Config.h" #define DEBUG_BYTECODE_DUMP 0 #include diff --git a/src/script/C4AulScriptFunc.cpp b/src/script/C4AulScriptFunc.cpp index 184ba8109..a4abfc915 100644 --- a/src/script/C4AulScriptFunc.cpp +++ b/src/script/C4AulScriptFunc.cpp @@ -13,11 +13,11 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "script/C4AulScriptFunc.h" -#include -#include +#include "script/C4AulExec.h" +#include "script/C4ScriptHost.h" C4AulScriptFunc::C4AulScriptFunc(C4PropListStatic * Parent, C4ScriptHost *pOrgScript, const char *pName, const char *Script): C4AulFunc(Parent, pName), diff --git a/src/script/C4AulScriptFunc.h b/src/script/C4AulScriptFunc.h index 975db4f48..7245f77e9 100644 --- a/src/script/C4AulScriptFunc.h +++ b/src/script/C4AulScriptFunc.h @@ -16,8 +16,8 @@ #ifndef C4AULSCRIPTFUNC_H_ #define C4AULSCRIPTFUNC_H_ -#include -#include +#include "script/C4Value.h" +#include "script/C4ValueMap.h" // byte code chunk type // some special script functions defined hard-coded to reduce the exec context diff --git a/src/script/C4Effect.cpp b/src/script/C4Effect.cpp index 5b83a10dc..5919291e4 100644 --- a/src/script/C4Effect.cpp +++ b/src/script/C4Effect.cpp @@ -18,13 +18,13 @@ // C4AulFun-based effects assigned to an object /* Also contains some helper functions for various landscape effects */ -#include -#include +#include "C4Include.h" +#include "script/C4Effect.h" #include "object/C4Def.h" -#include -#include -#include +#include "object/C4DefList.h" +#include "object/C4Object.h" +#include "game/C4Game.h" #include "script/C4Aul.h" void C4Effect::AssignCallbackFunctions() diff --git a/src/script/C4Effect.h b/src/script/C4Effect.h index 730e02960..ba5d24bd0 100644 --- a/src/script/C4Effect.h +++ b/src/script/C4Effect.h @@ -24,8 +24,8 @@ #ifndef INC_C4Effects #define INC_C4Effects -#include -#include +#include "object/C4ObjectPtr.h" +#include "script/C4PropList.h" // callback return values #define C4Fx_OK 0 // generic standard behaviour for all effect callbacks diff --git a/src/script/C4PropList.cpp b/src/script/C4PropList.cpp index 2403d4138..c8b281e8a 100644 --- a/src/script/C4PropList.cpp +++ b/src/script/C4PropList.cpp @@ -15,14 +15,14 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "script/C4PropList.h" #include "script/C4Aul.h" -#include -#include -#include -#include +#include "object/C4GameObjects.h" +#include "game/C4Game.h" +#include "object/C4Object.h" +#include "control/C4Record.h" void C4PropList::AddRef(C4Value *pRef) { diff --git a/src/script/C4PropList.h b/src/script/C4PropList.h index 36eca737e..63cf8e10a 100644 --- a/src/script/C4PropList.h +++ b/src/script/C4PropList.h @@ -17,8 +17,8 @@ #include -#include "C4Value.h" -#include "C4StringTable.h" +#include "script/C4Value.h" +#include "script/C4StringTable.h" #ifndef C4PROPLIST_H #define C4PROPLIST_H diff --git a/src/script/C4Script.cpp b/src/script/C4Script.cpp index 16384600a..ccb6aee60 100644 --- a/src/script/C4Script.cpp +++ b/src/script/C4Script.cpp @@ -17,12 +17,12 @@ /* Functions mapped by C4Script */ -#include -#include +#include "C4Include.h" +#include "script/C4AulDefFunc.h" -#include -#include -#include +#include "script/C4AulExec.h" +#include "lib/C4Random.h" +#include "C4Version.h" //========================== Some Support Functions ======================================= diff --git a/src/script/C4ScriptHost.cpp b/src/script/C4ScriptHost.cpp index 5212e1114..3cf7b65cf 100644 --- a/src/script/C4ScriptHost.cpp +++ b/src/script/C4ScriptHost.cpp @@ -17,10 +17,10 @@ /* Handles script file components (calls, inheritance, function maps) */ -#include -#include +#include "C4Include.h" +#include "script/C4ScriptHost.h" -#include +#include "object/C4Def.h" /*--- C4ScriptHost ---*/ diff --git a/src/script/C4ScriptHost.h b/src/script/C4ScriptHost.h index 2054c2056..dfffe2d56 100644 --- a/src/script/C4ScriptHost.h +++ b/src/script/C4ScriptHost.h @@ -20,8 +20,8 @@ #ifndef INC_C4ScriptHost #define INC_C4ScriptHost -#include -#include +#include "c4group/C4ComponentHost.h" +#include "script/C4Aul.h" // aul script state enum C4AulScriptState diff --git a/src/script/C4ScriptStandalone.cpp b/src/script/C4ScriptStandalone.cpp index 1eb133eed..4ebe2a68a 100644 --- a/src/script/C4ScriptStandalone.cpp +++ b/src/script/C4ScriptStandalone.cpp @@ -15,13 +15,13 @@ #include "../../include/c4script/c4script.h" -#include +#include "C4Include.h" #include "lib/C4Random.h" #include "c4group/C4Group.h" #include "script/C4Aul.h" #include "script/C4ScriptHost.h" -#include +#include "object/C4DefList.h" /* StandaloneStubs.cpp is shared with mape, which has a real implementation of these */ C4Def* C4DefList::GetByName(const StdStrBuf &) {return NULL;} diff --git a/src/script/C4ScriptStandaloneStubs.cpp b/src/script/C4ScriptStandaloneStubs.cpp index d2ef24c02..203a72e71 100644 --- a/src/script/C4ScriptStandaloneStubs.cpp +++ b/src/script/C4ScriptStandaloneStubs.cpp @@ -13,15 +13,15 @@ * for the above references. */ -#include +#include "C4Include.h" -#include -#include -#include -#include -#include -#include -#include +#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" /* Parts of the ScriptEngine that are normally in C4Globals for initialization order reasons. */ #ifdef _DEBUG diff --git a/src/script/C4StringTable.cpp b/src/script/C4StringTable.cpp index 8b8d16638..c4031cb8f 100644 --- a/src/script/C4StringTable.cpp +++ b/src/script/C4StringTable.cpp @@ -15,8 +15,8 @@ */ /* string table: holds all strings used by script engine */ -#include -#include +#include "C4Include.h" +#include "script/C4StringTable.h" // *** C4Set diff --git a/src/script/C4Value.cpp b/src/script/C4Value.cpp index de5b3322f..6574c3515 100644 --- a/src/script/C4Value.cpp +++ b/src/script/C4Value.cpp @@ -14,20 +14,20 @@ * for the above references. */ -#include -#include +#include "C4Include.h" +#include "script/C4Value.h" -#include +#include "script/C4AulExec.h" #include "object/C4Def.h" -#include -#include -#include -#include +#include "object/C4DefList.h" +#include "script/C4StringTable.h" +#include "script/C4ValueArray.h" +#include "game/C4Game.h" #include "game/C4GameScript.h" -#include -#include -#include -#include +#include "object/C4GameObjects.h" +#include "object/C4Object.h" +#include "lib/C4Log.h" +#include "script/C4Effect.h" const C4Value C4VNull; diff --git a/src/script/C4Value.h b/src/script/C4Value.h index f8dd24626..852036885 100644 --- a/src/script/C4Value.h +++ b/src/script/C4Value.h @@ -16,8 +16,8 @@ #ifndef INC_C4Value #define INC_C4Value -#include "C4StringTable.h" -#include +#include "script/C4StringTable.h" +#include "object/C4ObjectPtr.h" // C4Value type enum C4V_Type @@ -261,9 +261,9 @@ private: in common situations because the Type of the new value is known. In any case, inlining them does speed up the script engine on at least one artificial benchmark. */ -#include "C4ValueArray.h" -#include "C4PropList.h" -#include "C4AulFunc.h" +#include "script/C4ValueArray.h" +#include "script/C4PropList.h" +#include "script/C4AulFunc.h" ALWAYS_INLINE void C4Value::AddDataRef() { diff --git a/src/script/C4ValueArray.cpp b/src/script/C4ValueArray.cpp index 393bc5ec0..4d81843a4 100644 --- a/src/script/C4ValueArray.cpp +++ b/src/script/C4ValueArray.cpp @@ -13,13 +13,13 @@ * To redistribute this file separately, substitute the full license texts * for the above references. */ -#include -#include +#include "C4Include.h" +#include "script/C4ValueArray.h" #include -#include -#include -#include +#include "script/C4Aul.h" +#include "object/C4FindObject.h" +#include "object/C4Object.h" C4ValueArray::C4ValueArray() : iSize(0), iCapacity(0), pData(NULL) diff --git a/src/script/C4ValueArray.h b/src/script/C4ValueArray.h index c4e47daac..2741e25ea 100644 --- a/src/script/C4ValueArray.h +++ b/src/script/C4ValueArray.h @@ -14,7 +14,7 @@ * for the above references. */ -#include "C4Value.h" +#include "script/C4Value.h" #ifndef INC_C4ValueList #define INC_C4ValueList diff --git a/src/script/C4ValueMap.cpp b/src/script/C4ValueMap.cpp index 3b1c07971..b014d85ff 100644 --- a/src/script/C4ValueMap.cpp +++ b/src/script/C4ValueMap.cpp @@ -15,9 +15,9 @@ */ #include "C4Include.h" -#include "C4ValueMap.h" +#include "script/C4ValueMap.h" -#include +#include "script/C4Value.h" // *** C4ValueMapData ***