diff --git a/CMakeLists.txt b/CMakeLists.txt index fc94adbd1..e030bbe23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,15 +152,7 @@ endif() # OC_SYSTEM_SOURCES: Sources for OpenClonk that are only needed by specific # configurations. set(OC_CLONK_SOURCES - src/C4Application.cpp - src/C4Application.h - src/C4FullScreen.cpp - src/C4FullScreen.h - src/C4Game.cpp - src/C4Game.h src/C4Globals.cpp - src/C4GraphicsSystem.cpp - src/C4GraphicsSystem.h src/c4group/C4ComponentHost.cpp src/c4group/C4ComponentHost.h src/c4group/C4Components.h @@ -186,8 +178,6 @@ set(OC_CLONK_SOURCES src/config/C4Constants.h src/config/C4Reloc.cpp src/config/C4Reloc.h - src/config/C4SecurityCertificates.cpp - src/config/C4SecurityCertificates.h src/control/C4Control.cpp src/control/C4Control.h src/control/C4GameControl.cpp @@ -211,102 +201,62 @@ set(OC_CLONK_SOURCES src/editor/C4ConsoleGUICommon.h src/editor/C4ConsoleGUI.h src/editor/C4Console.h - src/editor/C4DevmodeDlg.cpp - src/editor/C4DevmodeDlg.h src/editor/C4EditCursor.cpp src/editor/C4EditCursor.h src/editor/C4ObjectListDlg.cpp src/editor/C4ObjectListDlg.h src/editor/C4ToolsDlg.cpp src/editor/C4ToolsDlg.h + src/editor/C4ViewportWindow.cpp + src/editor/C4ViewportWindow.h + src/game/C4Application.cpp + src/game/C4Application.h + src/game/C4FullScreen.cpp + src/game/C4FullScreen.h + src/game/C4Game.cpp + src/game/C4Game.h src/game/C4GameVersion.h + src/game/C4GraphicsSystem.cpp + src/game/C4GraphicsSystem.h src/game/C4Physics.h - src/game/landscape/C4Landscape.cpp - src/game/landscape/C4Landscape.h - src/game/landscape/C4LandscapeRenderClassic.cpp - src/game/landscape/C4LandscapeRender.cpp - src/game/landscape/C4LandscapeRender.h - src/game/landscape/C4Map.cpp - src/game/landscape/C4MapCreatorS2.cpp - src/game/landscape/C4MapCreatorS2.h - src/game/landscape/C4Map.h - src/game/landscape/C4MassMover.cpp - src/game/landscape/C4MassMover.h - src/game/landscape/C4Material.cpp - src/game/landscape/C4Material.h - src/game/landscape/C4MaterialList.cpp - src/game/landscape/C4MaterialList.h - src/game/landscape/C4Particles.cpp - src/game/landscape/C4Particles.h - src/game/landscape/C4PathFinder.cpp - src/game/landscape/C4PathFinder.h - src/game/landscape/C4PXS.cpp - src/game/landscape/C4PXS.h - src/game/landscape/C4Region.cpp - src/game/landscape/C4Region.h - src/game/landscape/C4Scenario.cpp - src/game/landscape/C4Scenario.h - src/game/landscape/C4Sky.cpp - src/game/landscape/C4Sky.h - src/game/landscape/C4SolidMask.cpp - src/game/landscape/C4SolidMask.h - src/game/landscape/C4Texture.cpp - src/game/landscape/C4Texture.h - src/game/landscape/C4Weather.cpp - src/game/landscape/C4Weather.h - src/game/object/C4Action.cpp - src/game/object/C4Command.cpp - src/game/object/C4Command.h - src/game/object/C4Def.cpp - src/game/object/C4DefGraphics.cpp - src/game/object/C4DefGraphics.h - src/game/object/C4Def.h - src/game/object/C4DefList.cpp - src/game/object/C4DefList.h - src/game/object/C4GameObjects.cpp - src/game/object/C4GameObjects.h - src/game/object/C4Id.cpp - src/game/object/C4Id.h - src/game/object/C4IDList.cpp - src/game/object/C4IDList.h - src/game/object/C4InfoCore.cpp - src/game/object/C4InfoCore.h - src/game/object/C4MeshAnimation.cpp - src/game/object/C4MeshAnimation.h - src/game/object/C4Movement.cpp - src/game/object/C4ObjectCom.cpp - src/game/object/C4ObjectCom.h - src/game/object/C4Object.cpp - src/game/object/C4Object.h - src/game/object/C4ObjectInfo.cpp - src/game/object/C4ObjectInfo.h - src/game/object/C4ObjectInfoList.cpp - src/game/object/C4ObjectInfoList.h - src/game/object/C4ObjectList.cpp - src/game/object/C4ObjectList.h - src/game/object/C4ObjectMenu.cpp - src/game/object/C4ObjectMenu.h - src/game/object/C4ObjectPtr.cpp - src/game/object/C4ObjectPtr.h - src/game/object/C4ObjectScript.cpp - src/game/object/C4Sector.cpp - src/game/object/C4Sector.h - src/game/object/C4Shape.cpp - src/game/object/C4Shape.h - src/game/player/C4Player.cpp - src/game/player/C4Player.h - src/game/player/C4PlayerList.cpp - src/game/player/C4PlayerList.h - src/game/player/C4RankSystem.cpp - src/game/player/C4RankSystem.h - src/game/script/C4Effect.cpp - src/game/script/C4Effects.h - src/game/script/C4FindObject.cpp - src/game/script/C4FindObject.h - src/game/script/C4GameScript.cpp - src/game/script/C4Script.h - src/game/script/C4TransferZone.cpp - src/game/script/C4TransferZone.h + src/game/C4Viewport.cpp + src/game/C4Viewport.h + src/gamescript/C4Effect.cpp + src/gamescript/C4Effect.h + src/gamescript/C4FindObject.cpp + src/gamescript/C4FindObject.h + src/gamescript/C4GameScript.cpp + src/gamescript/C4Script.h + src/gamescript/C4TransferZone.cpp + src/gamescript/C4TransferZone.h + src/graphics/Bitmap256.cpp + src/graphics/Bitmap256.h + src/graphics/C4Draw.cpp + src/graphics/C4DrawD3D.cpp + src/graphics/C4DrawD3D.h + src/graphics/C4DrawD3DShader.cpp + src/graphics/C4DrawD3DShader.h + src/graphics/C4DrawGL.cpp + src/graphics/C4DrawGLCtx.cpp + src/graphics/C4DrawGL.h + src/graphics/C4DrawT.cpp + src/graphics/C4DrawT.h + src/graphics/C4Draw.h + src/graphics/C4Facet.cpp + src/graphics/C4FacetEx.cpp + src/graphics/C4FacetEx.h + src/graphics/C4Facet.h + src/graphics/C4Fonts.cpp + src/graphics/C4Fonts.h + src/graphics/C4GraphicsResource.cpp + src/graphics/C4GraphicsResource.h + src/graphics/C4Surface.cpp + src/graphics/C4Surface.h + src/graphics/C4SurfaceLoaders.cpp + src/graphics/CSurface8.cpp + src/graphics/CSurface8.h + src/graphics/StdPNG.cpp + src/graphics/StdPNG.h src/gui/C4ChatDlg.cpp src/gui/C4ChatDlg.h src/gui/C4DownloadDlg.cpp @@ -373,9 +323,39 @@ set(OC_CLONK_SOURCES src/gui/C4StartupScenSelDlg.h src/gui/C4UpperBoard.cpp src/gui/C4UpperBoard.h - src/gui/C4UserMessages.h - src/gui/C4Viewport.cpp - src/gui/C4Viewport.h + src/landscape/C4Landscape.cpp + src/landscape/C4Landscape.h + src/landscape/C4LandscapeRenderClassic.cpp + src/landscape/C4LandscapeRender.cpp + src/landscape/C4LandscapeRender.h + src/landscape/C4Map.cpp + src/landscape/C4MapCreatorS2.cpp + src/landscape/C4MapCreatorS2.h + src/landscape/C4Map.h + src/landscape/C4MassMover.cpp + src/landscape/C4MassMover.h + src/landscape/C4Material.cpp + src/landscape/C4Material.h + src/landscape/C4MaterialList.cpp + src/landscape/C4MaterialList.h + src/landscape/C4Particles.cpp + src/landscape/C4Particles.h + src/landscape/C4PathFinder.cpp + src/landscape/C4PathFinder.h + src/landscape/C4PXS.cpp + src/landscape/C4PXS.h + src/landscape/C4Region.cpp + src/landscape/C4Region.h + src/landscape/C4Scenario.cpp + src/landscape/C4Scenario.h + src/landscape/C4Sky.cpp + src/landscape/C4Sky.h + src/landscape/C4SolidMask.cpp + src/landscape/C4SolidMask.h + src/landscape/C4Texture.cpp + src/landscape/C4Texture.h + src/landscape/C4Weather.cpp + src/landscape/C4Weather.h src/lib/C4InputValidation.cpp src/lib/C4InputValidation.h src/lib/C4LogBuf.cpp @@ -426,15 +406,6 @@ set(OC_CLONK_SOURCES src/lib/StdResStr2.cpp src/lib/StdResStr2.h src/lib/StdResStr.h - src/lib/texture/C4Facet.cpp - src/lib/texture/C4FacetEx.cpp - src/lib/texture/C4FacetEx.h - src/lib/texture/C4Facet.h - src/lib/texture/C4GraphicsResource.cpp - src/lib/texture/C4GraphicsResource.h - src/lib/texture/C4SurfaceLoaders.cpp - src/lib/texture/StdPNG.cpp - src/lib/texture/StdPNG.h src/network/C4Client.cpp src/network/C4Client.h src/network/C4GameControlNetwork.cpp @@ -469,15 +440,51 @@ set(OC_CLONK_SOURCES src/network/C4Network2UPnP.h src/network/C4Packet2.cpp src/network/C4PacketBase.h - src/platform/Bitmap256.cpp - src/platform/Bitmap256.h + src/object/C4Action.cpp + src/object/C4Command.cpp + src/object/C4Command.h + src/object/C4Def.cpp + src/object/C4DefGraphics.cpp + src/object/C4DefGraphics.h + src/object/C4Def.h + src/object/C4DefList.cpp + src/object/C4DefList.h + src/object/C4GameObjects.cpp + src/object/C4GameObjects.h + src/object/C4Id.cpp + src/object/C4Id.h + src/object/C4IDList.cpp + src/object/C4IDList.h + src/object/C4InfoCore.cpp + src/object/C4InfoCore.h + src/object/C4MeshAnimation.cpp + src/object/C4MeshAnimation.h + src/object/C4Movement.cpp + src/object/C4ObjectCom.cpp + src/object/C4ObjectCom.h + src/object/C4Object.cpp + src/object/C4Object.h + src/object/C4ObjectInfo.cpp + src/object/C4ObjectInfo.h + src/object/C4ObjectInfoList.cpp + src/object/C4ObjectInfoList.h + src/object/C4ObjectList.cpp + src/object/C4ObjectList.h + src/object/C4ObjectMenu.cpp + src/object/C4ObjectMenu.h + src/object/C4ObjectPtr.cpp + src/object/C4ObjectPtr.h + src/object/C4ObjectScript.cpp + src/object/C4Sector.cpp + src/object/C4Sector.h + src/object/C4Shape.cpp + src/object/C4Shape.h src/platform/C4App.cpp src/platform/C4App.h src/platform/C4AppT.cpp + src/platform/C4AppWin32Impl.h src/platform/C4FileMonitor.cpp src/platform/C4FileMonitor.h - src/platform/C4Fonts.cpp - src/platform/C4Fonts.h src/platform/C4GamePadCon.cpp src/platform/C4GamePadCon.h src/platform/C4MusicFile.cpp @@ -488,43 +495,32 @@ set(OC_CLONK_SOURCES src/platform/C4SoundLoaders.h src/platform/C4SoundSystem.cpp src/platform/C4SoundSystem.h - src/platform/C4Surface.cpp - src/platform/C4Surface.h src/platform/C4Video.cpp src/platform/C4Video.h src/platform/C4VideoPlayback.cpp src/platform/C4VideoPlayback.h - src/platform/C4ViewportWindow.cpp - src/platform/C4ViewportWindow.h src/platform/C4Window.h src/platform/C4windowswrapper.h src/platform/GetTime.cpp src/platform/PlatformAbstraction.cpp src/platform/PlatformAbstraction.h - src/platform/StdD3D.cpp - src/platform/StdD3D.h - src/platform/StdD3DShader.cpp - src/platform/StdD3DShader.h - src/platform/StdDDraw2.cpp - src/platform/StdDDraw2.h src/platform/StdFile.cpp src/platform/StdFile.h src/platform/StdFont.cpp src/platform/StdFont.h - src/platform/StdGL.cpp - src/platform/StdGLCtx.cpp - src/platform/StdGL.h - src/platform/StdNoGfx.cpp - src/platform/StdNoGfx.h src/platform/StdRegistry.cpp src/platform/StdRegistry.h src/platform/StdScheduler.cpp src/platform/StdScheduler.h - src/platform/StdSurface8.cpp - src/platform/StdSurface8.h src/platform/StdSync.h src/platform/StdVideo.cpp src/platform/StdVideo.h + src/player/C4Player.cpp + src/player/C4Player.h + src/player/C4PlayerList.cpp + src/player/C4PlayerList.h + src/player/C4RankSystem.cpp + src/player/C4RankSystem.h src/script/C4Aul.cpp src/script/C4AulDebug.cpp src/script/C4AulDebug.h @@ -548,8 +544,8 @@ set(OC_CLONK_SOURCES src/script/C4Value.h src/script/C4ValueMap.cpp src/script/C4ValueMap.h - src/zlib/gzio.h src/zlib/gzio.c + src/zlib/gzio.h src/zlib/zutil.h thirdparty/timsort/sort.h ) @@ -565,7 +561,7 @@ if(APPLE) ) else() list(APPEND OC_SYSTEM_SOURCES - src/C4WinMain.cpp + src/game/ClonkMain.cpp ) endif() if(WIN32) @@ -620,6 +616,8 @@ if(USE_GTK) list(APPEND OC_SYSTEM_SOURCES src/editor/C4ConsoleGTK.cpp + src/editor/C4ConsoleGTKDlg.cpp + src/editor/C4ConsoleGTKDlg.h src/platform/C4AppGTK.cpp src/platform/C4AppGTKImpl.h src/platform/C4WindowGTK.cpp @@ -663,13 +661,13 @@ if(PROJECT_FOLDERS) source_group("Platform abstraction" src/platform/.*) source_group("Utility" src/lib/.*) source_group("C4Group" src/c4group/.*) - source_group("Texture" src/lib/texture/.*) + source_group("Graphics" src/graphics/.*) source_group("GUI" src/gui/.*) source_group("Network" src/network/.*) - source_group("Object" src/game/object/.*) - source_group("Landscape" src/game/landscape/.*) - source_group("Player" src/game/player/.*) - source_group("Script" REGULAR_EXPRESSION .*/script/.*) + source_group("Object" src/object/.*) + source_group("Landscape" src/landscape/.*) + source_group("Player" src/player/.*) + source_group("Script" REGULAR_EXPRESSION .*script/.*) source_group("Config" src/config/.*) source_group("Control" src/control/.*) source_group("Editing" src/editor/.*) @@ -679,20 +677,20 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/c4group - ${CMAKE_CURRENT_SOURCE_DIR}/src/network - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib - ${CMAKE_CURRENT_SOURCE_DIR}/src/platform ${CMAKE_CURRENT_SOURCE_DIR}/src/config - ${CMAKE_CURRENT_SOURCE_DIR}/src/res ${CMAKE_CURRENT_SOURCE_DIR}/src/control - ${CMAKE_CURRENT_SOURCE_DIR}/src/gui ${CMAKE_CURRENT_SOURCE_DIR}/src/editor - ${CMAKE_CURRENT_SOURCE_DIR}/src/game/landscape - ${CMAKE_CURRENT_SOURCE_DIR}/src/game/player - ${CMAKE_CURRENT_SOURCE_DIR}/src/game/script ${CMAKE_CURRENT_SOURCE_DIR}/src/game - ${CMAKE_CURRENT_SOURCE_DIR}/src/game/object - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/texture + ${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/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 ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty ) @@ -901,10 +899,9 @@ add_executable(clonk WIN32 MACOSX_BUNDLE ) add_executable(c4group - src/c4group/c4group_ng.cpp + src/c4group/C4GroupMain.cpp src/c4group/C4Group.cpp src/lib/C4InputValidation.cpp - src/config/C4SecurityCertificates.cpp src/c4group/C4Update.cpp src/lib/Standard.cpp src/c4group/CStdFile.cpp @@ -955,7 +952,6 @@ add_executable(c4script src/platform/StdFile.h src/lib/C4Real.cpp src/lib/C4Random.cpp - src/script/shell.cpp src/script/C4Aul.cpp src/script/C4AulExec.cpp src/script/C4AulLink.cpp @@ -963,11 +959,12 @@ add_executable(c4script src/script/C4StringTable.cpp src/script/C4PropList.cpp src/script/C4ScriptHost.cpp + src/script/C4ScriptMain.cpp src/script/C4ScriptStandalone.cpp src/script/C4ValueArray.cpp src/script/C4Value.cpp src/script/C4ValueMap.cpp - src/game/object/C4Id.cpp + src/object/C4Id.cpp src/script/C4Script.cpp src/c4group/C4GroupSet.cpp src/c4group/C4ComponentHost.cpp diff --git a/Makefile.am b/Makefile.am index 2c9422e76..b6e46407a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,29 +42,23 @@ AM_CPPFLAGS = \ -I$(builddir) \ -I$(srcdir)/src \ -I$(srcdir)/src/c4group \ --I$(srcdir)/src/network \ --I$(srcdir)/src/lib \ --I$(srcdir)/src/platform \ -I$(srcdir)/src/config \ --I$(srcdir)/src/res \ -I$(srcdir)/src/control \ --I$(srcdir)/src/gui \ -I$(srcdir)/src/editor \ --I$(srcdir)/src/game/landscape \ --I$(srcdir)/src/game/player \ --I$(srcdir)/src/game/script \ -I$(srcdir)/src/game \ --I$(srcdir)/src/game/object \ --I$(srcdir)/src/lib/texture \ +-I$(srcdir)/src/gamescript \ +-I$(srcdir)/src/graphics \ +-I$(srcdir)/src/gui \ +-I$(srcdir)/src/landscape \ +-I$(srcdir)/src/lib \ +-I$(srcdir)/src/network \ +-I$(srcdir)/src/object \ +-I$(srcdir)/src/platform \ +-I$(srcdir)/src/player \ +-I$(srcdir)/src/res \ -I$(srcdir)/src/script \ -I$(srcdir)/thirdparty \ -$(GLEW_CFLAGS) \ -$(GTK_CFLAGS) \ -$(OPENAL_CFLAGS) \ -$(FREETYPE_CFLAGS) \ -$(SDL_CFLAGS) \ -$(BOOST_CPPFLAGS) \ -$(LIBUPNP_CFLAGS) +$(BOOST_CPPFLAGS) ##BUILT_SOURCES = hgrevision.h ##hgrevision.h: $(srcdir)/.hg/dirstate @@ -125,8 +119,6 @@ src/c4group/C4Update.cpp \ src/c4group/C4Update.h \ src/c4group/CStdFile.cpp \ src/c4group/CStdFile.h \ -src/config/C4SecurityCertificates.cpp \ -src/config/C4SecurityCertificates.h \ src/lib/C4InputValidation.cpp \ src/lib/C4InputValidation.h \ src/lib/SHA1.h \ @@ -153,15 +145,7 @@ src/zlib/gzio.h \ src/zlib/zutil.h clonk_SOURCES = \ -src/C4Application.cpp \ -src/C4Application.h \ -src/C4FullScreen.cpp \ -src/C4FullScreen.h \ -src/C4Game.cpp \ -src/C4Game.h \ src/C4Globals.cpp \ -src/C4GraphicsSystem.cpp \ -src/C4GraphicsSystem.h \ src/c4group/C4ComponentHost.cpp \ src/c4group/C4ComponentHost.h \ src/c4group/C4Components.h \ @@ -176,7 +160,6 @@ src/c4group/C4Language.h \ src/C4Include.h \ src/C4Prototypes.h \ src/C4Version.h.in \ -src/C4WinMain.cpp \ src/config/C4Config.cpp \ src/config/C4Config.h \ src/config/C4Constants.h \ @@ -205,102 +188,63 @@ src/editor/C4Console.cpp \ src/editor/C4ConsoleGUICommon.h \ src/editor/C4ConsoleGUI.h \ src/editor/C4Console.h \ -src/editor/C4DevmodeDlg.cpp \ -src/editor/C4DevmodeDlg.h \ src/editor/C4EditCursor.cpp \ src/editor/C4EditCursor.h \ src/editor/C4ObjectListDlg.cpp \ src/editor/C4ObjectListDlg.h \ src/editor/C4ToolsDlg.cpp \ src/editor/C4ToolsDlg.h \ +src/editor/C4ViewportWindow.cpp \ +src/editor/C4ViewportWindow.h \ +src/game/C4Application.cpp \ +src/game/C4Application.h \ +src/game/C4FullScreen.cpp \ +src/game/C4FullScreen.h \ +src/game/C4Game.cpp \ +src/game/C4Game.h \ src/game/C4GameVersion.h \ +src/game/C4GraphicsSystem.cpp \ +src/game/C4GraphicsSystem.h \ src/game/C4Physics.h \ -src/game/landscape/C4Landscape.cpp \ -src/game/landscape/C4Landscape.h \ -src/game/landscape/C4LandscapeRenderClassic.cpp \ -src/game/landscape/C4LandscapeRender.cpp \ -src/game/landscape/C4LandscapeRender.h \ -src/game/landscape/C4Map.cpp \ -src/game/landscape/C4MapCreatorS2.cpp \ -src/game/landscape/C4MapCreatorS2.h \ -src/game/landscape/C4Map.h \ -src/game/landscape/C4MassMover.cpp \ -src/game/landscape/C4MassMover.h \ -src/game/landscape/C4Material.cpp \ -src/game/landscape/C4Material.h \ -src/game/landscape/C4MaterialList.cpp \ -src/game/landscape/C4MaterialList.h \ -src/game/landscape/C4Particles.cpp \ -src/game/landscape/C4Particles.h \ -src/game/landscape/C4PathFinder.cpp \ -src/game/landscape/C4PathFinder.h \ -src/game/landscape/C4PXS.cpp \ -src/game/landscape/C4PXS.h \ -src/game/landscape/C4Region.cpp \ -src/game/landscape/C4Region.h \ -src/game/landscape/C4Scenario.cpp \ -src/game/landscape/C4Scenario.h \ -src/game/landscape/C4Sky.cpp \ -src/game/landscape/C4Sky.h \ -src/game/landscape/C4SolidMask.cpp \ -src/game/landscape/C4SolidMask.h \ -src/game/landscape/C4Texture.cpp \ -src/game/landscape/C4Texture.h \ -src/game/landscape/C4Weather.cpp \ -src/game/landscape/C4Weather.h \ -src/game/object/C4Action.cpp \ -src/game/object/C4Command.cpp \ -src/game/object/C4Command.h \ -src/game/object/C4Def.cpp \ -src/game/object/C4DefGraphics.cpp \ -src/game/object/C4DefGraphics.h \ -src/game/object/C4Def.h \ -src/game/object/C4DefList.cpp \ -src/game/object/C4DefList.h \ -src/game/object/C4GameObjects.cpp \ -src/game/object/C4GameObjects.h \ -src/game/object/C4Id.cpp \ -src/game/object/C4Id.h \ -src/game/object/C4IDList.cpp \ -src/game/object/C4IDList.h \ -src/game/object/C4InfoCore.cpp \ -src/game/object/C4InfoCore.h \ -src/game/object/C4MeshAnimation.cpp \ -src/game/object/C4MeshAnimation.h \ -src/game/object/C4Movement.cpp \ -src/game/object/C4ObjectCom.cpp \ -src/game/object/C4ObjectCom.h \ -src/game/object/C4Object.cpp \ -src/game/object/C4Object.h \ -src/game/object/C4ObjectInfo.cpp \ -src/game/object/C4ObjectInfo.h \ -src/game/object/C4ObjectInfoList.cpp \ -src/game/object/C4ObjectInfoList.h \ -src/game/object/C4ObjectList.cpp \ -src/game/object/C4ObjectList.h \ -src/game/object/C4ObjectMenu.cpp \ -src/game/object/C4ObjectMenu.h \ -src/game/object/C4ObjectPtr.cpp \ -src/game/object/C4ObjectPtr.h \ -src/game/object/C4ObjectScript.cpp \ -src/game/object/C4Sector.cpp \ -src/game/object/C4Sector.h \ -src/game/object/C4Shape.cpp \ -src/game/object/C4Shape.h \ -src/game/player/C4Player.cpp \ -src/game/player/C4Player.h \ -src/game/player/C4PlayerList.cpp \ -src/game/player/C4PlayerList.h \ -src/game/player/C4RankSystem.cpp \ -src/game/player/C4RankSystem.h \ -src/game/script/C4Effect.cpp \ -src/game/script/C4Effects.h \ -src/game/script/C4FindObject.cpp \ -src/game/script/C4FindObject.h \ -src/game/script/C4GameScript.cpp \ -src/game/script/C4Script.h \ -src/game/script/C4TransferZone.cpp \ -src/game/script/C4TransferZone.h \ +src/game/C4Viewport.cpp \ +src/game/C4Viewport.h \ +src/game/ClonkMain.cpp \ +src/gamescript/C4Effect.cpp \ +src/gamescript/C4Effect.h \ +src/gamescript/C4FindObject.cpp \ +src/gamescript/C4FindObject.h \ +src/gamescript/C4GameScript.cpp \ +src/gamescript/C4Script.h \ +src/gamescript/C4TransferZone.cpp \ +src/gamescript/C4TransferZone.h \ +src/graphics/Bitmap256.cpp \ +src/graphics/Bitmap256.h \ +src/graphics/C4Draw.cpp \ +src/graphics/C4DrawD3D.cpp \ +src/graphics/C4DrawD3D.h \ +src/graphics/C4DrawD3DShader.cpp \ +src/graphics/C4DrawD3DShader.h \ +src/graphics/C4DrawGL.cpp \ +src/graphics/C4DrawGLCtx.cpp \ +src/graphics/C4DrawGL.h \ +src/graphics/C4DrawT.cpp \ +src/graphics/C4DrawT.h \ +src/graphics/C4Draw.h \ +src/graphics/C4Facet.cpp \ +src/graphics/C4FacetEx.cpp \ +src/graphics/C4FacetEx.h \ +src/graphics/C4Facet.h \ +src/graphics/C4Fonts.cpp \ +src/graphics/C4Fonts.h \ +src/graphics/C4GraphicsResource.cpp \ +src/graphics/C4GraphicsResource.h \ +src/graphics/C4Surface.cpp \ +src/graphics/C4Surface.h \ +src/graphics/C4SurfaceLoaders.cpp \ +src/graphics/CSurface8.cpp \ +src/graphics/CSurface8.h \ +src/graphics/StdPNG.cpp \ +src/graphics/StdPNG.h \ src/gui/C4ChatDlg.cpp \ src/gui/C4ChatDlg.h \ src/gui/C4DownloadDlg.cpp \ @@ -365,13 +309,41 @@ src/gui/C4StartupPlrSelDlg.cpp \ src/gui/C4StartupPlrSelDlg.h \ src/gui/C4StartupScenSelDlg.cpp \ src/gui/C4StartupScenSelDlg.h \ -src/gui/C4UpdateDlg.cpp \ -src/gui/C4UpdateDlg.h \ src/gui/C4UpperBoard.cpp \ src/gui/C4UpperBoard.h \ -src/gui/C4UserMessages.h \ -src/gui/C4Viewport.cpp \ -src/gui/C4Viewport.h \ +src/landscape/C4Landscape.cpp \ +src/landscape/C4Landscape.h \ +src/landscape/C4LandscapeRenderClassic.cpp \ +src/landscape/C4LandscapeRender.cpp \ +src/landscape/C4LandscapeRender.h \ +src/landscape/C4Map.cpp \ +src/landscape/C4MapCreatorS2.cpp \ +src/landscape/C4MapCreatorS2.h \ +src/landscape/C4Map.h \ +src/landscape/C4MassMover.cpp \ +src/landscape/C4MassMover.h \ +src/landscape/C4Material.cpp \ +src/landscape/C4Material.h \ +src/landscape/C4MaterialList.cpp \ +src/landscape/C4MaterialList.h \ +src/landscape/C4Particles.cpp \ +src/landscape/C4Particles.h \ +src/landscape/C4PathFinder.cpp \ +src/landscape/C4PathFinder.h \ +src/landscape/C4PXS.cpp \ +src/landscape/C4PXS.h \ +src/landscape/C4Region.cpp \ +src/landscape/C4Region.h \ +src/landscape/C4Scenario.cpp \ +src/landscape/C4Scenario.h \ +src/landscape/C4Sky.cpp \ +src/landscape/C4Sky.h \ +src/landscape/C4SolidMask.cpp \ +src/landscape/C4SolidMask.h \ +src/landscape/C4Texture.cpp \ +src/landscape/C4Texture.h \ +src/landscape/C4Weather.cpp \ +src/landscape/C4Weather.h \ src/lib/C4LogBuf.cpp \ src/lib/C4LogBuf.h \ src/lib/C4Log.cpp \ @@ -409,15 +381,6 @@ src/lib/StdMeshMath.h \ src/lib/StdMeshUpdate.cpp \ src/lib/StdMeshUpdate.h \ src/lib/StdResStr.h \ -src/lib/texture/C4Facet.cpp \ -src/lib/texture/C4FacetEx.cpp \ -src/lib/texture/C4FacetEx.h \ -src/lib/texture/C4Facet.h \ -src/lib/texture/C4GraphicsResource.cpp \ -src/lib/texture/C4GraphicsResource.h \ -src/lib/texture/C4SurfaceLoaders.cpp \ -src/lib/texture/StdPNG.cpp \ -src/lib/texture/StdPNG.h \ src/network/C4Client.cpp \ src/network/C4Client.h \ src/network/C4GameControlNetwork.cpp \ @@ -451,15 +414,51 @@ src/network/C4Network2Stats.h \ src/network/C4Network2UPnP.h \ src/network/C4Packet2.cpp \ src/network/C4PacketBase.h \ -src/platform/Bitmap256.cpp \ -src/platform/Bitmap256.h \ +src/object/C4Action.cpp \ +src/object/C4Command.cpp \ +src/object/C4Command.h \ +src/object/C4Def.cpp \ +src/object/C4DefGraphics.cpp \ +src/object/C4DefGraphics.h \ +src/object/C4Def.h \ +src/object/C4DefList.cpp \ +src/object/C4DefList.h \ +src/object/C4GameObjects.cpp \ +src/object/C4GameObjects.h \ +src/object/C4Id.cpp \ +src/object/C4Id.h \ +src/object/C4IDList.cpp \ +src/object/C4IDList.h \ +src/object/C4InfoCore.cpp \ +src/object/C4InfoCore.h \ +src/object/C4MeshAnimation.cpp \ +src/object/C4MeshAnimation.h \ +src/object/C4Movement.cpp \ +src/object/C4ObjectCom.cpp \ +src/object/C4ObjectCom.h \ +src/object/C4Object.cpp \ +src/object/C4Object.h \ +src/object/C4ObjectInfo.cpp \ +src/object/C4ObjectInfo.h \ +src/object/C4ObjectInfoList.cpp \ +src/object/C4ObjectInfoList.h \ +src/object/C4ObjectList.cpp \ +src/object/C4ObjectList.h \ +src/object/C4ObjectMenu.cpp \ +src/object/C4ObjectMenu.h \ +src/object/C4ObjectPtr.cpp \ +src/object/C4ObjectPtr.h \ +src/object/C4ObjectScript.cpp \ +src/object/C4Sector.cpp \ +src/object/C4Sector.h \ +src/object/C4Shape.cpp \ +src/object/C4Shape.h \ src/platform/C4App.cpp \ src/platform/C4App.h \ src/platform/C4AppT.cpp \ +src/platform/C4AppWin32Impl.h \ src/platform/C4FileMonitor.cpp \ src/platform/C4FileMonitor.h \ -src/platform/C4Fonts.cpp \ -src/platform/C4Fonts.h \ src/platform/C4GamePadCon.cpp \ src/platform/C4GamePadCon.h \ src/platform/C4MusicFile.cpp \ @@ -470,36 +469,25 @@ src/platform/C4SoundLoaders.cpp \ src/platform/C4SoundLoaders.h \ src/platform/C4SoundSystem.cpp \ src/platform/C4SoundSystem.h \ -src/platform/C4Surface.cpp \ -src/platform/C4Surface.h \ src/platform/C4Video.cpp \ src/platform/C4Video.h \ src/platform/C4VideoPlayback.cpp \ src/platform/C4VideoPlayback.h \ -src/platform/C4ViewportWindow.cpp \ -src/platform/C4ViewportWindow.h \ src/platform/C4Window.h \ src/platform/C4windowswrapper.h \ src/platform/PlatformAbstraction.cpp \ src/platform/PlatformAbstraction.h \ -src/platform/StdD3D.cpp \ -src/platform/StdD3D.h \ -src/platform/StdD3DShader.cpp \ -src/platform/StdD3DShader.h \ -src/platform/StdDDraw2.cpp \ -src/platform/StdDDraw2.h \ src/platform/StdFont.cpp \ src/platform/StdFont.h \ -src/platform/StdGL.cpp \ -src/platform/StdGLCtx.cpp \ -src/platform/StdGL.h \ -src/platform/StdNoGfx.cpp \ -src/platform/StdNoGfx.h \ -src/platform/StdSurface8.cpp \ -src/platform/StdSurface8.h \ src/platform/StdSync.h \ src/platform/StdVideo.cpp \ src/platform/StdVideo.h \ +src/player/C4Player.cpp \ +src/player/C4Player.h \ +src/player/C4PlayerList.cpp \ +src/player/C4PlayerList.h \ +src/player/C4RankSystem.cpp \ +src/player/C4RankSystem.h \ src/res/Brush.h \ src/res/Cursor.h \ src/res/Dynamic.h \ @@ -561,6 +549,8 @@ else if GTK clonk_SOURCES += \ src/editor/C4ConsoleGTK.cpp \ +src/editor/C4ConsoleGTKDlg.cpp \ +src/editor/C4ConsoleGTKDlg.h \ src/platform/C4AppGTK.cpp \ src/platform/C4AppGTKImpl.h \ src/platform/C4WindowGTK.cpp @@ -603,6 +593,21 @@ clonk_SOURCES += src/network/C4Network2UPnPDummy.cpp endif endif +if AUTOUPDATE +clonk_SOURCES += \ +src/gui/C4UpdateDlg.cpp \ +src/gui/C4UpdateDlg.h +endif + +clonk_CPPFLAGS = \ +$(AM_CPPFLAGS) \ +$(GLEW_CFLAGS) \ +$(GTK_CFLAGS) \ +$(OPENAL_CFLAGS) \ +$(FREETYPE_CFLAGS) \ +$(SDL_CFLAGS) \ +$(LIBUPNP_CFLAGS) + clonk_LDADD = \ lib.a \ $(LDADD) \ @@ -620,30 +625,9 @@ clonk_LDADD = \ .rc.o: $(WINDRES) -I $(srcdir)/src/res -I $(builddir) -i $< -o $@ -c4group_CPPFLAGS = \ - -I$(builddir) \ - -I$(srcdir)/src \ - -I$(srcdir)/src/c4group \ - -I$(srcdir)/src/network \ - -I$(srcdir)/src/lib \ - -I$(srcdir)/src/platform \ - -I$(srcdir)/src/config \ - -I$(srcdir)/src/res \ - -I$(srcdir)/src/control \ - -I$(srcdir)/src/gui \ - -I$(srcdir)/src/editor \ - -I$(srcdir)/src/game/landscape \ - -I$(srcdir)/src/game/player \ - -I$(srcdir)/src/game/script \ - -I$(srcdir)/src/game \ - -I$(srcdir)/src/game/object \ - -I$(srcdir)/src/lib/texture \ - -I$(srcdir)/src/script \ -$(BOOST_CPPFLAGS) - c4group_SOURCES = \ src/lib/C4SimpleLog.cpp \ -src/c4group/c4group_ng.cpp +src/c4group/C4GroupMain.cpp if WIN32 c4group_SOURCES += src/c4group/Resource.rc @@ -705,7 +689,6 @@ include/c4script/c4script.h \ src/lib/C4SimpleLog.cpp \ src/lib/C4Real.cpp \ src/lib/C4Random.cpp \ -src/script/shell.cpp \ src/script/C4Aul.cpp \ src/script/C4AulExec.cpp \ src/script/C4AulLink.cpp \ @@ -713,11 +696,12 @@ src/script/C4AulParse.cpp \ src/script/C4StringTable.cpp \ src/script/C4PropList.cpp \ src/script/C4ScriptHost.cpp \ +src/script/C4ScriptMain.cpp \ src/script/C4ScriptStandalone.cpp \ src/script/C4ValueArray.cpp \ src/script/C4Value.cpp \ src/script/C4ValueMap.cpp \ -src/game/object/C4Id.cpp \ +src/object/C4Id.cpp \ src/script/C4Script.cpp \ src/c4group/C4GroupSet.cpp \ src/c4group/C4ComponentHost.cpp \ diff --git a/configure.ac b/configure.ac index 615638f9b..699435916 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) AC_INIT([clonk], [5]) AC_COPYRIGHT([©2005-2011 Günther Brammer]) -AC_CONFIG_SRCDIR([/src/C4Game.cpp]) +AC_CONFIG_SRCDIR([/src/C4Include.h]) AC_CONFIG_AUX_DIR([autotools]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile]) @@ -324,12 +324,13 @@ AS_IF([test $with_upnp = yes], [ AM_CONDITIONAL(LIBUPNP, [test "$have_libupnp" = yes]) # Automatic Update -AC_ARG_WITH([automatic-update], - [AS_HELP_STRING([--with-automatic-update],[enable support for automatic engine updates [default=yes]])], - , [with_automatic_update="yes"]) -if test "$with_automatic_update" = "yes"; then +AC_ARG_ENABLE([autoupdate], + [AS_HELP_STRING([--disable-autoupdate],[support for automatic engine updates [default=yes]])], + , [enable_autoupdate="yes"]) +AS_IF([test "$enable_autoupdate" = yes], [ AC_DEFINE([WITH_AUTOMATIC_UPDATE], 1, [Enable automatic update system]) -fi +]) +AM_CONDITIONAL(AUTOUPDATE, [test "$enable_autoupdate" = yes]) if test $win32 = false; then # pthread @@ -384,19 +385,20 @@ AM_CONDITIONAL(RECENT_GCC, [test $RECENT_GCC = yes]) AC_OUTPUT echo "Configuration: + CFLAGS: $CFLAGS + CXXFLAGS: $CXXFLAGS Debug: $enable_debug Debugrec: $enable_debugrec Pure console: $enable_console + Autoupdate: $enable_autoupdate DirectX: $with_directx OpenGL: $with_gl + Nat/LibUPnP: $ac_cv_header_natupnp_h/$have_libupnp Sound: $enable_sound SDL_Mixer: $with_sdl_mixer OpenAL: $with_openal GTK+: $with_gtk - X11: $have_x - Nat/LibUPnP: $ac_cv_header_natupnp_h/$have_libupnp - CFLAGS: $CFLAGS - CXXFLAGS: $CXXFLAGS" + X11: $have_x" if test "$enable_sdlmainloop" = yes; then echo " SDL: mainloop"; else echo " SDL: $with_sdl"; fi diff --git a/src/c4group/c4group_ng.cpp b/src/c4group/C4GroupMain.cpp similarity index 100% rename from src/c4group/c4group_ng.cpp rename to src/c4group/C4GroupMain.cpp diff --git a/src/config/C4SecurityCertificates.cpp b/src/config/C4SecurityCertificates.cpp deleted file mode 100644 index 3761044d4..000000000 --- a/src/config/C4SecurityCertificates.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * OpenClonk, http://www.openclonk.org - * - * Copyright (c) 2003-2004 Matthes Bender - * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de - * - * Portions might be copyrighted by other authors who have contributed - * to OpenClonk. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * See isc_license.txt for full license and disclaimer. - * - * "Clonk" is a registered trademark of Matthes Bender. - * See clonk_trademark_license.txt for full license. - */ - -/* Certificate used to verify registration keys. */ - -#include "C4Include.h" - -const char* Cert_Reg_XOR_Base64 = - "R0deRkkuNHZ/fEgwLjxnfjUicitmdx9eR0deYSklOHJcWCswKghQdDI6ZB12Y2s5IQUpIgwaEn93\n" - "Yy02KT9yQBQyWhJxSHM5KA09PSYtKGV3WTo1Jj8LQDc6aC44ZGMiIy8EMScPHGdCaD9HEypJdj0p\n" - "ViRkcHMQPigYIR02JgBaUAI2CCNxWDQqAD93cVo+Pj8ePQ86QwhFaAExLmRpbz0ba1gGVWBBWwMg\n" - "LyENPHNRdSlCPityTz45ZAdkWWRBUxkpAiYpK2l4QjJBXwliBzYTeQBzUXAUARsbAA0rewhBAiow\n" - "Oitkc0EHRDBfC3MQBzwYD1ZVAmtfBwMpPy9WcQRbRiR2cwA+LjsLJTAhQn9ieAk1HF5LeTcqAyd2\n" - "e0p5JD4+WCo4O1B7ey8mJj9AQDA6aC5kY2M0Lx05LjY4NGF7c1g0Kl9mcjApfC1jXHgfCD0lHik9\n" - "SUZyYzE3PT9if3kuRjBxUV8lHjAkXxwkNXBXcA89PSxyWCcuACBeaHQXHAg0MgM+NmdMUz8XHid2\n" - "UwcyWg1KeGYyACgUJTIuMHxiOCA2JR1RBUYZeC9kR2g0PAIXBl1dElh0YTIkDx5QBCESaDJgQlBB\n" - "XhI7ASUPM1ZdQwAYAikKQEMpcjt3ZXZBBh95MQlVMFJbZAMXWVdAbRpeWjBmcXAdECs9KQMHAFld\n" - "Wy9KHF5xdiIudytzfXAZOysEDD0HMlZvdykBKikCHCAaUmBbXGFDIAYrKiYaAwN+UysJDxRwQEUu\n" - "ZQh/AlQYAyUVMzMEPlVSCwQiOCBFXQFYAR5LYgMJDltKKC89CEtXCiQhYRkHbhsOeThrAlA4JxBE\n" - "OhIiAnkHBDAXPl0GBxhfHiBFR1YZHRkACS4pQWF8Uw1DWiZnAzQsVQUHBnkaLyMALwhmG3UHAT49\n" - "XAIFfzgTWTtocFsdJDk1CQ02FGhFQgYcJQgBYxgocB13c3MnKyQxDA8dGVpfdVEEWyxyZiItcCt9\n" - "cDgUOykQHk8FHUN4W1oiEiFHTRBAQTtiV0o8HCImOyVZIQdORCULEwN3TUFYYQVlcFRGHh4kHwFY\n" - "E1hCYzIaPS9BPQcTGjABA0InMygLPR0gAVRABS0xAzRqBCINYikEWUQDIgQAIlMGBHVwHQA9DCEG\n" - "e1w7W0FkXEInEAAdGSAmFVc8WxIeG1l6QVwABj50B14kHgAQQAcZR3Z6Zg0DLkVdVFwYQ1x9fEEl\n" - "Lwg0IRBfBgwLOEVeRkMecj0vESl3YGY6LCMwKjApXBwbH0V5\n" - ; - -const char* XOR_Cert_Reg = "jjskdlq162hskn37sk1j222s"; diff --git a/src/config/C4SecurityCertificates.h b/src/config/C4SecurityCertificates.h deleted file mode 100644 index 2483496f8..000000000 --- a/src/config/C4SecurityCertificates.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * OpenClonk, http://www.openclonk.org - * - * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de - * - * Portions might be copyrighted by other authors who have contributed - * to OpenClonk. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * See isc_license.txt for full license and disclaimer. - * - * "Clonk" is a registered trademark of Matthes Bender. - * See clonk_trademark_license.txt for full license. - */ - -extern const char* Cert_Reg_XOR_Base64; -extern const char* XOR_Cert_Reg; diff --git a/src/editor/C4ConsoleGTK.cpp b/src/editor/C4ConsoleGTK.cpp index cbfe6b429..d5d9b2de3 100644 --- a/src/editor/C4ConsoleGTK.cpp +++ b/src/editor/C4ConsoleGTK.cpp @@ -49,7 +49,7 @@ # include # include # include -# include +# include # include # include diff --git a/src/editor/C4DevmodeDlg.cpp b/src/editor/C4ConsoleGTKDlg.cpp similarity index 97% rename from src/editor/C4DevmodeDlg.cpp rename to src/editor/C4ConsoleGTKDlg.cpp index 12db3bec7..803852a9d 100644 --- a/src/editor/C4DevmodeDlg.cpp +++ b/src/editor/C4ConsoleGTKDlg.cpp @@ -19,9 +19,7 @@ /* Common window for drawing and property tool dialogs in console mode */ #include -#include - -#ifdef WITH_DEVELOPER_MODE +#include #include @@ -129,5 +127,3 @@ void C4DevmodeDlg::SetTitle(GtkWidget* widget, const char* title) if (gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_num) == widget) gtk_window_set_title(GTK_WINDOW(window), title); } - -#endif // WITH_DEVELOPER_MODE diff --git a/src/editor/C4DevmodeDlg.h b/src/editor/C4ConsoleGTKDlg.h similarity index 100% rename from src/editor/C4DevmodeDlg.h rename to src/editor/C4ConsoleGTKDlg.h diff --git a/src/editor/C4ConsoleWin32.cpp b/src/editor/C4ConsoleWin32.cpp index 59590b60a..ae5414741 100644 --- a/src/editor/C4ConsoleWin32.cpp +++ b/src/editor/C4ConsoleWin32.cpp @@ -23,41 +23,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifdef USE_GL -#include -#endif - -#ifdef USE_DIRECTX -#include -#endif - +#include #include "C4ConsoleGUI.h" +#include +#include +#include +#include +#include +#include +#include #include "C4Viewport.h" +#include #include #include #include #include "resource.h" - #define GetWideLPARAM(c) reinterpret_cast(static_cast(GetWideChar(c))) inline StdStrBuf::wchar_t_holder LoadResStrW(const char *id) { return GetWideChar(LoadResStr(id)); } diff --git a/src/editor/C4ToolsDlg.cpp b/src/editor/C4ToolsDlg.cpp index 985f0ab0d..75c74498f 100644 --- a/src/editor/C4ToolsDlg.cpp +++ b/src/editor/C4ToolsDlg.cpp @@ -33,9 +33,9 @@ #include #include #include -#include +#include #ifdef USE_GL -#include +#include #endif bool C4ToolsDlg::Open() diff --git a/src/platform/C4ViewportWindow.cpp b/src/editor/C4ViewportWindow.cpp similarity index 100% rename from src/platform/C4ViewportWindow.cpp rename to src/editor/C4ViewportWindow.cpp diff --git a/src/platform/C4ViewportWindow.h b/src/editor/C4ViewportWindow.h similarity index 100% rename from src/platform/C4ViewportWindow.h rename to src/editor/C4ViewportWindow.h diff --git a/src/C4Application.cpp b/src/game/C4Application.cpp similarity index 100% rename from src/C4Application.cpp rename to src/game/C4Application.cpp diff --git a/src/C4Application.h b/src/game/C4Application.h similarity index 100% rename from src/C4Application.h rename to src/game/C4Application.h diff --git a/src/C4FullScreen.cpp b/src/game/C4FullScreen.cpp similarity index 100% rename from src/C4FullScreen.cpp rename to src/game/C4FullScreen.cpp diff --git a/src/C4FullScreen.h b/src/game/C4FullScreen.h similarity index 100% rename from src/C4FullScreen.h rename to src/game/C4FullScreen.h diff --git a/src/C4Game.cpp b/src/game/C4Game.cpp similarity index 99% rename from src/C4Game.cpp rename to src/game/C4Game.cpp index 52d7c1afa..90896da23 100644 --- a/src/C4Game.cpp +++ b/src/game/C4Game.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/C4Game.h b/src/game/C4Game.h similarity index 100% rename from src/C4Game.h rename to src/game/C4Game.h diff --git a/src/C4GraphicsSystem.cpp b/src/game/C4GraphicsSystem.cpp similarity index 100% rename from src/C4GraphicsSystem.cpp rename to src/game/C4GraphicsSystem.cpp diff --git a/src/C4GraphicsSystem.h b/src/game/C4GraphicsSystem.h similarity index 100% rename from src/C4GraphicsSystem.h rename to src/game/C4GraphicsSystem.h diff --git a/src/gui/C4Viewport.cpp b/src/game/C4Viewport.cpp similarity index 100% rename from src/gui/C4Viewport.cpp rename to src/game/C4Viewport.cpp diff --git a/src/gui/C4Viewport.h b/src/game/C4Viewport.h similarity index 100% rename from src/gui/C4Viewport.h rename to src/game/C4Viewport.h diff --git a/src/C4WinMain.cpp b/src/game/ClonkMain.cpp similarity index 100% rename from src/C4WinMain.cpp rename to src/game/ClonkMain.cpp diff --git a/src/game/script/C4Effect.cpp b/src/gamescript/C4Effect.cpp similarity index 99% rename from src/game/script/C4Effect.cpp rename to src/gamescript/C4Effect.cpp index b97cc1df3..9b570d895 100644 --- a/src/game/script/C4Effect.cpp +++ b/src/gamescript/C4Effect.cpp @@ -25,7 +25,7 @@ /* Also contains some helper functions for various landscape effects */ #include -#include +#include #include #include diff --git a/src/game/script/C4Effects.h b/src/gamescript/C4Effect.h similarity index 100% rename from src/game/script/C4Effects.h rename to src/gamescript/C4Effect.h diff --git a/src/game/script/C4FindObject.cpp b/src/gamescript/C4FindObject.cpp similarity index 100% rename from src/game/script/C4FindObject.cpp rename to src/gamescript/C4FindObject.cpp diff --git a/src/game/script/C4FindObject.h b/src/gamescript/C4FindObject.h similarity index 100% rename from src/game/script/C4FindObject.h rename to src/gamescript/C4FindObject.h diff --git a/src/game/script/C4GameScript.cpp b/src/gamescript/C4GameScript.cpp similarity index 100% rename from src/game/script/C4GameScript.cpp rename to src/gamescript/C4GameScript.cpp diff --git a/src/game/script/C4Script.h b/src/gamescript/C4Script.h similarity index 100% rename from src/game/script/C4Script.h rename to src/gamescript/C4Script.h diff --git a/src/game/script/C4TransferZone.cpp b/src/gamescript/C4TransferZone.cpp similarity index 100% rename from src/game/script/C4TransferZone.cpp rename to src/gamescript/C4TransferZone.cpp diff --git a/src/game/script/C4TransferZone.h b/src/gamescript/C4TransferZone.h similarity index 100% rename from src/game/script/C4TransferZone.h rename to src/gamescript/C4TransferZone.h diff --git a/src/platform/Bitmap256.cpp b/src/graphics/Bitmap256.cpp similarity index 100% rename from src/platform/Bitmap256.cpp rename to src/graphics/Bitmap256.cpp diff --git a/src/platform/Bitmap256.h b/src/graphics/Bitmap256.h similarity index 100% rename from src/platform/Bitmap256.h rename to src/graphics/Bitmap256.h diff --git a/src/platform/StdDDraw2.cpp b/src/graphics/C4Draw.cpp similarity index 99% rename from src/platform/StdDDraw2.cpp rename to src/graphics/C4Draw.cpp index eed62a8ff..465fefdea 100644 --- a/src/platform/StdDDraw2.cpp +++ b/src/graphics/C4Draw.cpp @@ -23,14 +23,13 @@ /* NewGfx interfaces */ #include "C4Include.h" -#include +#include #include "C4App.h" #include -#include -#include -#include -#include +#include +#include +#include #include #include #include "C4Rect.h" diff --git a/src/platform/StdDDraw2.h b/src/graphics/C4Draw.h similarity index 99% rename from src/platform/StdDDraw2.h rename to src/graphics/C4Draw.h index c4811ecfb..86b52adaf 100644 --- a/src/platform/StdDDraw2.h +++ b/src/graphics/C4Draw.h @@ -24,7 +24,7 @@ #define INC_STDDDRAW2 #include -#include +#include #include #ifdef _WIN32 #include diff --git a/src/platform/StdD3D.cpp b/src/graphics/C4DrawD3D.cpp similarity index 99% rename from src/platform/StdD3D.cpp rename to src/graphics/C4DrawD3D.cpp index 00d653a85..ab8d41190 100644 --- a/src/platform/StdD3D.cpp +++ b/src/graphics/C4DrawD3D.cpp @@ -24,9 +24,9 @@ /* Direct3D implementation of NewGfx */ #include "C4Include.h" -#include +#include -#include +#include #include #include diff --git a/src/platform/StdD3D.h b/src/graphics/C4DrawD3D.h similarity index 100% rename from src/platform/StdD3D.h rename to src/graphics/C4DrawD3D.h diff --git a/src/platform/StdD3DShader.cpp b/src/graphics/C4DrawD3DShader.cpp similarity index 100% rename from src/platform/StdD3DShader.cpp rename to src/graphics/C4DrawD3DShader.cpp diff --git a/src/platform/StdD3DShader.h b/src/graphics/C4DrawD3DShader.h similarity index 100% rename from src/platform/StdD3DShader.h rename to src/graphics/C4DrawD3DShader.h diff --git a/src/platform/StdGL.cpp b/src/graphics/C4DrawGL.cpp similarity index 99% rename from src/platform/StdGL.cpp rename to src/graphics/C4DrawGL.cpp index 75027604e..d0c99511f 100644 --- a/src/platform/StdGL.cpp +++ b/src/graphics/C4DrawGL.cpp @@ -26,7 +26,7 @@ /* OpenGL implementation of NewGfx */ #include "C4Include.h" -#include +#include #include #include diff --git a/src/platform/StdGL.h b/src/graphics/C4DrawGL.h similarity index 99% rename from src/platform/StdGL.h rename to src/graphics/C4DrawGL.h index 7d67c65f6..daaae79c9 100644 --- a/src/platform/StdGL.h +++ b/src/graphics/C4DrawGL.h @@ -34,7 +34,7 @@ #else #include #endif -#include +#include class C4Window; diff --git a/src/platform/StdGLCtx.cpp b/src/graphics/C4DrawGLCtx.cpp similarity index 99% rename from src/platform/StdGLCtx.cpp rename to src/graphics/C4DrawGLCtx.cpp index 85001e373..b5aa39018 100644 --- a/src/platform/StdGLCtx.cpp +++ b/src/graphics/C4DrawGLCtx.cpp @@ -23,7 +23,7 @@ /* OpenGL implementation of NewGfx, the context */ #include "C4Include.h" -#include +#include #include #include diff --git a/src/platform/StdNoGfx.cpp b/src/graphics/C4DrawT.cpp similarity index 98% rename from src/platform/StdNoGfx.cpp rename to src/graphics/C4DrawT.cpp index 6bc079709..588753fac 100644 --- a/src/platform/StdNoGfx.cpp +++ b/src/graphics/C4DrawT.cpp @@ -18,7 +18,7 @@ * See clonk_trademark_license.txt for full license. */ #include "C4Include.h" -#include +#include #include CStdNoGfx::CStdNoGfx() diff --git a/src/platform/StdNoGfx.h b/src/graphics/C4DrawT.h similarity index 98% rename from src/platform/StdNoGfx.h rename to src/graphics/C4DrawT.h index a623c156a..e04604001 100644 --- a/src/platform/StdNoGfx.h +++ b/src/graphics/C4DrawT.h @@ -21,7 +21,7 @@ #ifndef INC_StdNoGfx #define INC_StdNoGfx -#include +#include class CStdNoGfx : public C4Draw { diff --git a/src/lib/texture/C4Facet.cpp b/src/graphics/C4Facet.cpp similarity index 99% rename from src/lib/texture/C4Facet.cpp rename to src/graphics/C4Facet.cpp index fa12e9a98..bb0df72e0 100644 --- a/src/lib/texture/C4Facet.cpp +++ b/src/graphics/C4Facet.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #ifdef WITH_GLIB diff --git a/src/lib/texture/C4Facet.h b/src/graphics/C4Facet.h similarity index 99% rename from src/lib/texture/C4Facet.h rename to src/graphics/C4Facet.h index fc45f08af..b954f9d26 100644 --- a/src/lib/texture/C4Facet.h +++ b/src/graphics/C4Facet.h @@ -24,7 +24,7 @@ #ifndef INC_C4Facet #define INC_C4Facet -#include +#include const int32_t C4FCT_None = 0, diff --git a/src/lib/texture/C4FacetEx.cpp b/src/graphics/C4FacetEx.cpp similarity index 100% rename from src/lib/texture/C4FacetEx.cpp rename to src/graphics/C4FacetEx.cpp diff --git a/src/lib/texture/C4FacetEx.h b/src/graphics/C4FacetEx.h similarity index 100% rename from src/lib/texture/C4FacetEx.h rename to src/graphics/C4FacetEx.h diff --git a/src/platform/C4Fonts.cpp b/src/graphics/C4Fonts.cpp similarity index 100% rename from src/platform/C4Fonts.cpp rename to src/graphics/C4Fonts.cpp diff --git a/src/platform/C4Fonts.h b/src/graphics/C4Fonts.h similarity index 100% rename from src/platform/C4Fonts.h rename to src/graphics/C4Fonts.h diff --git a/src/lib/texture/C4GraphicsResource.cpp b/src/graphics/C4GraphicsResource.cpp similarity index 99% rename from src/lib/texture/C4GraphicsResource.cpp rename to src/graphics/C4GraphicsResource.cpp index 8b78c6dc9..ab79689df 100644 --- a/src/lib/texture/C4GraphicsResource.cpp +++ b/src/graphics/C4GraphicsResource.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include C4GraphicsResource::C4GraphicsResource(): idSfcCaption(0), idSfcButton(0), idSfcButtonD(0), idSfcScroll(0), idSfcContext(0), diff --git a/src/lib/texture/C4GraphicsResource.h b/src/graphics/C4GraphicsResource.h similarity index 100% rename from src/lib/texture/C4GraphicsResource.h rename to src/graphics/C4GraphicsResource.h diff --git a/src/platform/C4Surface.cpp b/src/graphics/C4Surface.cpp similarity index 99% rename from src/platform/C4Surface.cpp rename to src/graphics/C4Surface.cpp index 63c3980bb..9a41d9aca 100644 --- a/src/platform/C4Surface.cpp +++ b/src/graphics/C4Surface.cpp @@ -28,12 +28,12 @@ #include #include #include "C4App.h" -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/platform/C4Surface.h b/src/graphics/C4Surface.h similarity index 100% rename from src/platform/C4Surface.h rename to src/graphics/C4Surface.h diff --git a/src/lib/texture/C4SurfaceLoaders.cpp b/src/graphics/C4SurfaceLoaders.cpp similarity index 99% rename from src/lib/texture/C4SurfaceLoaders.cpp rename to src/graphics/C4SurfaceLoaders.cpp index 3e3a00345..8f162d4a5 100644 --- a/src/lib/texture/C4SurfaceLoaders.cpp +++ b/src/graphics/C4SurfaceLoaders.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include bool C4Surface::LoadAny(C4Group &hGroup, const char *szName, bool fOwnPal, bool fNoErrIfNotFound) { diff --git a/src/platform/StdSurface8.cpp b/src/graphics/CSurface8.cpp similarity index 99% rename from src/platform/StdSurface8.cpp rename to src/graphics/CSurface8.cpp index 8d39f4cd6..031901eb6 100644 --- a/src/platform/StdSurface8.cpp +++ b/src/graphics/CSurface8.cpp @@ -20,10 +20,10 @@ // a wrapper class to DirectDraw surfaces #include "C4Include.h" -#include +#include #include #include -#include +#include #include #include diff --git a/src/platform/StdSurface8.h b/src/graphics/CSurface8.h similarity index 100% rename from src/platform/StdSurface8.h rename to src/graphics/CSurface8.h diff --git a/src/lib/texture/StdPNG.cpp b/src/graphics/StdPNG.cpp similarity index 100% rename from src/lib/texture/StdPNG.cpp rename to src/graphics/StdPNG.cpp diff --git a/src/lib/texture/StdPNG.h b/src/graphics/StdPNG.h similarity index 100% rename from src/lib/texture/StdPNG.h rename to src/graphics/StdPNG.h diff --git a/src/gui/C4FileSelDlg.cpp b/src/gui/C4FileSelDlg.cpp index 25fa32ad1..03fb4f38a 100644 --- a/src/gui/C4FileSelDlg.cpp +++ b/src/gui/C4FileSelDlg.cpp @@ -25,7 +25,7 @@ #include // only for single use of ::GraphicsResource.fctOKCancel below... #include -#include +#include #ifdef _WIN32 #ifndef _WIN32_IE diff --git a/src/gui/C4GuiButton.cpp b/src/gui/C4GuiButton.cpp index 714223ee8..8a155cd43 100644 --- a/src/gui/C4GuiButton.cpp +++ b/src/gui/C4GuiButton.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace C4GUI { diff --git a/src/gui/C4GuiDialogs.cpp b/src/gui/C4GuiDialogs.cpp index 5030a473c..4eb19d74f 100644 --- a/src/gui/C4GuiDialogs.cpp +++ b/src/gui/C4GuiDialogs.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include #ifdef _WIN32 diff --git a/src/gui/C4StartupOptionsDlg.cpp b/src/gui/C4StartupOptionsDlg.cpp index 88e4a88fb..81d629ca6 100644 --- a/src/gui/C4StartupOptionsDlg.cpp +++ b/src/gui/C4StartupOptionsDlg.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include // ------------------------------------------------ // --- C4StartupOptionsDlg::SmallButton diff --git a/src/game/landscape/C4Landscape.cpp b/src/landscape/C4Landscape.cpp similarity index 99% rename from src/game/landscape/C4Landscape.cpp rename to src/landscape/C4Landscape.cpp index bcdbe99e2..e77e3e8cb 100644 --- a/src/game/landscape/C4Landscape.cpp +++ b/src/landscape/C4Landscape.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/game/landscape/C4Landscape.h b/src/landscape/C4Landscape.h similarity index 99% rename from src/game/landscape/C4Landscape.h rename to src/landscape/C4Landscape.h index f911ac7e8..d7d486767 100644 --- a/src/game/landscape/C4Landscape.h +++ b/src/landscape/C4Landscape.h @@ -30,7 +30,7 @@ #include "C4Shape.h" #include "C4LandscapeRender.h" -#include +#include #include const uint8_t GBM = 128, diff --git a/src/game/landscape/C4LandscapeRender.cpp b/src/landscape/C4LandscapeRender.cpp similarity index 99% rename from src/game/landscape/C4LandscapeRender.cpp rename to src/landscape/C4LandscapeRender.cpp index 5a658bef0..a87162e5f 100644 --- a/src/game/landscape/C4LandscapeRender.cpp +++ b/src/landscape/C4LandscapeRender.cpp @@ -8,7 +8,7 @@ #include "C4GroupSet.h" #include "C4Components.h" -#include "StdGL.h" +#include "C4DrawGL.h" #include "StdColors.h" #ifdef USE_GL diff --git a/src/game/landscape/C4LandscapeRender.h b/src/landscape/C4LandscapeRender.h similarity index 100% rename from src/game/landscape/C4LandscapeRender.h rename to src/landscape/C4LandscapeRender.h diff --git a/src/game/landscape/C4LandscapeRenderClassic.cpp b/src/landscape/C4LandscapeRenderClassic.cpp similarity index 100% rename from src/game/landscape/C4LandscapeRenderClassic.cpp rename to src/landscape/C4LandscapeRenderClassic.cpp diff --git a/src/game/landscape/C4Map.cpp b/src/landscape/C4Map.cpp similarity index 99% rename from src/game/landscape/C4Map.cpp rename to src/landscape/C4Map.cpp index c9032def6..62545e5ff 100644 --- a/src/game/landscape/C4Map.cpp +++ b/src/landscape/C4Map.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include C4MapCreator::C4MapCreator() diff --git a/src/game/landscape/C4Map.h b/src/landscape/C4Map.h similarity index 100% rename from src/game/landscape/C4Map.h rename to src/landscape/C4Map.h diff --git a/src/game/landscape/C4MapCreatorS2.cpp b/src/landscape/C4MapCreatorS2.cpp similarity index 100% rename from src/game/landscape/C4MapCreatorS2.cpp rename to src/landscape/C4MapCreatorS2.cpp diff --git a/src/game/landscape/C4MapCreatorS2.h b/src/landscape/C4MapCreatorS2.h similarity index 100% rename from src/game/landscape/C4MapCreatorS2.h rename to src/landscape/C4MapCreatorS2.h diff --git a/src/game/landscape/C4MassMover.cpp b/src/landscape/C4MassMover.cpp similarity index 100% rename from src/game/landscape/C4MassMover.cpp rename to src/landscape/C4MassMover.cpp diff --git a/src/game/landscape/C4MassMover.h b/src/landscape/C4MassMover.h similarity index 100% rename from src/game/landscape/C4MassMover.h rename to src/landscape/C4MassMover.h diff --git a/src/game/landscape/C4Material.cpp b/src/landscape/C4Material.cpp similarity index 99% rename from src/game/landscape/C4Material.cpp rename to src/landscape/C4Material.cpp index 0634f7eaa..a71c61f30 100644 --- a/src/game/landscape/C4Material.cpp +++ b/src/landscape/C4Material.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include // For GravAccel diff --git a/src/game/landscape/C4Material.h b/src/landscape/C4Material.h similarity index 100% rename from src/game/landscape/C4Material.h rename to src/landscape/C4Material.h diff --git a/src/game/landscape/C4MaterialList.cpp b/src/landscape/C4MaterialList.cpp similarity index 100% rename from src/game/landscape/C4MaterialList.cpp rename to src/landscape/C4MaterialList.cpp diff --git a/src/game/landscape/C4MaterialList.h b/src/landscape/C4MaterialList.h similarity index 100% rename from src/game/landscape/C4MaterialList.h rename to src/landscape/C4MaterialList.h diff --git a/src/game/landscape/C4PXS.cpp b/src/landscape/C4PXS.cpp similarity index 100% rename from src/game/landscape/C4PXS.cpp rename to src/landscape/C4PXS.cpp diff --git a/src/game/landscape/C4PXS.h b/src/landscape/C4PXS.h similarity index 100% rename from src/game/landscape/C4PXS.h rename to src/landscape/C4PXS.h diff --git a/src/game/landscape/C4Particles.cpp b/src/landscape/C4Particles.cpp similarity index 100% rename from src/game/landscape/C4Particles.cpp rename to src/landscape/C4Particles.cpp diff --git a/src/game/landscape/C4Particles.h b/src/landscape/C4Particles.h similarity index 100% rename from src/game/landscape/C4Particles.h rename to src/landscape/C4Particles.h diff --git a/src/game/landscape/C4PathFinder.cpp b/src/landscape/C4PathFinder.cpp similarity index 100% rename from src/game/landscape/C4PathFinder.cpp rename to src/landscape/C4PathFinder.cpp diff --git a/src/game/landscape/C4PathFinder.h b/src/landscape/C4PathFinder.h similarity index 100% rename from src/game/landscape/C4PathFinder.h rename to src/landscape/C4PathFinder.h diff --git a/src/game/landscape/C4Region.cpp b/src/landscape/C4Region.cpp similarity index 100% rename from src/game/landscape/C4Region.cpp rename to src/landscape/C4Region.cpp diff --git a/src/game/landscape/C4Region.h b/src/landscape/C4Region.h similarity index 100% rename from src/game/landscape/C4Region.h rename to src/landscape/C4Region.h diff --git a/src/game/landscape/C4Scenario.cpp b/src/landscape/C4Scenario.cpp similarity index 100% rename from src/game/landscape/C4Scenario.cpp rename to src/landscape/C4Scenario.cpp diff --git a/src/game/landscape/C4Scenario.h b/src/landscape/C4Scenario.h similarity index 100% rename from src/game/landscape/C4Scenario.h rename to src/landscape/C4Scenario.h diff --git a/src/game/landscape/C4Sky.cpp b/src/landscape/C4Sky.cpp similarity index 100% rename from src/game/landscape/C4Sky.cpp rename to src/landscape/C4Sky.cpp diff --git a/src/game/landscape/C4Sky.h b/src/landscape/C4Sky.h similarity index 100% rename from src/game/landscape/C4Sky.h rename to src/landscape/C4Sky.h diff --git a/src/game/landscape/C4SolidMask.cpp b/src/landscape/C4SolidMask.cpp similarity index 100% rename from src/game/landscape/C4SolidMask.cpp rename to src/landscape/C4SolidMask.cpp diff --git a/src/game/landscape/C4SolidMask.h b/src/landscape/C4SolidMask.h similarity index 100% rename from src/game/landscape/C4SolidMask.h rename to src/landscape/C4SolidMask.h diff --git a/src/game/landscape/C4Texture.cpp b/src/landscape/C4Texture.cpp similarity index 100% rename from src/game/landscape/C4Texture.cpp rename to src/landscape/C4Texture.cpp diff --git a/src/game/landscape/C4Texture.h b/src/landscape/C4Texture.h similarity index 100% rename from src/game/landscape/C4Texture.h rename to src/landscape/C4Texture.h diff --git a/src/game/landscape/C4Weather.cpp b/src/landscape/C4Weather.cpp similarity index 100% rename from src/game/landscape/C4Weather.cpp rename to src/landscape/C4Weather.cpp diff --git a/src/game/landscape/C4Weather.h b/src/landscape/C4Weather.h similarity index 100% rename from src/game/landscape/C4Weather.h rename to src/landscape/C4Weather.h diff --git a/src/lib/C4Markup.cpp b/src/lib/C4Markup.cpp index 147992553..79cd53230 100644 --- a/src/lib/C4Markup.cpp +++ b/src/lib/C4Markup.cpp @@ -19,7 +19,7 @@ #include "C4Include.h" #include -#include +#include void C4MarkupTagItalic::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr) { diff --git a/src/lib/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp index 04333fef9..8e4b17a78 100644 --- a/src/lib/StdMeshMaterial.cpp +++ b/src/lib/StdMeshMaterial.cpp @@ -22,7 +22,7 @@ #include "C4Include.h" #include #include -#include +#include #include #include diff --git a/src/game/object/C4Action.cpp b/src/object/C4Action.cpp similarity index 100% rename from src/game/object/C4Action.cpp rename to src/object/C4Action.cpp diff --git a/src/game/object/C4Command.cpp b/src/object/C4Command.cpp similarity index 100% rename from src/game/object/C4Command.cpp rename to src/object/C4Command.cpp diff --git a/src/game/object/C4Command.h b/src/object/C4Command.h similarity index 100% rename from src/game/object/C4Command.h rename to src/object/C4Command.h diff --git a/src/game/object/C4Def.cpp b/src/object/C4Def.cpp similarity index 100% rename from src/game/object/C4Def.cpp rename to src/object/C4Def.cpp diff --git a/src/game/object/C4Def.h b/src/object/C4Def.h similarity index 100% rename from src/game/object/C4Def.h rename to src/object/C4Def.h diff --git a/src/game/object/C4DefGraphics.cpp b/src/object/C4DefGraphics.cpp similarity index 100% rename from src/game/object/C4DefGraphics.cpp rename to src/object/C4DefGraphics.cpp diff --git a/src/game/object/C4DefGraphics.h b/src/object/C4DefGraphics.h similarity index 100% rename from src/game/object/C4DefGraphics.h rename to src/object/C4DefGraphics.h diff --git a/src/game/object/C4DefList.cpp b/src/object/C4DefList.cpp similarity index 100% rename from src/game/object/C4DefList.cpp rename to src/object/C4DefList.cpp diff --git a/src/game/object/C4DefList.h b/src/object/C4DefList.h similarity index 100% rename from src/game/object/C4DefList.h rename to src/object/C4DefList.h diff --git a/src/game/object/C4GameObjects.cpp b/src/object/C4GameObjects.cpp similarity index 99% rename from src/game/object/C4GameObjects.cpp rename to src/object/C4GameObjects.cpp index 8df130a27..a47df7845 100644 --- a/src/game/object/C4GameObjects.cpp +++ b/src/object/C4GameObjects.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/game/object/C4GameObjects.h b/src/object/C4GameObjects.h similarity index 100% rename from src/game/object/C4GameObjects.h rename to src/object/C4GameObjects.h diff --git a/src/game/object/C4IDList.cpp b/src/object/C4IDList.cpp similarity index 100% rename from src/game/object/C4IDList.cpp rename to src/object/C4IDList.cpp diff --git a/src/game/object/C4IDList.h b/src/object/C4IDList.h similarity index 100% rename from src/game/object/C4IDList.h rename to src/object/C4IDList.h diff --git a/src/game/object/C4Id.cpp b/src/object/C4Id.cpp similarity index 100% rename from src/game/object/C4Id.cpp rename to src/object/C4Id.cpp diff --git a/src/game/object/C4Id.h b/src/object/C4Id.h similarity index 100% rename from src/game/object/C4Id.h rename to src/object/C4Id.h diff --git a/src/game/object/C4InfoCore.cpp b/src/object/C4InfoCore.cpp similarity index 100% rename from src/game/object/C4InfoCore.cpp rename to src/object/C4InfoCore.cpp diff --git a/src/game/object/C4InfoCore.h b/src/object/C4InfoCore.h similarity index 100% rename from src/game/object/C4InfoCore.h rename to src/object/C4InfoCore.h diff --git a/src/game/object/C4MeshAnimation.cpp b/src/object/C4MeshAnimation.cpp similarity index 100% rename from src/game/object/C4MeshAnimation.cpp rename to src/object/C4MeshAnimation.cpp diff --git a/src/game/object/C4MeshAnimation.h b/src/object/C4MeshAnimation.h similarity index 100% rename from src/game/object/C4MeshAnimation.h rename to src/object/C4MeshAnimation.h diff --git a/src/game/object/C4Movement.cpp b/src/object/C4Movement.cpp similarity index 99% rename from src/game/object/C4Movement.cpp rename to src/object/C4Movement.cpp index 9dc5a1f42..39e57bb9c 100644 --- a/src/game/object/C4Movement.cpp +++ b/src/object/C4Movement.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/game/object/C4Object.cpp b/src/object/C4Object.cpp similarity index 99% rename from src/game/object/C4Object.cpp rename to src/object/C4Object.cpp index 8f94350cc..f5bce79d1 100644 --- a/src/game/object/C4Object.cpp +++ b/src/object/C4Object.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/game/object/C4Object.h b/src/object/C4Object.h similarity index 100% rename from src/game/object/C4Object.h rename to src/object/C4Object.h diff --git a/src/game/object/C4ObjectCom.cpp b/src/object/C4ObjectCom.cpp similarity index 99% rename from src/game/object/C4ObjectCom.cpp rename to src/object/C4ObjectCom.cpp index 254c508ae..577c1547f 100644 --- a/src/game/object/C4ObjectCom.cpp +++ b/src/object/C4ObjectCom.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/game/object/C4ObjectCom.h b/src/object/C4ObjectCom.h similarity index 100% rename from src/game/object/C4ObjectCom.h rename to src/object/C4ObjectCom.h diff --git a/src/game/object/C4ObjectInfo.cpp b/src/object/C4ObjectInfo.cpp similarity index 100% rename from src/game/object/C4ObjectInfo.cpp rename to src/object/C4ObjectInfo.cpp diff --git a/src/game/object/C4ObjectInfo.h b/src/object/C4ObjectInfo.h similarity index 100% rename from src/game/object/C4ObjectInfo.h rename to src/object/C4ObjectInfo.h diff --git a/src/game/object/C4ObjectInfoList.cpp b/src/object/C4ObjectInfoList.cpp similarity index 100% rename from src/game/object/C4ObjectInfoList.cpp rename to src/object/C4ObjectInfoList.cpp diff --git a/src/game/object/C4ObjectInfoList.h b/src/object/C4ObjectInfoList.h similarity index 100% rename from src/game/object/C4ObjectInfoList.h rename to src/object/C4ObjectInfoList.h diff --git a/src/game/object/C4ObjectList.cpp b/src/object/C4ObjectList.cpp similarity index 100% rename from src/game/object/C4ObjectList.cpp rename to src/object/C4ObjectList.cpp diff --git a/src/game/object/C4ObjectList.h b/src/object/C4ObjectList.h similarity index 100% rename from src/game/object/C4ObjectList.h rename to src/object/C4ObjectList.h diff --git a/src/game/object/C4ObjectMenu.cpp b/src/object/C4ObjectMenu.cpp similarity index 100% rename from src/game/object/C4ObjectMenu.cpp rename to src/object/C4ObjectMenu.cpp diff --git a/src/game/object/C4ObjectMenu.h b/src/object/C4ObjectMenu.h similarity index 100% rename from src/game/object/C4ObjectMenu.h rename to src/object/C4ObjectMenu.h diff --git a/src/game/object/C4ObjectPtr.cpp b/src/object/C4ObjectPtr.cpp similarity index 100% rename from src/game/object/C4ObjectPtr.cpp rename to src/object/C4ObjectPtr.cpp diff --git a/src/game/object/C4ObjectPtr.h b/src/object/C4ObjectPtr.h similarity index 100% rename from src/game/object/C4ObjectPtr.h rename to src/object/C4ObjectPtr.h diff --git a/src/game/object/C4ObjectScript.cpp b/src/object/C4ObjectScript.cpp similarity index 100% rename from src/game/object/C4ObjectScript.cpp rename to src/object/C4ObjectScript.cpp diff --git a/src/game/object/C4Sector.cpp b/src/object/C4Sector.cpp similarity index 100% rename from src/game/object/C4Sector.cpp rename to src/object/C4Sector.cpp diff --git a/src/game/object/C4Sector.h b/src/object/C4Sector.h similarity index 100% rename from src/game/object/C4Sector.h rename to src/object/C4Sector.h diff --git a/src/game/object/C4Shape.cpp b/src/object/C4Shape.cpp similarity index 100% rename from src/game/object/C4Shape.cpp rename to src/object/C4Shape.cpp diff --git a/src/game/object/C4Shape.h b/src/object/C4Shape.h similarity index 100% rename from src/game/object/C4Shape.h rename to src/object/C4Shape.h diff --git a/src/platform/C4AppGTK.cpp b/src/platform/C4AppGTK.cpp index 208dbb9b9..225f5ef89 100644 --- a/src/platform/C4AppGTK.cpp +++ b/src/platform/C4AppGTK.cpp @@ -24,10 +24,9 @@ #include #include -#ifdef WITH_GLIB #include -#include -#include +#include +#include #include #include @@ -389,4 +388,3 @@ void C4AbstractApp::MessageDialog(const char * message) gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } -#endif /* WITH_GLIB */ diff --git a/src/platform/C4AppSDL.cpp b/src/platform/C4AppSDL.cpp index 1044aa52c..1fa88b41d 100644 --- a/src/platform/C4AppSDL.cpp +++ b/src/platform/C4AppSDL.cpp @@ -26,8 +26,7 @@ #include "C4App.h" #include -#include -#include +#include #include #include #include diff --git a/src/platform/C4AppT.cpp b/src/platform/C4AppT.cpp index 1677d616d..581e5ac45 100644 --- a/src/platform/C4AppT.cpp +++ b/src/platform/C4AppT.cpp @@ -25,7 +25,7 @@ #include #ifdef USE_CONSOLE #include -#include +#include #include #ifdef HAVE_LIBREADLINE diff --git a/src/gui/C4UserMessages.h b/src/platform/C4AppWin32Impl.h similarity index 100% rename from src/gui/C4UserMessages.h rename to src/platform/C4AppWin32Impl.h diff --git a/src/platform/C4WindowGTK.cpp b/src/platform/C4WindowGTK.cpp index 1f7cc1910..4b389d85f 100644 --- a/src/platform/C4WindowGTK.cpp +++ b/src/platform/C4WindowGTK.cpp @@ -29,8 +29,8 @@ #include "C4Version.h" #include -#include -#include +#include +#include #include #include diff --git a/src/platform/C4WindowMac.mm b/src/platform/C4WindowMac.mm index ef0daa8c1..7d7fcf1b8 100644 --- a/src/platform/C4WindowMac.mm +++ b/src/platform/C4WindowMac.mm @@ -14,9 +14,7 @@ */ #include -#include -#include -#include +#include #include #include #include @@ -186,4 +184,4 @@ int MK_SHIFT = NSShiftKeyMask; int MK_CONTROL = NSControlKeyMask; int MK_ALT = NSAlternateKeyMask; -#endif \ No newline at end of file +#endif diff --git a/src/platform/C4WindowSDL.cpp b/src/platform/C4WindowSDL.cpp index e7e7f31a9..84057bc92 100644 --- a/src/platform/C4WindowSDL.cpp +++ b/src/platform/C4WindowSDL.cpp @@ -25,8 +25,7 @@ #include #include -#include -#include +#include #include #include diff --git a/src/platform/C4WindowWin32.cpp b/src/platform/C4WindowWin32.cpp index cef57d78b..b2ddafcd8 100644 --- a/src/platform/C4WindowWin32.cpp +++ b/src/platform/C4WindowWin32.cpp @@ -27,35 +27,25 @@ #include "C4Include.h" #include -#include -#include -#include -#include -#include #include +#include +#include #include +#include +#include +#include #include #include -#include -#include "C4Version.h" - -#ifdef USE_GL -#include -#endif -#ifdef USE_DIRECTX -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "resource.h" -#include +#include +#include +#include // multimon.h comes with DirectX, some people don't have DirectX. #ifdef HAVE_MULTIMON_H diff --git a/src/platform/ClonkMainMenuActions.mm b/src/platform/ClonkMainMenuActions.mm index ce43fec74..c17591f7c 100644 --- a/src/platform/ClonkMainMenuActions.mm +++ b/src/platform/ClonkMainMenuActions.mm @@ -20,7 +20,7 @@ #include #include -#import +#import #import "ClonkMainMenuActions.h" #import "ClonkOpenGLView.h" diff --git a/src/platform/ClonkOpenGLView.mm b/src/platform/ClonkOpenGLView.mm index 252f3ad3e..c5371af03 100644 --- a/src/platform/ClonkOpenGLView.mm +++ b/src/platform/ClonkOpenGLView.mm @@ -26,7 +26,7 @@ #include #include -#include +#include #import "ClonkOpenGLView.h" #import "ClonkWindowController.h" diff --git a/src/platform/ClonkWindowController.mm b/src/platform/ClonkWindowController.mm index e524359f0..11a3dba57 100644 --- a/src/platform/ClonkWindowController.mm +++ b/src/platform/ClonkWindowController.mm @@ -22,7 +22,7 @@ #include #include -#import +#import #import "ClonkWindowController.h" #import "ClonkOpenGLView.h" diff --git a/src/platform/StdFont.cpp b/src/platform/StdFont.cpp index 64da6e9bd..a35efd5ca 100644 --- a/src/platform/StdFont.cpp +++ b/src/platform/StdFont.cpp @@ -28,7 +28,7 @@ #include "Standard.h" #include -#include +#include #include #include #include diff --git a/src/game/player/C4Player.cpp b/src/player/C4Player.cpp similarity index 100% rename from src/game/player/C4Player.cpp rename to src/player/C4Player.cpp diff --git a/src/game/player/C4Player.h b/src/player/C4Player.h similarity index 100% rename from src/game/player/C4Player.h rename to src/player/C4Player.h diff --git a/src/game/player/C4PlayerList.cpp b/src/player/C4PlayerList.cpp similarity index 100% rename from src/game/player/C4PlayerList.cpp rename to src/player/C4PlayerList.cpp diff --git a/src/game/player/C4PlayerList.h b/src/player/C4PlayerList.h similarity index 100% rename from src/game/player/C4PlayerList.h rename to src/player/C4PlayerList.h diff --git a/src/game/player/C4RankSystem.cpp b/src/player/C4RankSystem.cpp similarity index 100% rename from src/game/player/C4RankSystem.cpp rename to src/player/C4RankSystem.cpp diff --git a/src/game/player/C4RankSystem.h b/src/player/C4RankSystem.h similarity index 100% rename from src/game/player/C4RankSystem.h rename to src/player/C4RankSystem.h diff --git a/src/script/C4AulDefFunc.h b/src/script/C4AulDefFunc.h index ea071d43a..b22920e7d 100644 --- a/src/script/C4AulDefFunc.h +++ b/src/script/C4AulDefFunc.h @@ -23,7 +23,7 @@ #define INC_C4AulDefFunc #include -#include +#include #include typedef int32_t t_int; diff --git a/src/script/shell.cpp b/src/script/C4ScriptMain.cpp similarity index 100% rename from src/script/shell.cpp rename to src/script/C4ScriptMain.cpp