marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite header inclusions to #include "path/to/file.h" style

liquid_container
Nicolas Hake 2016-04-03 20:07:56 +02:00
parent 5134a0a0a4
commit 493c276126
407 changed files with 2223 additions and 2240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -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

26
src/C4Globals.cpp
View File

@ -16,19 +16,19 @@
/* Global interdependent objects */
#include <C4Include.h>
#include "C4Application.h"
#include "C4Aul.h"
#include "C4Console.h"
#include <C4DefList.h>
#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 *> C4PropList::PropLists;

20
src/C4Include.h
View File

@ -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 <new>
#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

4
src/c4group/C4ComponentHost.cpp
View File

@ -17,8 +17,8 @@
/* Holds a single text file component from a group */
#include <C4Include.h>
#include <C4ComponentHost.h>
#include "C4Include.h"
#include "c4group/C4ComponentHost.h"
bool C4ComponentHost::Load(C4Group &hGroup,
const char *fname,

12
src/c4group/C4Extra.cpp
View File

@ -15,13 +15,13 @@
*/
// user-customizable multimedia package Extra.ocg
#include <C4Include.h>
#include <C4Extra.h>
#include "C4Include.h"
#include "c4group/C4Extra.h"
#include <C4Config.h>
#include <C4Components.h>
#include <C4Game.h>
#include <C4Log.h>
#include "config/C4Config.h"
#include "c4group/C4Components.h"
#include "game/C4Game.h"
#include "lib/C4Log.h"
C4Extra::C4Extra()
{

2
src/c4group/C4Extra.h
View File

@ -18,7 +18,7 @@
#ifndef INC_C4Extra
#define INC_C4Extra
#include <C4Group.h>
#include "c4group/C4Group.h"
class C4Extra
{

8
src/c4group/C4Group.cpp
View File

@ -19,11 +19,11 @@
/* Needs to be compilable as Objective C++ on OS X */
#include <C4Include.h>
#include <C4Group.h>
#include "C4Include.h"
#include "c4group/C4Group.h"
#include <C4Components.h>
#include <C4InputValidation.h>
#include "c4group/C4Components.h"
#include "lib/C4InputValidation.h"
#include <zlib.h>

4
src/c4group/C4Group.h
View File

@ -23,8 +23,8 @@
#ifdef HAVE_IO_H
#include <io.h>
#endif
#include <CStdFile.h>
#include <StdBuf.h>
#include "c4group/CStdFile.h"
#include "lib/StdBuf.h"
// C4Group-Rewind-warning:
// The current C4Group-implementation cannot handle random file access very well,

12
src/c4group/C4GroupMain.cpp
View File

@ -16,14 +16,14 @@
/* C4Group command line executable */
#include <C4Include.h>
#include "C4Include.h"
#include <C4Group.h>
#include <C4Version.h>
#include <C4Update.h>
#include <StdRegistry.h>
#include "c4group/C4Group.h"
#include "C4Version.h"
#include "c4group/C4Update.h"
#include "platform/StdRegistry.h"
#ifdef _WIN32
#include <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#endif
int globalArgC;

10
src/c4group/C4GroupSet.cpp
View File

@ -16,12 +16,12 @@
// a set of group files
// manages system file overwriting by scearios or folders
#include <C4Include.h>
#include <C4GroupSet.h>
#include "C4Include.h"
#include "c4group/C4GroupSet.h"
#include <C4Components.h>
#include <C4Group.h>
#include <C4Log.h>
#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)

4
src/c4group/C4LangStringTable.cpp
View File

@ -20,8 +20,8 @@
#include <utility>
#include <vector>
#include "C4LangStringTable.h"
#include "C4InputValidation.h"
#include "c4group/C4LangStringTable.h"
#include "lib/C4InputValidation.h"
C4LangStringTable::C4LangStringTable() : ref_count(1) {}

2
src/c4group/C4LangStringTable.h
View File

@ -18,7 +18,7 @@
#ifndef INC_C4LangStringTable
#define INC_C4LangStringTable
#include "C4ComponentHost.h"
#include "c4group/C4ComponentHost.h"
#include <map>
#include <string>

14
src/c4group/C4Language.cpp
View File

@ -22,14 +22,14 @@
*/
#include <C4Include.h>
#include <C4Language.h>
#include "C4Include.h"
#include "c4group/C4Language.h"
#include <C4Application.h>
#include <C4Components.h>
#include <C4Log.h>
#include <C4Config.h>
#include <C4Game.h>
#include "game/C4Application.h"
#include "c4group/C4Components.h"
#include "lib/C4Log.h"
#include "config/C4Config.h"
#include "game/C4Game.h"
C4Language Languages;

12
src/c4group/C4Update.cpp
View File

@ -13,17 +13,17 @@
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>
#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 <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#include <direct.h>
#endif

2
src/c4group/C4Update.h
View File

@ -19,7 +19,7 @@
#define INC_C4GroupEx
#include "C4InputValidation.h"
#include "lib/C4InputValidation.h"
const int C4UP_MaxUpGrpCnt = 50;

8
src/c4group/CStdFile.cpp
View File

@ -21,12 +21,12 @@
#ifdef _WIN32
# include "platform/C4windowswrapper.h"
#endif
#include <StdFile.h>
#include <CStdFile.h>
#include <SHA1.h>
#include "platform/StdFile.h"
#include "c4group/CStdFile.h"
#include "lib/SHA1.h"
#include <zlib.h>
#include <zlib/gzio.h>
#include "zlib/gzio.h"
#include <stdio.h>
#include <sys/stat.h>

2
src/c4group/CStdFile.h
View File

@ -21,7 +21,7 @@
#define INC_CSTDFILE
#include <stdio.h>
#include <StdSync.h> // for StdThreadCheck
#include "platform/StdSync.h" // for StdThreadCheck
#include <zlib.h> // for gzFile
const int CStdFileBufSize = 4096;

4
src/c4group/gunzip4c4group.cpp
View File

@ -12,8 +12,8 @@
* for the above references.
*/
#include <C4Include.h>
#include <CStdFile.h>
#include "C4Include.h"
#include "c4group/CStdFile.h"
#include <stdio.h>
bool EraseItemSafe(const char *szFilename)

22
src/config/C4Config.cpp
View File

@ -16,19 +16,19 @@
/* Game configuration as stored in registry */
#include <C4Include.h>
#include <C4Config.h>
#include "C4Include.h"
#include "config/C4Config.h"
#include <C4Version.h>
#include <C4Log.h>
#include <C4Components.h>
#include <C4Network2.h>
#include <C4Language.h>
#include "C4Version.h"
#include "lib/C4Log.h"
#include "c4group/C4Components.h"
#include "network/C4Network2.h"
#include "c4group/C4Language.h"
#include <utility>
#include <StdFile.h>
#include <C4Window.h>
#include <StdRegistry.h>
#include "platform/StdFile.h"
#include "platform/C4Window.h"
#include "platform/StdRegistry.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@ -40,7 +40,7 @@
#include <locale.h>
#endif
#include <C4Application.h>
#include "game/C4Application.h"
void C4ConfigGeneral::CompileFunc(StdCompiler *pComp)
{

6
src/config/C4Config.h
View File

@ -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 <list>
#define C4DEFAULT_FONT_NAME "Endeavour"

8
src/config/C4Reloc.cpp
View File

@ -13,11 +13,11 @@
* for the above references.
*/
#include <C4Include.h>
#include <C4Reloc.h>
#include "C4Include.h"
#include "config/C4Reloc.h"
#include <C4Config.h>
#include <C4Application.h>
#include "config/C4Config.h"
#include "game/C4Application.h"
C4Reloc Reloc; // singleton

50
src/control/C4Control.cpp
View File

@ -17,40 +17,40 @@
/* Control packets contain all player input in the message queue */
#include <C4Include.h>
#include <C4Control.h>
#include "C4Include.h"
#include "control/C4Control.h"
#include <C4AulExec.h>
#include <C4Object.h>
#include <C4GameSave.h>
#include <C4GameLobby.h>
#include <C4Network2Dialogs.h>
#include <C4Random.h>
#include <C4Console.h>
#include <C4Log.h>
#include <C4GraphicsSystem.h>
#include <C4Player.h>
#include <C4RankSystem.h>
#include <C4RoundResults.h>
#include <C4PXS.h>
#include <C4MassMover.h>
#include <C4GameMessage.h>
#include <C4Landscape.h>
#include <C4Game.h>
#include "script/C4AulExec.h"
#include "object/C4Object.h"
#include "control/C4GameSave.h"
#include "gui/C4GameLobby.h"
#include "network/C4Network2Dialogs.h"
#include "lib/C4Random.h"
#include "editor/C4Console.h"
#include "lib/C4Log.h"
#include "game/C4GraphicsSystem.h"
#include "player/C4Player.h"
#include "player/C4RankSystem.h"
#include "control/C4RoundResults.h"
#include "landscape/C4PXS.h"
#include "landscape/C4MassMover.h"
#include "gui/C4GameMessage.h"
#include "landscape/C4Landscape.h"
#include "game/C4Game.h"
#include "game/C4GameScript.h"
#include <C4PlayerList.h>
#include <C4GameObjects.h>
#include <C4GameControl.h>
#include <C4ScriptGuiWindow.h>
#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 <C4AulDebug.h>
#include "script/C4AulDebug.h"
#endif
#include <C4AulExec.h>
#include "script/C4AulExec.h"
// *** C4ControlPacket
C4ControlPacket::C4ControlPacket()

12
src/control/C4Control.h
View File

@ -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

22
src/control/C4GameControl.cpp
View File

@ -17,17 +17,17 @@
#include "C4Include.h"
#include <C4Application.h>
#include <C4Game.h>
#include <C4GameControl.h>
#include <C4GameOverDlg.h>
#include <C4Record.h>
#include <C4Log.h>
#include <C4Network2Stats.h>
#include <C4MouseControl.h>
#include <C4GamePadCon.h>
#include <C4PlayerList.h>
#include <C4Player.h>
#include "game/C4Application.h"
#include "game/C4Game.h"
#include "control/C4GameControl.h"
#include "gui/C4GameOverDlg.h"
#include "control/C4Record.h"
#include "lib/C4Log.h"
#include "network/C4Network2Stats.h"
#include "gui/C4MouseControl.h"
#include "platform/C4GamePadCon.h"
#include "player/C4PlayerList.h"
#include "player/C4Player.h"
#ifdef _MSC_VER
#pragma warning (disable: 4355)

6
src/control/C4GameControl.h
View File

@ -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,

14
src/control/C4GameParameters.cpp
View File

@ -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 <C4DefList.h>
#include <C4Game.h>
#include <C4Network2.h>
#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

8
src/control/C4GameParameters.h
View File

@ -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
{

30
src/control/C4GameSave.cpp
View File

@ -15,22 +15,22 @@
*/
// game saving functionality
#include <C4Include.h>
#include <C4GameSave.h>
#include "C4Include.h"
#include "control/C4GameSave.h"
#include <C4Components.h>
#include <C4Game.h>
#include <C4Log.h>
#include <C4Landscape.h>
#include <C4PXS.h>
#include <C4MassMover.h>
#include <C4PlayerList.h>
#include <C4RoundResults.h>
#include <C4Record.h>
#include <C4Version.h>
#include <C4GameParameters.h>
#include <C4Value.h>
#include <C4Network2.h>
#include "c4group/C4Components.h"
#include "game/C4Game.h"
#include "lib/C4Log.h"
#include "landscape/C4Landscape.h"
#include "landscape/C4PXS.h"
#include "landscape/C4MassMover.h"
#include "player/C4PlayerList.h"
#include "control/C4RoundResults.h"
#include "control/C4Record.h"
#include "C4Version.h"
#include "control/C4GameParameters.h"
#include "script/C4Value.h"
#include "network/C4Network2.h"
// *** C4GameSave main class

4
src/control/C4GameSave.h
View File

@ -26,8 +26,8 @@
#ifndef INC_C4GameSave
#define INC_C4GameSave
#include <C4Scenario.h>
#include <C4Components.h>
#include "landscape/C4Scenario.h"
#include "c4group/C4Components.h"
class C4GameSave
{

32
src/control/C4PlayerControl.cpp
View File

@ -16,27 +16,27 @@
// Input to player control mapping
#include "C4Include.h"
#include "C4PlayerControl.h"
#include "control/C4PlayerControl.h"
#include <C4DefList.h>
#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 <algorithm>
#include "C4Record.h"
#include "control/C4Record.h"
/* C4PlayerControlDef */

8
src/control/C4PlayerControl.h
View File

@ -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 <list>

20
src/control/C4PlayerInfo.cpp
View File

@ -17,17 +17,17 @@
// permanent player information management
// see header for some additional information
#include <C4Include.h>
#include <C4PlayerInfo.h>
#include "C4Include.h"
#include "control/C4PlayerInfo.h"
#include <C4Game.h>
#include <C4Config.h>
#include <C4Log.h>
#include <C4Player.h>
#include <C4FullScreen.h>
#include <C4PlayerList.h>
#include <C4GameControl.h>
#include <C4Components.h>
#include "game/C4Game.h"
#include "config/C4Config.h"
#include "lib/C4Log.h"
#include "player/C4Player.h"
#include "game/C4FullScreen.h"
#include "player/C4PlayerList.h"
#include "control/C4GameControl.h"
#include "c4group/C4Components.h"
// *** C4PlayerInfo

10
src/control/C4PlayerInfo.h
View File

@ -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

12
src/control/C4PlayerInfoConflicts.cpp
View File

@ -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 <C4Include.h>
#include <C4PlayerInfo.h>
#include <C4Game.h>
#include <C4Teams.h>
#include <StdColors.h>
#include <C4Random.h>
#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;

20
src/control/C4Record.cpp
View File

@ -15,18 +15,18 @@
*/
// scenario record functionality
#include <C4Include.h>
#include <C4Record.h>
#include "C4Include.h"
#include "control/C4Record.h"
#include <C4Console.h>
#include <C4PlayerInfo.h>
#include <C4GameSave.h>
#include <C4Log.h>
#include <C4Player.h>
#include <C4Game.h>
#include <C4GameControl.h>
#include "editor/C4Console.h"
#include "control/C4PlayerInfo.h"
#include "control/C4GameSave.h"
#include "lib/C4Log.h"
#include "player/C4Player.h"
#include "game/C4Game.h"
#include "control/C4GameControl.h"
#include <StdFile.h>
#include "platform/StdFile.h"
#define IMMEDIATEREC

4
src/control/C4Record.h
View File

@ -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

16
src/control/C4RoundResults.cpp
View File

@ -15,16 +15,16 @@
*/
// Round result information to be displayed in game over dialog
#include <C4Include.h>
#include <C4RoundResults.h>
#include "C4Include.h"
#include "control/C4RoundResults.h"
#include <C4Player.h>
#include <C4Game.h>
#include "player/C4Player.h"
#include "game/C4Game.h"
#include "object/C4Def.h"
#include <C4Object.h>
#include <C4PlayerList.h>
#include <C4GameObjects.h>
#include <C4DefList.h>
#include "object/C4Object.h"
#include "player/C4PlayerList.h"
#include "object/C4GameObjects.h"
#include "object/C4DefList.h"
// *** C4RoundResultsPlayer

8
src/control/C4RoundResults.h
View File

@ -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

16
src/control/C4Teams.cpp
View File

@ -15,15 +15,15 @@
*/
// player team management for teamwork melees
#include <C4Include.h>
#include <C4Teams.h>
#include "C4Include.h"
#include "control/C4Teams.h"
#include <C4Game.h>
#include <C4Random.h>
#include <C4Components.h>
#include <C4Player.h>
#include <C4PlayerList.h>
#include <C4GameControl.h>
#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

2
src/control/C4Teams.h
View File

@ -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;

38
src/editor/C4Console.cpp
View File

@ -17,26 +17,26 @@
/* Handles engine execution in developer mode */
#include <C4Include.h>
#include <C4Console.h>
#include "C4Include.h"
#include "editor/C4Console.h"
#include <C4Application.h>
#include <C4Def.h>
#include <C4GameSave.h>
#include <C4Game.h>
#include <C4MessageInput.h>
#include <C4Version.h>
#include <C4Language.h>
#include <C4Player.h>
#include <C4Landscape.h>
#include <C4GraphicsSystem.h>
#include <C4Viewport.h>
#include <C4ScriptHost.h>
#include <C4PlayerList.h>
#include <C4GameControl.h>
#include "game/C4Application.h"
#include "object/C4Def.h"
#include "control/C4GameSave.h"
#include "game/C4Game.h"
#include "gui/C4MessageInput.h"
#include "C4Version.h"
#include "c4group/C4Language.h"
#include "player/C4Player.h"
#include "landscape/C4Landscape.h"
#include "game/C4GraphicsSystem.h"
#include "game/C4Viewport.h"
#include "script/C4ScriptHost.h"
#include "player/C4PlayerList.h"
#include "control/C4GameControl.h"
#include <StdFile.h>
#include <StdRegistry.h>
#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

10
src/editor/C4Console.h
View File

@ -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 <C4Window.h>
#include "platform/C4Window.h"
const int C4CNS_ModePlay = 0,
C4CNS_ModeEdit = 1,

34
src/editor/C4ConsoleCocoa.mm
View File

@ -15,25 +15,25 @@
#include <GL/glew.h>
#include <C4Include.h>
#include <C4Console.h>
#include <C4Application.h>
#include "C4Include.h"
#include "editor/C4Console.h"
#include "game/C4Application.h"
#include <C4GameSave.h>
#include <C4Game.h>
#include <C4MessageInput.h>
#include <C4Version.h>
#include <C4Language.h>
#include <C4Player.h>
#include <C4Landscape.h>
#include "control/C4GameSave.h"
#include "game/C4Game.h"
#include "gui/C4MessageInput.h"
#include "C4Version.h"
#include "c4group/C4Language.h"
#include "player/C4Player.h"
#include "landscape/C4Landscape.h"
#include "landscape/C4Sky.h"
#include <C4GraphicsSystem.h>
#include <C4PlayerList.h>
#include <C4GameControl.h>
#include <C4Texture.h>
#include "game/C4GraphicsSystem.h"
#include "player/C4PlayerList.h"
#include "control/C4GameControl.h"
#include "landscape/C4Texture.h"
#include <StdFile.h>
#include <StdRegistry.h>
#include "platform/StdFile.h"
#include "platform/StdRegistry.h"
#import <Cocoa/Cocoa.h>
#import "C4AppDelegate.h"
@ -454,4 +454,4 @@ bool C4ConsoleGUI::UpdateModeCtrls(int iMode)
}
#define CONSOLEGUICOMMONINCLUDE
#include "C4ConsoleGUICommon.h"
#include "editor/C4ConsoleGUICommon.h"

44
src/editor/C4ConsoleGTK.cpp
View File

@ -17,30 +17,30 @@
* for the above references.
*/
#include <C4Include.h>
#include <C4Console.h>
#include "C4Include.h"
#include "editor/C4Console.h"
#include <C4ConsoleGTKDlg.h>
#include <C4Language.h>
#include <C4Aul.h>
#include <C4Application.h>
#include <C4GameSave.h>
#include <C4Game.h>
#include <C4MessageInput.h>
#include <C4Version.h>
#include <C4Language.h>
#include <C4Object.h>
#include <C4Player.h>
#include <C4Landscape.h>
#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 <C4GraphicsSystem.h>
#include <C4PlayerList.h>
#include <C4GameControl.h>
#include <C4Texture.h>
#include <C4Viewport.h>
#include "game/C4GraphicsSystem.h"
#include "player/C4PlayerList.h"
#include "control/C4GameControl.h"
#include "landscape/C4Texture.h"
#include "game/C4Viewport.h"
#include <StdFile.h>
#include <StdRegistry.h>
#include "platform/StdFile.h"
#include "platform/StdRegistry.h"
#include <gtk/gtk.h>
#ifdef GDK_WINDOWING_X11
@ -1677,4 +1677,4 @@ void C4ToolsDlg::State::OnWindowHide(GtkWidget* widget, gpointer data)
static_cast<C4ToolsDlg::State*>(data)->GetOwner()->Active = false;
}
#include "C4ConsoleGUICommon.h"
#include "editor/C4ConsoleGUICommon.h"

4
src/editor/C4ConsoleGTKDlg.cpp
View File

@ -16,8 +16,8 @@
/* Common window for drawing and property tool dialogs in console mode */
#include <C4Include.h>
#include <C4ConsoleGTKDlg.h>
#include "C4Include.h"
#include "editor/C4ConsoleGTKDlg.h"
#include <gtk/gtk.h>

8
src/editor/C4ConsoleGUI.h
View File

@ -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
{

30
src/editor/C4ConsoleWin32.cpp
View File

@ -17,26 +17,26 @@
* for the above references.
*/
#include <C4Include.h>
#include <C4Console.h>
#include "C4Include.h"
#include "editor/C4Console.h"
#include <C4AppWin32Impl.h>
#include "C4ConsoleGUI.h"
#include <C4DrawGL.h>
#include <C4Landscape.h>
#include <C4Object.h>
#include <C4PlayerList.h>
#include <C4Texture.h>
#include <C4Version.h>
#include "C4Viewport.h"
#include <StdRegistry.h>
#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 <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#include <mmsystem.h>
#include <commdlg.h>
#include "resource.h"
#include "res/resource.h"
#define GetWideLPARAM(c) reinterpret_cast<LPARAM>(static_cast<wchar_t*>(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"

28
src/editor/C4EditCursor.cpp
View File

@ -17,23 +17,23 @@
/* Handles viewport editing in console mode */
#include <C4Include.h>
#include <C4EditCursor.h>
#include "C4Include.h"
#include "editor/C4EditCursor.h"
#include <C4Console.h>
#include <C4Object.h>
#include <C4Application.h>
#include <C4Random.h>
#include <C4MouseControl.h>
#include <C4Landscape.h>
#include <C4Texture.h>
#include <C4GraphicsResource.h>
#include <C4Game.h>
#include <C4GameObjects.h>
#include <C4GameControl.h>
#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

6
src/editor/C4EditCursor.h
View File

@ -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 <vector>
#ifdef USE_GTK

10
src/editor/C4EditorWindowController.mm
View File

@ -15,11 +15,11 @@
#include <GL/glew.h>
#include <C4Include.h>
#include <C4Console.h>
#include <C4Player.h>
#include <C4PlayerList.h>
#include <C4Game.h>
#include "C4Include.h"
#include "editor/C4Console.h"
#include "player/C4Player.h"
#include "player/C4PlayerList.h"
#include "game/C4Game.h"
#import <Cocoa/Cocoa.h>
#import <C4EditorWindowController.h>

10
src/editor/C4ObjectListDlg.cpp
View File

@ -16,11 +16,11 @@
/* A window listing all objects in the game */
#include <C4Include.h>
#include <C4ObjectListDlg.h>
#include <C4Console.h>
#include <C4Object.h>
#include <C4GameObjects.h>
#include "C4Include.h"
#include "editor/C4ObjectListDlg.h"
#include "editor/C4Console.h"
#include "object/C4Object.h"
#include "object/C4GameObjects.h"
#ifdef USE_GTK

2
src/editor/C4ObjectListDlg.h
View File

@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#endif // USE_GTK
#include "C4ObjectList.h"
#include "object/C4ObjectList.h"
class C4ObjectListDlg: public C4ObjectListChangeListener
{

12
src/editor/C4ToolsDlg.cpp
View File

@ -17,12 +17,12 @@
/* Drawing tools dialog for landscape editing in console mode */
#include <C4Include.h>
#include <C4ToolsDlg.h>
#include <C4Console.h>
#include <C4Texture.h>
#include <C4Landscape.h>
#include <C4GameControl.h>
#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()
{

2
src/editor/C4ToolsDlg.h
View File

@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#endif
#include "C4Constants.h"
#include "config/C4Constants.h"
#include "landscape/C4Landscape.h"
const int32_t

12
src/editor/C4ViewportWindow.cpp
View File

@ -17,13 +17,13 @@
/* A viewport to each player */
#include <C4Include.h>
#include <C4ViewportWindow.h>
#include "C4Include.h"
#include "editor/C4ViewportWindow.h"
#include <C4Viewport.h>
#include <C4Console.h>
#include <C4Landscape.h>
#include <C4PlayerList.h>
#include "game/C4Viewport.h"
#include "editor/C4Console.h"
#include "landscape/C4Landscape.h"
#include "player/C4PlayerList.h"
#ifdef USE_GTK
#include <gtk/gtk.h>

2
src/editor/C4ViewportWindow.h
View File

@ -20,7 +20,7 @@
#ifndef INC_C4ViewportWindow
#define INC_C4ViewportWindow
#include <C4Window.h>
#include "platform/C4Window.h"
#ifdef USE_GTK
#include <gtk/gtk.h>

40
src/game/C4Application.cpp
View File

@ -17,29 +17,29 @@
/* Main class to initialize configuration and execute the game */
#include <C4Include.h>
#include <C4Application.h>
#include "C4Include.h"
#include "game/C4Application.h"
#include <C4Version.h>
#include "C4Version.h"
#ifdef _WIN32
#include <C4UpdateDlg.h>
#include "gui/C4UpdateDlg.h"
#endif
#include "C4Game.h"
#include <C4GfxErrorDlg.h>
#include "C4GraphicsSystem.h"
#include "C4GraphicsResource.h"
#include "C4MessageInput.h"
#include <C4FullScreen.h>
#include <C4Language.h>
#include <C4Console.h>
#include <C4Startup.h>
#include <C4Log.h>
#include <C4GamePadCon.h>
#include <C4GameLobby.h>
#include <C4Network2.h>
#include <C4Network2IRC.h>
#include <C4Particles.h>
#include <StdPNG.h>
#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 <getopt.h>

12
src/game/C4Application.h
View File

@ -18,12 +18,12 @@
#ifndef INC_C4Application
#define INC_C4Application
#include <C4Group.h>
#include <C4MusicSystem.h>
#include <C4SoundSystem.h>
#include <C4Components.h>
#include <C4InteractiveThread.h>
#include <C4App.h>
#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;

28
src/game/C4FullScreen.cpp
View File

@ -17,21 +17,21 @@
/* Main class to execute the game fullscreen mode */
#include <C4Include.h>
#include <C4FullScreen.h>
#include "C4Include.h"
#include "game/C4FullScreen.h"
#include <C4Game.h>
#include <C4Application.h>
#include <C4Viewport.h>
#include <C4Language.h>
#include <C4Gui.h>
#include <C4GameDialogs.h>
#include <C4Player.h>
#include <C4GameOverDlg.h>
#include <C4GraphicsSystem.h>
#include <C4MouseControl.h>
#include <C4PlayerList.h>
#include <C4Version.h>
#include "game/C4Game.h"
#include "game/C4Application.h"
#include "game/C4Viewport.h"
#include "c4group/C4Language.h"
#include "gui/C4Gui.h"
#include "gui/C4GameDialogs.h"
#include "player/C4Player.h"
#include "gui/C4GameOverDlg.h"
#include "game/C4GraphicsSystem.h"
#include "gui/C4MouseControl.h"
#include "player/C4PlayerList.h"
#include "C4Version.h"
void C4FullScreen::CharIn(const char * c) { ::pGUI->CharIn(c); }

2
src/game/C4FullScreen.h
View File

@ -20,7 +20,7 @@
#ifndef INC_C4FullScreen
#define INC_C4FullScreen
#include <C4Window.h>
#include "platform/C4Window.h"
bool IsKeyDown(int iKey);

112
src/game/C4Game.cpp
View File

@ -17,65 +17,65 @@
/* Main class to run the game */
#include <C4Include.h>
#include <C4Game.h>
#include "C4Include.h"
#include "game/C4Game.h"
#include <C4AulDebug.h>
#include "script/C4AulDebug.h"
#include "object/C4Def.h"
#include <C4DefList.h>
#include <C4Effect.h>
#include <C4FileMonitor.h>
#include <C4GameSave.h>
#include <C4Record.h>
#include <C4Application.h>
#include <C4Object.h>
#include <C4ObjectInfo.h>
#include <C4Random.h>
#include <C4ObjectCom.h>
#include <C4FullScreen.h>
#include <C4Startup.h>
#include <C4Viewport.h>
#include <C4Command.h>
#include <C4Stat.h>
#include <C4League.h>
#include <C4PlayerInfo.h>
#include <C4LoaderScreen.h>
#include <C4Network2Dialogs.h>
#include <C4Console.h>
#include <C4Network2Stats.h>
#include <C4Log.h>
#include <C4Player.h>
#include <C4GameOverDlg.h>
#include <C4GameParameters.h>
#include <C4ObjectMenu.h>
#include <C4GameLobby.h>
#include <C4ChatDlg.h>
#include <C4PlayerControl.h>
#include <C4MouseControl.h>
#include <C4PXS.h>
#include <C4MessageInput.h>
#include <C4MassMover.h>
#include <C4RankSystem.h>
#include <C4RoundResults.h>
#include <C4GameMessage.h>
#include <C4ScriptGuiWindow.h>
#include <C4Material.h>
#include <C4Network2Reference.h>
#include <C4Weather.h>
#include <C4GraphicsResource.h>
#include <C4GraphicsSystem.h>
#include <C4Texture.h>
#include <C4Landscape.h>
#include "object/C4DefList.h"
#include "script/C4Effect.h"
#include "platform/C4FileMonitor.h"
#include "control/C4GameSave.h"
#include "control/C4Record.h"
#include "game/C4Application.h"
#include "object/C4Object.h"
#include "object/C4ObjectInfo.h"
#include "lib/C4Random.h"
#include "object/C4ObjectCom.h"
#include "game/C4FullScreen.h"
#include "gui/C4Startup.h"
#include "game/C4Viewport.h"
#include "object/C4Command.h"
#include "lib/C4Stat.h"
#include "network/C4League.h"
#include "control/C4PlayerInfo.h"
#include "gui/C4LoaderScreen.h"
#include "network/C4Network2Dialogs.h"
#include "editor/C4Console.h"
#include "network/C4Network2Stats.h"
#include "lib/C4Log.h"
#include "player/C4Player.h"
#include "gui/C4GameOverDlg.h"
#include "control/C4GameParameters.h"
#include "object/C4ObjectMenu.h"
#include "gui/C4GameLobby.h"
#include "gui/C4ChatDlg.h"
#include "control/C4PlayerControl.h"
#include "gui/C4MouseControl.h"
#include "landscape/C4PXS.h"
#include "gui/C4MessageInput.h"
#include "landscape/C4MassMover.h"
#include "player/C4RankSystem.h"
#include "control/C4RoundResults.h"
#include "gui/C4GameMessage.h"
#include "gui/C4ScriptGuiWindow.h"
#include "landscape/C4Material.h"
#include "network/C4Network2Reference.h"
#include "landscape/C4Weather.h"
#include "graphics/C4GraphicsResource.h"
#include "game/C4GraphicsSystem.h"
#include "landscape/C4Texture.h"
#include "landscape/C4Landscape.h"
#include "landscape/C4Sky.h"
#include <C4PlayerList.h>
#include <C4GameObjects.h>
#include <C4GameControl.h>
#include <C4Version.h>
#include <C4AulExec.h>
#include <StdFile.h>
#include <C4MapScript.h>
#include <C4SolidMask.h>
#include <C4FoW.h>
#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 <unordered_map>

12
src/game/C4Game.h
View File

@ -20,12 +20,12 @@
#ifndef INC_C4Game
#define INC_C4Game
#include <C4Scenario.h>
#include <C4PathFinder.h>
#include <C4Extra.h>
#include "C4Scoreboard.h"
#include <C4PlayerControl.h>
#include <C4TransferZone.h>
#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 <memory>

50
src/game/C4GameScript.cpp
View File

@ -17,32 +17,32 @@
/* Functions mapped by C4Script */
#include <C4Include.h>
#include <C4GameScript.h>
#include "C4Include.h"
#include "game/C4GameScript.h"
#include <C4Application.h>
#include <C4AulDefFunc.h>
#include <C4Command.h>
#include <C4DefList.h>
#include <C4Console.h>
#include <C4Game.h>
#include <C4GameObjects.h>
#include <C4GameControl.h>
#include <C4GameMessage.h>
#include <C4GamePadCon.h>
#include <C4GraphicsSystem.h>
#include <C4Log.h>
#include <C4MessageInput.h>
#include <C4ScriptGuiWindow.h>
#include <C4MouseControl.h>
#include <C4Player.h>
#include <C4PlayerList.h>
#include <C4PXS.h>
#include <C4RoundResults.h>
#include <C4Texture.h>
#include <C4Weather.h>
#include <C4Viewport.h>
#include <C4FoW.h>
#include "game/C4Application.h"
#include "script/C4AulDefFunc.h"
#include "object/C4Command.h"
#include "object/C4DefList.h"
#include "editor/C4Console.h"
#include "game/C4Game.h"
#include "object/C4GameObjects.h"
#include "control/C4GameControl.h"
#include "gui/C4GameMessage.h"
#include "platform/C4GamePadCon.h"
#include "game/C4GraphicsSystem.h"
#include "lib/C4Log.h"
#include "gui/C4MessageInput.h"
#include "gui/C4ScriptGuiWindow.h"
#include "gui/C4MouseControl.h"
#include "player/C4Player.h"
#include "player/C4PlayerList.h"
#include "landscape/C4PXS.h"
#include "control/C4RoundResults.h"
#include "landscape/C4Texture.h"
#include "landscape/C4Weather.h"
#include "game/C4Viewport.h"
#include "landscape/fow/C4FoW.h"
#include "landscape/C4Landscape.h"
#include "landscape/C4Sky.h"

2
src/game/C4GameScript.h
View File

@ -20,7 +20,7 @@
#ifndef INC_C4GameScript
#define INC_C4GameScript
#include <C4Value.h>
#include "script/C4Value.h"
// add functions to engine
void InitGameFunctionMap(C4AulScriptEngine *pEngine);

2
src/game/C4GameVersion.h
View File

@ -18,7 +18,7 @@
#define C4GAMEVERSION_H
#include "C4Version.h"
#include "C4InputValidation.h"
#include "lib/C4InputValidation.h"
struct C4GameVersion
{

28
src/game/C4GraphicsSystem.cpp
View File

@ -17,23 +17,23 @@
/* Operates viewports, message board and draws the game */
#include <C4Include.h>
#include <C4GraphicsSystem.h>
#include "C4Include.h"
#include "game/C4GraphicsSystem.h"
#include <C4Viewport.h>
#include <C4Application.h>
#include <C4Console.h>
#include <C4FullScreen.h>
#include <C4Gui.h>
#include <C4LoaderScreen.h>
#include <C4GraphicsResource.h>
#include <C4Landscape.h>
#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 <C4Network2.h>
#include <C4Game.h>
#include <C4GameObjects.h>
#include "network/C4Network2.h"
#include "game/C4Game.h"
#include "object/C4GameObjects.h"
#include <StdPNG.h>
#include "graphics/StdPNG.h"
static const int MAX_BACKGROUND_FPS = 5;

4
src/game/C4GraphicsSystem.h
View File

@ -20,8 +20,8 @@
#ifndef INC_C4GraphicsSystem
#define INC_C4GraphicsSystem
#include <C4MessageBoard.h>
#include <C4UpperBoard.h>
#include "gui/C4MessageBoard.h"
#include "gui/C4UpperBoard.h"
#include <memory>

2
src/game/C4Physics.h
View File

@ -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;

40
src/game/C4Viewport.cpp
View File

@ -17,29 +17,29 @@
/* A viewport to each player */
#include <C4Include.h>
#include <C4Viewport.h>
#include "C4Include.h"
#include "game/C4Viewport.h"
#include <C4ViewportWindow.h>
#include <C4Console.h>
#include "editor/C4ViewportWindow.h"
#include "editor/C4Console.h"
#include "object/C4Def.h"
#include <C4Object.h>
#include <C4FullScreen.h>
#include <C4Stat.h>
#include <C4Player.h>
#include <C4ObjectMenu.h>
#include <C4MouseControl.h>
#include <C4PXS.h>
#include <C4GameMessage.h>
#include <C4ScriptGuiWindow.h>
#include <C4GraphicsResource.h>
#include <C4GraphicsSystem.h>
#include <C4Landscape.h>
#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 <C4PlayerList.h>
#include <C4GameObjects.h>
#include <C4Network2.h>
#include <C4FoWRegion.h>
#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)
{

2
src/game/C4Viewport.h
View File

@ -20,7 +20,7 @@
#ifndef INC_C4Viewport
#define INC_C4Viewport
#include <C4FacetEx.h>
#include "graphics/C4FacetEx.h"
class C4ViewportWindow;
class C4FoWRegion;

12
src/game/ClonkMain.cpp
View File

@ -17,13 +17,13 @@
/* Main program entry point */
#include <C4Include.h>
#include <C4Application.h>
#include "C4Include.h"
#include "game/C4Application.h"
#include <C4Log.h>
#include <C4Game.h>
#include <C4Version.h>
#include "C4Network2.h"
#include "lib/C4Log.h"
#include "game/C4Game.h"
#include "C4Version.h"
#include "network/C4Network2.h"
#ifdef _WIN32
#include <shellapi.h>

4
src/graphics/Bitmap256.cpp
View File

@ -18,8 +18,8 @@
/* A structure for handling 256-color bitmap files */
#include "C4Include.h"
#include <Bitmap256.h>
#include <StdColors.h>
#include "graphics/Bitmap256.h"
#include "lib/StdColors.h"
void C4BMPInfo::Default()
{

2
src/graphics/Bitmap256.h
View File

@ -21,7 +21,7 @@
#define BITMAP256_H_INC
#ifdef _WIN32
#include <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#else
#pragma pack(push,2)
typedef struct tagBITMAPFILEHEADER

22
src/graphics/C4Draw.cpp
View File

@ -17,18 +17,18 @@
/* NewGfx interfaces */
#include "C4Include.h"
#include <C4Draw.h>
#include "graphics/C4Draw.h"
#include "C4App.h"
#include <C4FontLoader.h>
#include <C4Window.h>
#include <C4DrawGL.h>
#include <C4DrawT.h>
#include <C4Markup.h>
#include "C4Rect.h"
#include <C4Config.h>
#include "StdMesh.h"
#include <CSurface8.h>
#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 <stdio.h>

4
src/graphics/C4Draw.h
View File

@ -19,8 +19,8 @@
#ifndef INC_STDDDRAW2
#define INC_STDDDRAW2
#include <C4Surface.h>
#include <StdMeshMaterial.h>
#include "graphics/C4Surface.h"
#include "lib/StdMeshMaterial.h"
// Global Draw access pointer
extern C4Draw *pDraw;

14
src/graphics/C4DrawGL.cpp
View File

@ -17,14 +17,14 @@
/* OpenGL implementation of NewGfx */
#include "C4Include.h"
#include <C4DrawGL.h>
#include "graphics/C4DrawGL.h"
#include <C4Surface.h>
#include <C4Window.h>
#include <C4FoWRegion.h>
#include "C4Rect.h"
#include "C4Config.h"
#include <C4App.h>
#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

6
src/graphics/C4DrawGL.h
View File

@ -21,7 +21,7 @@
#define INC_StdGL
#ifdef _WIN32
#include <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#endif
#include <GL/glew.h>
@ -29,8 +29,8 @@
#ifdef USE_COCOA
#import "ObjectiveCAssociated.h"
#endif
#include <C4Draw.h>
#include <C4Shader.h>
#include "graphics/C4Draw.h"
#include "graphics/C4Shader.h"
class C4Window;

6
src/graphics/C4DrawGLCtx.cpp
View File

@ -17,10 +17,10 @@
/* OpenGL implementation of NewGfx, the context */
#include "C4Include.h"
#include <C4DrawGL.h>
#include "graphics/C4DrawGL.h"
#include <C4Window.h>
#include <C4App.h>
#include "platform/C4Window.h"
#include "platform/C4App.h"
#ifndef USE_CONSOLE

2
src/graphics/C4DrawGLMac.h
View File

@ -14,7 +14,7 @@
*/
#import <Cocoa/Cocoa.h>
#include <C4Window.h>
#include "platform/C4Window.h"
#ifdef USE_COCOA

26
src/graphics/C4DrawGLMac.mm
View File

@ -13,20 +13,20 @@
* for the above references.
*/
#include <C4Include.h>
#include <C4GraphicsSystem.h>
#include <C4MouseControl.h>
#include <C4Gui.h>
#include <C4Game.h>
#include <C4Viewport.h>
#include <C4ViewportWindow.h>
#include <C4Console.h>
#include <C4FullScreen.h>
#include <C4PlayerList.h>
#include <C4Gui.h>
#include <C4Landscape.h>
#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 <C4DrawGL.h>
#include "graphics/C4DrawGL.h"
#import "C4DrawGLMac.h"
#import "C4WindowController.h"

10
src/graphics/C4DrawMeshGL.cpp
View File

@ -17,12 +17,12 @@
/* OpenGL implementation of Mesh Rendering */
#include "C4Include.h"
#include <C4Object.h>
#include <C4DrawGL.h>
#include <C4FoWRegion.h>
#include <SHA1.h>
#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 <locale.h>
#include <stdexcept>

4
src/graphics/C4DrawT.cpp
View File

@ -14,8 +14,8 @@
* for the above references.
*/
#include "C4Include.h"
#include <C4DrawT.h>
#include <StdMeshMaterial.h>
#include "graphics/C4DrawT.h"
#include "lib/StdMeshMaterial.h"
CStdNoGfx::CStdNoGfx()
{

2
src/graphics/C4DrawT.h
View File

@ -18,7 +18,7 @@
#ifndef INC_StdNoGfx
#define INC_StdNoGfx
#include <C4Draw.h>
#include "graphics/C4Draw.h"
class CStdNoGfx : public C4Draw
{

8
src/graphics/C4Facet.cpp
View File

@ -17,11 +17,11 @@
/* A piece of a DirectDraw surface */
#include <C4Include.h>
#include <C4Facet.h>
#include <C4GraphicsResource.h>
#include "C4Include.h"
#include "graphics/C4Facet.h"
#include "graphics/C4GraphicsResource.h"
#include <StdAdaptors.h>
#include "lib/StdAdaptors.h"
#ifdef WITH_GLIB
#include <glib.h>

2
src/graphics/C4Facet.h
View File

@ -20,7 +20,7 @@
#ifndef INC_C4Facet
#define INC_C4Facet
#include <C4Draw.h>
#include "graphics/C4Draw.h"
const int32_t C4FCT_None = 0,

8
src/graphics/C4FacetEx.cpp
View File

@ -17,11 +17,11 @@
/* A facet that can hold its own surface and also target coordinates */
#include <C4Include.h>
#include <C4FacetEx.h>
#include "C4Include.h"
#include "graphics/C4FacetEx.h"
#include <C4Rect.h>
#include <C4Group.h>
#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)
{

4
src/graphics/C4FacetEx.h
View File

@ -20,8 +20,8 @@
#ifndef INC_C4FacetEx
#define INC_C4FacetEx
#include <C4Facet.h>
#include <C4Surface.h>
#include "graphics/C4Facet.h"
#include "graphics/C4Surface.h"
const int C4FCT_Full = -1,
C4FCT_Height = -2,

22
src/graphics/C4FontLoader.cpp
View File

@ -16,24 +16,24 @@
// text drawing facility for C4Draw
#include <C4Include.h>
#include "C4FontLoader.h"
#include "C4Include.h"
#include "graphics/C4FontLoader.h"
#ifndef USE_CONSOLE
#include <C4Components.h>
#include <C4Config.h>
#include <C4Draw.h>
#include <C4Language.h>
#include <C4Log.h>
#include <C4Markup.h>
#include <C4Surface.h>
#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 <stdexcept>
#include <string>
#ifdef _WIN32
#include <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#endif
#include <ft2build.h>

6
src/graphics/C4FontLoader.h
View File

@ -18,9 +18,9 @@
#ifndef INC_STDFONT
#define INC_STDFONT
#include <C4Markup.h>
#include <C4Facet.h>
#include <StdBuf.h>
#include "lib/C4Markup.h"
#include "graphics/C4Facet.h"
#include "lib/StdBuf.h"
#include <stdio.h>
#include <map>

16
src/graphics/C4GraphicsResource.cpp
View File

@ -17,15 +17,15 @@
/* Loads all standard graphics from Graphics.ocg */
#include <C4Include.h>
#include <C4GraphicsResource.h>
#include "C4Include.h"
#include "graphics/C4GraphicsResource.h"
#include <C4DefList.h>
#include <C4FontLoader.h>
#include <C4Log.h>
#include <C4Game.h>
#include <C4Components.h>
#include <C4DrawGL.h>
#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 */

10
src/graphics/C4GraphicsResource.h
View File

@ -20,11 +20,11 @@
#ifndef INC_C4GraphicsResource
#define INC_C4GraphicsResource
#include <C4GroupSet.h>
#include <C4Surface.h>
#include <C4FacetEx.h>
#include <C4Gui.h>
#include <C4ScenarioParameters.h>
#include "c4group/C4GroupSet.h"
#include "graphics/C4Surface.h"
#include "graphics/C4FacetEx.h"
#include "gui/C4Gui.h"
#include "player/C4ScenarioParameters.h"
class C4GraphicsResource
{

4
src/graphics/C4Shader.cpp
View File

@ -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

8
src/graphics/C4Shader.h
View File

@ -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 <C4windowswrapper.h>
#include "platform/C4windowswrapper.h"
#endif
#include <GL/glew.h>

22
src/graphics/C4Surface.cpp
View File

@ -17,18 +17,18 @@
// a wrapper class to DirectDraw surfaces
#include "C4Include.h"
#include <C4Surface.h>
#include "graphics/C4Surface.h"
#include <StdFile.h>
#include <CStdFile.h>
#include "C4App.h"
#include <C4DrawGL.h>
#include <C4Window.h>
#include <StdRegistry.h>
#include <C4Draw.h>
#include <Bitmap256.h>
#include <StdPNG.h>
#include <C4Config.h>
#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"

2
src/graphics/C4Surface.h
View File

@ -18,7 +18,7 @@
#ifndef INC_StdSurface2
#define INC_StdSurface2
#include <C4Rect.h>
#include "lib/C4Rect.h"
#include <list>

12
src/graphics/C4SurfaceLoaders.cpp
View File

@ -17,13 +17,13 @@
/* Extension to C4Surface that handles bitmaps in C4Group files */
#include <C4Include.h>
#include <C4Surface.h>
#include "C4Include.h"
#include "graphics/C4Surface.h"
#include <C4GroupSet.h>
#include <C4Group.h>
#include <C4Log.h>
#include <StdPNG.h>
#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)

8
src/graphics/CSurface8.cpp
View File

@ -17,11 +17,11 @@
// a wrapper class to DirectDraw surfaces
#include "C4Include.h"
#include <CSurface8.h>
#include "graphics/CSurface8.h"
#include <Bitmap256.h>
#include <CStdFile.h>
#include <StdColors.h>
#include "graphics/Bitmap256.h"
#include "c4group/CStdFile.h"
#include "lib/StdColors.h"
CSurface8::CSurface8()
{

6
src/graphics/StdPNG.cpp
View File

@ -16,10 +16,10 @@
// png file reading functionality
#include "C4Include.h"
#include <StdPNG.h>
#include "graphics/StdPNG.h"
#include <StdColors.h>
#include <StdScheduler.h>
#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)

12
src/gui/C4ChatDlg.cpp
View File

@ -16,13 +16,13 @@
// IRC client dialog
#include "C4Include.h"
#include "C4ChatDlg.h"
#include "gui/C4ChatDlg.h"
#include <C4Application.h>
#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 */

4
src/gui/C4ChatDlg.h
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More