diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5071a58f6..ad154f0ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,455 +7,497 @@ separate_arguments(OC_CXX_FLAGS)
set(OC_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
separate_arguments(OC_CXX_FLAGS_DEBUG)
-if(WIN32)
- SET(additional_clonk_sources engine/src/C4FileClasses.cpp engine/res/engine.rc engine/res/resource.h)
-endif()
-add_executable(clonk WIN32 MACOSX_BUNDLE
- ${additional_clonk_sources}
- engine/src/C4AList.cpp
- engine/src/C4Action.cpp
- engine/src/C4Application.cpp
- engine/src/C4Aul.cpp
- engine/src/C4AulExec.cpp
- engine/src/C4AulLink.cpp
- engine/src/C4AulParse.cpp
- engine/src/C4ChatDlg.cpp
- engine/src/C4Client.cpp
- engine/src/C4Command.cpp
- engine/src/C4ComponentHost.cpp
- engine/src/C4Config.cpp
- engine/src/C4Console.cpp
- engine/src/C4Control.cpp
- engine/src/C4Def.cpp
- engine/src/C4DefGraphics.cpp
- engine/src/C4DevmodeDlg.cpp
- engine/src/C4DownloadDlg.cpp
- engine/src/C4EditCursor.cpp
- engine/src/C4Effect.cpp
- engine/src/C4Extra.cpp
- engine/src/C4Facet.cpp
- engine/src/C4FacetEx.cpp
- engine/src/C4FindObject.cpp
- engine/src/C4FileMonitor.cpp
- engine/src/C4FileSelDlg.cpp
- engine/src/C4Folder.cpp
- engine/src/C4Fonts.cpp
- engine/src/C4FullScreen.cpp
- engine/src/C4Game.cpp
- engine/src/C4GameControl.cpp
- engine/src/C4GameControlNetwork.cpp
- engine/src/C4GameDialogs.cpp
- engine/src/C4GameLobby.cpp
- engine/src/C4GameMessage.cpp
- engine/src/C4GameObjects.cpp
- engine/src/C4GameOptions.cpp
- engine/src/C4GameOverDlg.cpp
- engine/src/C4GamePadCon.cpp
- engine/src/C4GameParameters.cpp
- engine/src/C4GameSave.cpp
- engine/src/C4GraphicsResource.cpp
- engine/src/C4GraphicsSystem.cpp
- engine/src/C4Group.cpp
- engine/src/C4GroupSet.cpp
- engine/src/C4Gui.cpp
- engine/src/C4GuiButton.cpp
- engine/src/C4GuiCheckBox.cpp
- engine/src/C4GuiComboBox.cpp
- engine/src/C4GuiContainers.cpp
- engine/src/C4GuiDialogs.cpp
- engine/src/C4GuiEdit.cpp
- engine/src/C4GuiLabels.cpp
- engine/src/C4GuiListBox.cpp
- engine/src/C4GuiMenu.cpp
- engine/src/C4GuiTabular.cpp
- engine/src/C4IDList.cpp
- engine/src/C4Id.cpp
- engine/src/C4InfoCore.cpp
- engine/src/C4InputValidation.cpp
- engine/src/C4InteractiveThread.cpp
- engine/src/C4KeyboardInput.cpp
- engine/src/C4Landscape.cpp
- engine/src/C4LangStringTable.cpp
- engine/src/C4Language.cpp
- engine/src/C4League.cpp
- engine/src/C4LoaderScreen.cpp
- engine/src/C4Log.cpp
- engine/src/C4LogBuf.cpp
- engine/src/C4MainMenu.cpp
- engine/src/C4Map.cpp
- engine/src/C4MapCreatorS2.cpp
- engine/src/C4MassMover.cpp
- engine/src/C4Material.cpp
- engine/src/C4MaterialList.cpp
- engine/src/C4Menu.cpp
- engine/src/C4MessageBoard.cpp
- engine/src/C4MessageInput.cpp
- engine/src/C4MouseControl.cpp
- engine/src/C4Movement.cpp
- engine/src/C4MusicFile.cpp
- engine/src/C4MusicSystem.cpp
- engine/src/C4NameList.cpp
- engine/src/C4NetIO.cpp
- engine/src/C4Network2.cpp
- engine/src/C4Network2Client.cpp
- engine/src/C4Network2Dialogs.cpp
- engine/src/C4Network2Discover.cpp
- engine/src/C4Network2IO.cpp
- engine/src/C4Network2IRC.cpp
- engine/src/C4Network2Players.cpp
- engine/src/C4Network2Reference.cpp
- engine/src/C4Network2Res.cpp
- engine/src/C4Network2ResDlg.cpp
- engine/src/C4Network2Stats.cpp
- engine/src/C4Object.cpp
- engine/src/C4ObjectCom.cpp
- engine/src/C4ObjectMenu.cpp
- engine/src/C4ObjectInfo.cpp
- engine/src/C4ObjectInfoList.cpp
- engine/src/C4ObjectList.cpp
- engine/src/C4ObjectListDlg.cpp
- engine/src/C4PXS.cpp
- engine/src/C4Packet2.cpp
- engine/src/C4Particles.cpp
- engine/src/C4PathFinder.cpp
- engine/src/C4Player.cpp
- engine/src/C4PlayerControl.cpp
- engine/src/C4PlayerInfo.cpp
- engine/src/C4PlayerInfoConflicts.cpp
- engine/src/C4PlayerInfoListBox.cpp
- engine/src/C4PlayerList.cpp
- engine/src/C4PropertyDlg.cpp
- engine/src/C4Random.cpp
- engine/src/C4RankSystem.cpp
- engine/src/C4Record.cpp
- engine/src/C4Region.cpp
- engine/src/C4RTF.cpp
- engine/src/C4Scenario.cpp
- engine/src/C4Scoreboard.cpp
- engine/src/C4Script.cpp
- engine/src/C4ScriptHost.cpp
- engine/src/C4Sector.cpp
- engine/src/C4Shape.cpp
- engine/src/C4Sky.cpp
- engine/src/C4SolidMask.cpp
- engine/src/C4SoundSystem.cpp
- engine/src/C4Startup.cpp
- engine/src/C4StartupAboutDlg.cpp
- engine/src/C4StartupMainDlg.cpp
- engine/src/C4StartupNetDlg.cpp
- engine/src/C4StartupOptionsDlg.cpp
- engine/src/C4StartupPlrSelDlg.cpp
- engine/src/C4StartupScenSelDlg.cpp
- engine/src/C4Stat.cpp
- engine/src/C4StringTable.cpp
- engine/src/C4Surface.cpp
- engine/src/C4SurfaceFile.cpp
- engine/src/C4Teams.cpp
- engine/src/C4Texture.cpp
- engine/src/C4ToolsDlg.cpp
- engine/src/C4TransferZone.cpp
- engine/src/C4UpdateDlg.cpp
- engine/src/C4UpperBoard.cpp
- engine/src/C4Value.cpp
- engine/src/C4ValueList.cpp
- engine/src/C4ValueMap.cpp
- engine/src/C4Video.cpp
- engine/src/C4VideoPlayback.cpp
- engine/src/C4Viewport.cpp
- engine/src/C4Weather.cpp
- engine/src/C4WinMain.cpp
- engine/sec/C4ConfigShareware.cpp
- engine/sec/C4ConfigShareware.h
- engine/sec/C4SecurityCertificates.cpp
- engine/sec/C4SecurityCertificates.h
- engine/inc/C4AList.h
- engine/inc/C4Application.h
- engine/inc/C4Aul.h
- engine/inc/C4ChatDlg.h
- engine/inc/C4Command.h
- engine/inc/C4Client.h
- engine/inc/C4ComponentHost.h
- engine/inc/C4Components.h
- engine/inc/C4Config.h
- engine/inc/C4Console.h
- engine/inc/C4Constants.h
- engine/inc/C4Control.h
- engine/inc/C4DefGraphics.h
- engine/inc/C4Def.h
- engine/inc/C4DevmodeDlg.h
- engine/inc/C4DownloadDlg.h
- engine/inc/C4EditCursor.h
- engine/inc/C4Effects.h
- engine/inc/C4Extra.h
- engine/inc/C4FacetEx.h
- engine/inc/C4Facet.h
- engine/inc/C4FileClasses.h
- engine/inc/C4FileMonitor.h
- engine/inc/C4FileSelDlg.h
- engine/inc/C4FindObject.h
- engine/inc/C4Folder.h
- engine/inc/C4Fonts.h
- engine/inc/C4FullScreen.h
- engine/inc/C4Game.h
- engine/inc/C4GameControl.h
- engine/inc/C4GameControlNetwork.h
- engine/inc/C4GameDialogs.h
- engine/inc/C4GameLobby.h
- engine/inc/C4GameMessage.h
- engine/inc/C4GameObjects.h
- engine/inc/C4GameOptions.h
- engine/inc/C4GameOverDlg.h
- engine/inc/C4GamePadCon.h
- engine/inc/C4GameParameters.h
- engine/inc/C4GameSave.h
- engine/inc/C4GameVersion.h
- engine/inc/C4GraphicsResource.h
- engine/inc/C4GraphicsSystem.h
- engine/inc/C4Group.h
- engine/inc/C4GroupSet.h
- engine/inc/C4Gui.h
- engine/inc/C4Id.h
- engine/inc/C4IDList.h
- engine/inc/C4Include.h
- engine/inc/C4InfoCore.h
- engine/inc/C4InputValidation.h
- engine/inc/C4InteractiveThread.h
- engine/inc/C4KeyboardInput.h
- engine/inc/C4Landscape.h
- engine/inc/C4LangStringTable.h
- engine/inc/C4Language.h
- engine/inc/C4League.h
- engine/inc/C4LoaderScreen.h
- engine/inc/C4LogBuf.h
- engine/inc/C4Log.h
- engine/inc/C4MainMenu.h
- engine/inc/C4MapCreatorS2.h
- engine/inc/C4Map.h
- engine/inc/C4MassMover.h
- engine/inc/C4Material.h
- engine/inc/C4MaterialList.h
- engine/inc/C4Menu.h
- engine/inc/C4MessageBoard.h
- engine/inc/C4MessageInput.h
- engine/inc/C4MouseControl.h
- engine/inc/C4MusicFile.h
- engine/inc/C4MusicSystem.h
- engine/inc/C4NameList.h
- engine/inc/C4NetIO.h
- engine/inc/C4Network2Client.h
- engine/inc/C4Network2Dialogs.h
- engine/inc/C4Network2Discover.h
- engine/inc/C4Network2.h
- engine/inc/C4Network2IO.h
- engine/inc/C4Network2IRC.h
- engine/inc/C4Network2Players.h
- engine/inc/C4Network2Reference.h
- engine/inc/C4Network2Res.h
- engine/inc/C4Network2Stats.h
- engine/inc/C4ObjectCom.h
- engine/inc/C4Object.h
- engine/inc/C4ObjectInfo.h
- engine/inc/C4ObjectInfoList.h
- engine/inc/C4ObjectMenu.h
- engine/inc/C4ObjectList.h
- engine/inc/C4ObjectListDlg.h
- engine/inc/C4PacketBase.h
- engine/inc/C4Particles.h
- engine/inc/C4PathFinder.h
- engine/inc/C4Physics.h
- engine/inc/C4Player.h
- engine/inc/C4PlayerInfo.h
- engine/inc/C4PlayerInfoListBox.h
- engine/inc/C4PlayerList.h
- engine/inc/C4PropertyDlg.h
- engine/inc/C4Prototypes.h
- engine/inc/C4PXS.h
- engine/inc/C4Random.h
- engine/inc/C4RankSystem.h
- engine/inc/C4Record.h
- engine/inc/C4Region.h
- engine/inc/C4RTF.H
- engine/inc/C4Scenario.h
- engine/inc/C4Scoreboard.h
- engine/inc/C4Script.h
- engine/inc/C4ScriptHost.h
- engine/inc/C4Sector.h
- engine/inc/C4Shape.h
- engine/inc/C4Sky.h
- engine/inc/C4SolidMask.h
- engine/inc/C4SoundSystem.h
- engine/inc/C4Startup.h
- engine/inc/C4StartupAboutDlg.h
- engine/inc/C4StartupMainDlg.h
- engine/inc/C4StartupNetDlg.h
- engine/inc/C4StartupOptionsDlg.h
- engine/inc/C4StartupPlrSelDlg.h
- engine/inc/C4StartupScenSelDlg.h
- engine/inc/C4Stat.h
- engine/inc/C4StringTable.h
- engine/inc/C4SurfaceFile.h
- engine/inc/C4Surface.h
- engine/inc/C4Teams.h
- engine/inc/C4Texture.h
- engine/inc/C4ToolsDlg.h
- engine/inc/C4TransferZone.h
- engine/inc/C4UpdateDlg.h
- engine/inc/C4UpperBoard.h
- engine/inc/C4UserMessages.h
- engine/inc/C4Value.h
- engine/inc/C4ValueList.h
- engine/inc/C4ValueMap.h
- engine/inc/C4Version.h
- engine/inc/C4Video.h
- engine/inc/C4VideoPlayback.h
- engine/inc/C4Viewport.h
- engine/inc/C4Weather.h
- engine/inc/C4RoundResults.h
- engine/src/C4RoundResults.cpp
- engine/res/Brush.h
- engine/res/c4x.xpm
- engine/res/Cursor.h
- engine/res/Dynamic.h
- engine/res/Exact.h
- engine/res/Fill.h
- engine/res/Halt.h
- engine/res/Ift.h
- engine/res/Line.h
- engine/res/Mouse.h
- engine/res/NoIft.h
- engine/res/Picker.h
- engine/res/Play.h
- engine/res/Rect.h
- engine/res/Static.h
- engine/src/C4PropList.cpp
- engine/inc/C4PropList.h
-)
-
-add_executable(c4group
- group/c4group_ng.cpp
- engine/src/C4Group.cpp
- engine/src/C4InputValidation.cpp
- engine/sec/C4SecurityCertificates.cpp
- engine/src/C4Update.cpp
- engine/inc/C4Update.h
- engine/inc/C4Group.h
- engine/inc/C4Version.h
- standard/src/Standard.cpp
- standard/src/CStdFile.cpp
- standard/src/StdMarkup.cpp
- standard/src/StdBuf.cpp
- standard/src/StdCompiler.cpp
- standard/src/StdFile.cpp
- standard/src/StdRegistry.cpp
- standard/src/StdResStr2.cpp
- standard/src/StdConfig.cpp
- standard/zlib/gzio.c
- standard/zlib/zutil.h
+set(OC_CLONK_SOURCES
+ src/C4Application.cpp
+ src/C4Application.h
+ src/C4FullScreen.cpp
+ src/C4FullScreen.h
+ src/C4Game.cpp
+ src/C4Game.h
+ src/C4GraphicsSystem.cpp
+ src/C4GraphicsSystem.h
+ src/c4group/C4Components.h
+ src/c4group/C4Extra.cpp
+ src/c4group/C4Extra.h
+ src/c4group/C4Group.cpp
+ src/c4group/C4Group.h
+ src/c4group/C4GroupSet.cpp
+ src/c4group/C4GroupSet.h
+ src/c4group/C4Language.cpp
+ src/c4group/C4Language.h
+ src/c4group/C4Update.cpp
+ src/c4group/C4Update.h
+ src/c4group/CStdFile.cpp
+ src/c4group/CStdFile.h
+ src/C4Include.h
+ src/C4Prototypes.h
+ src/C4Version.h
+ src/C4WinMain.cpp
+ src/config/C4Config.cpp
+ src/config/C4Config.h
+ src/config/C4ConfigShareware.cpp
+ src/config/C4ConfigShareware.h
+ src/config/C4SecurityCertificates.cpp
+ src/config/C4SecurityCertificates.h
+ src/control/C4Control.cpp
+ src/control/C4Control.h
+ src/control/C4GameControl.cpp
+ src/control/C4GameControl.h
+ src/control/C4GameParameters.cpp
+ src/control/C4GameParameters.h
+ src/control/C4GameSave.cpp
+ src/control/C4GameSave.h
+ src/control/C4PlayerControl.cpp
+ src/control/C4PlayerControl.h
+ src/control/C4PlayerInfoConflicts.cpp
+ src/control/C4PlayerInfo.cpp
+ src/control/C4PlayerInfo.h
+ src/control/C4Record.cpp
+ src/control/C4Record.h
+ src/control/C4RoundResults.cpp
+ src/control/C4RoundResults.h
+ src/control/C4Teams.cpp
+ src/control/C4Teams.h
+ src/editor/C4Console.cpp
+ 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/C4PropertyDlg.cpp
+ src/editor/C4PropertyDlg.h
+ src/editor/C4ToolsDlg.cpp
+ src/editor/C4ToolsDlg.h
+ src/game/C4Constants.h
+ src/game/C4GameVersion.h
+ src/game/C4Physics.h
+ src/game/landscape/C4Landscape.cpp
+ src/game/landscape/C4Landscape.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/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/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/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/C4Script.cpp
+ src/game/script/C4Script.h
+ src/game/script/C4TransferZone.cpp
+ src/game/script/C4TransferZone.h
+ src/gui/C4ChatDlg.cpp
+ src/gui/C4ChatDlg.h
+ src/gui/C4DownloadDlg.cpp
+ src/gui/C4DownloadDlg.h
+ src/gui/C4FileSelDlg.cpp
+ src/gui/C4FileSelDlg.h
+ src/gui/C4Folder.cpp
+ src/gui/C4Folder.h
+ src/gui/C4GameDialogs.cpp
+ src/gui/C4GameDialogs.h
+ src/gui/C4GameLobby.cpp
+ src/gui/C4GameLobby.h
+ src/gui/C4GameMessage.cpp
+ src/gui/C4GameMessage.h
+ src/gui/C4GameOptions.cpp
+ src/gui/C4GameOptions.h
+ src/gui/C4GameOverDlg.cpp
+ src/gui/C4GameOverDlg.h
+ src/gui/C4GuiButton.cpp
+ src/gui/C4GuiCheckBox.cpp
+ src/gui/C4GuiComboBox.cpp
+ src/gui/C4GuiContainers.cpp
+ src/gui/C4Gui.cpp
+ src/gui/C4GuiDialogs.cpp
+ src/gui/C4GuiEdit.cpp
+ src/gui/C4Gui.h
+ src/gui/C4GuiLabels.cpp
+ src/gui/C4GuiListBox.cpp
+ src/gui/C4GuiMenu.cpp
+ src/gui/C4GuiTabular.cpp
+ src/gui/C4KeyboardInput.cpp
+ src/gui/C4KeyboardInput.h
+ src/gui/C4LoaderScreen.cpp
+ src/gui/C4LoaderScreen.h
+ src/gui/C4MainMenu.cpp
+ src/gui/C4MainMenu.h
+ src/gui/C4Menu.cpp
+ src/gui/C4Menu.h
+ src/gui/C4MessageBoard.cpp
+ src/gui/C4MessageBoard.h
+ src/gui/C4MessageInput.cpp
+ src/gui/C4MessageInput.h
+ src/gui/C4MouseControl.cpp
+ src/gui/C4MouseControl.h
+ src/gui/C4PlayerInfoListBox.cpp
+ src/gui/C4PlayerInfoListBox.h
+ src/gui/C4Scoreboard.cpp
+ src/gui/C4Scoreboard.h
+ src/gui/C4StartupAboutDlg.cpp
+ src/gui/C4StartupAboutDlg.h
+ src/gui/C4Startup.cpp
+ src/gui/C4Startup.h
+ src/gui/C4StartupMainDlg.cpp
+ src/gui/C4StartupMainDlg.h
+ src/gui/C4StartupNetDlg.cpp
+ src/gui/C4StartupNetDlg.h
+ src/gui/C4StartupOptionsDlg.cpp
+ src/gui/C4StartupOptionsDlg.h
+ 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/lib/C4ComponentHost.cpp
+ src/lib/C4ComponentHost.h
+ src/lib/C4InputValidation.cpp
+ src/lib/C4InputValidation.h
+ src/lib/C4LangStringTable.cpp
+ src/lib/C4LangStringTable.h
+ src/lib/C4LogBuf.cpp
+ src/lib/C4LogBuf.h
+ src/lib/C4Log.cpp
+ src/lib/C4Log.h
+ src/lib/C4NameList.cpp
+ src/lib/C4NameList.h
+ src/lib/C4Random.cpp
+ src/lib/C4Random.h
+ src/lib/C4RTF.cpp
+ src/lib/C4RTF.H
+ src/lib/C4Stat.cpp
+ src/lib/C4Stat.h
+ src/lib/Fixed.cpp
+ src/lib/Fixed.h
+ src/lib/PathFinder.cpp
+ src/lib/PathFinder.h
+ src/lib/Standard.cpp
+ src/lib/Standard.h
+ src/lib/StdAdaptors.h
+ src/lib/StdBase64.cpp
+ src/lib/StdBase64.h
+ src/lib/StdBuf.cpp
+ src/lib/StdBuf.h
+ src/lib/StdColors.h
+ src/lib/StdCompiler.cpp
+ src/lib/StdCompiler.h
+ src/lib/StdMarkup.cpp
+ src/lib/StdMarkup.h
+ 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/C4Surface.cpp
+ src/lib/texture/C4SurfaceFile.cpp
+ src/lib/texture/C4SurfaceFile.h
+ src/lib/texture/C4Surface.h
+ src/lib/texture/StdPNG.cpp
+ src/lib/texture/StdPNG.h
+ src/network/C4Client.cpp
+ src/network/C4Client.h
+ src/network/C4GameControlNetwork.cpp
+ src/network/C4GameControlNetwork.h
+ src/network/C4InteractiveThread.cpp
+ src/network/C4InteractiveThread.h
+ src/network/C4League.cpp
+ src/network/C4League.h
+ src/network/C4NetIO.cpp
+ src/network/C4NetIO.h
+ src/network/C4Network2Client.cpp
+ src/network/C4Network2Client.h
+ src/network/C4Network2.cpp
+ src/network/C4Network2Dialogs.cpp
+ src/network/C4Network2Dialogs.h
+ src/network/C4Network2Discover.cpp
+ src/network/C4Network2Discover.h
+ src/network/C4Network2.h
+ src/network/C4Network2IO.cpp
+ src/network/C4Network2IO.h
+ src/network/C4Network2IRC.cpp
+ src/network/C4Network2IRC.h
+ src/network/C4Network2Players.cpp
+ src/network/C4Network2Players.h
+ src/network/C4Network2Reference.cpp
+ src/network/C4Network2Reference.h
+ src/network/C4Network2Res.cpp
+ src/network/C4Network2ResDlg.cpp
+ src/network/C4Network2Res.h
+ src/network/C4Network2Stats.cpp
+ src/network/C4Network2Stats.h
+ src/network/C4Packet2.cpp
+ src/network/C4PacketBase.h
+ src/platform/Bitmap256.cpp
+ src/platform/Bitmap256.h
+ src/platform/C4FileClasses.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
+ src/platform/C4MusicFile.h
+ src/platform/C4MusicSystem.cpp
+ src/platform/C4MusicSystem.h
+ src/platform/C4SoundSystem.cpp
+ src/platform/C4SoundSystem.h
+ src/platform/C4Video.cpp
+ src/platform/C4Video.h
+ src/platform/C4VideoPlayback.cpp
+ src/platform/C4VideoPlayback.h
+ src/platform/DInputX.cpp
+ src/platform/DInputX.h
+ src/platform/DSoundX.cpp
+ src/platform/DSoundX.h
+ src/platform/Midi.cpp
+ src/platform/Midi.h
+ src/platform/OpenURL.cpp
+ src/platform/StdConfig.cpp
+ src/platform/StdConfig.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/StdFacet.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/StdSurface2.cpp
+ src/platform/StdSurface2.h
+ src/platform/StdSurface8.cpp
+ src/platform/StdSurface8.h
+ src/platform/StdSync.h
+ src/platform/StdVideo.cpp
+ src/platform/StdVideo.h
+ src/platform/StdWindow.h
+ src/script/C4AList.cpp
+ src/script/C4AList.h
+ src/script/C4Aul.cpp
+ src/script/C4AulExec.cpp
+ src/script/C4Aul.h
+ src/script/C4AulLink.cpp
+ src/script/C4AulParse.cpp
+ src/script/C4PropList.cpp
+ src/script/C4PropList.h
+ src/script/C4ScriptHost.cpp
+ src/script/C4ScriptHost.h
+ src/script/C4StringTable.cpp
+ src/script/C4StringTable.h
+ src/script/C4Value.cpp
+ src/script/C4Value.h
+ src/script/C4ValueList.cpp
+ src/script/C4ValueList.h
+ src/script/C4ValueMap.cpp
+ src/script/C4ValueMap.h
+ src/zlib/gzio.c
+ src/zlib/zutil.h
)
+mark_as_advanced(OC_CLONK_SOURCES)
+mark_as_advanced(OC_SYSTEM_SORUCES)
if(WIN32)
- SET(additional_system_sources
- standard/src/StdWindow.cpp
- standard/src/StdJoystick.cpp
- standard/inc/StdJoystick.h
+ list(APPEND OC_CLONK_SOURCES
+ src/platform/C4FileClasses.cpp
+ src/res/engine.rc
+ src/res/resource.h
+ )
+ list(APPEND OC_SYSTEM_SOURCES
+ src/platform/StdWindow.cpp
+ src/platform/StdJoystick.cpp
+ src/platform/StdJoystick.h
+ src/platform/C4FileClasses.cpp
+ src/res/engine.rc
+ src/res/resource.h
)
elseif(USE_SDL)
- SET(additional_system_sources
- standard/src/StdSDLApp.cpp
- standard/src/StdSDLWindow.cpp
+ list(APPEND OC_SYSTEM_SOURCES
+ src/platform/StdSDLApp.cpp
+ src/platform/StdSDLWindow.cpp
)
elseif(USE_X11)
- SET(additional_system_sources
- standard/src/StdXApp.cpp
- standard/src/StdXWindow.cpp
- standard/src/StdXPrivate.h
+ list(APPEND OC_SYSTEM_SOURCES
+ src/platform/StdXApp.cpp
+ src/platform/StdXWindow.cpp
+ src/platform/StdXPrivate.h
+ )
+endif()
+if(APPLE)
+ list(APPEND OC_SYSTEM_SOURCES
+ src/platform/MacUtility.mm
)
endif()
if(USE_GTK)
- SET(additional_system_sources
- ${additional_system_sources}
- standard/src/StdGtkWindow.cpp
- standard/inc/StdGtkWindow.h
+ list(APPEND OC_CLONK_SOURCES
+ src/res/Brush.h
+ src/res/Cursor.h
+ src/res/Dynamic.h
+ src/res/Exact.h
+ src/res/Fill.h
+ src/res/Halt.h
+ src/res/Ift.h
+ src/res/Line.h
+ src/res/Mouse.h
+ src/res/NoIft.h
+ src/res/Picker.h
+ src/res/Play.h
+ src/res/Rect.h
+ src/res/resource.h
+ src/res/Static.h
+ )
+
+ list(APPEND OC_SYSTEM_SOURCES
+ src/platform/StdGtkWindow.cpp
+ src/platform/StdGtkWindow.h
)
endif()
-add_library(standard STATIC
- ${additional_system_sources}
- standard/src/Bitmap256.cpp
- standard/src/CStdFile.cpp
- standard/src/Fixed.cpp
- standard/src/Midi.cpp
- standard/src/OpenURL.cpp
- standard/src/PathFinder.cpp
- standard/src/Standard.cpp
- standard/src/StdBase64.cpp
- standard/src/StdBuf.cpp
- standard/src/StdConfig.cpp
- standard/src/StdCompiler.cpp
- standard/src/StdD3D.cpp
- standard/src/StdD3DShader.cpp
- standard/src/StdDDraw2.cpp
- standard/src/StdFile.cpp
- standard/src/StdFont.cpp
- standard/src/StdGL.cpp
- standard/src/StdGLCtx.cpp
- standard/src/StdMarkup.cpp
- standard/src/StdNoGfx.cpp
- standard/src/StdPNG.cpp
- standard/src/StdRegistry.cpp
- standard/src/StdResStr2.cpp
- standard/src/StdScheduler.cpp
- standard/src/StdSurface2.cpp
- standard/src/StdSurface8.cpp
- standard/src/StdVideo.cpp
- standard/inc/Bitmap256.h
- standard/inc/CStdFile.h
- standard/inc/DInputX.h
- standard/inc/DSoundX.h
- standard/inc/Fixed.h
- standard/inc/Midi.h
- standard/inc/PathFinder.h
- standard/inc/Standard.h
- standard/inc/StdAdaptors.h
- standard/inc/StdBase64.h
- standard/inc/StdBuf.h
- standard/inc/StdColors.h
- standard/inc/StdConfig.h
- standard/inc/StdCompiler.h
- standard/inc/StdD3D.h
- standard/inc/StdD3DShader.h
- standard/inc/StdDDraw2.h
- standard/inc/StdFacet.h
- standard/inc/StdFile.h
- standard/inc/StdFont.h
- standard/inc/StdGL.h
- standard/inc/StdMarkup.h
- standard/inc/StdNoGfx.h
- standard/inc/StdPNG.h
- standard/inc/StdRandom.h
- standard/inc/StdRegistry.h
- standard/inc/StdResStr2.h
- standard/inc/StdResStr.h
- standard/inc/StdScheduler.h
- standard/inc/StdSurface2.h
- standard/inc/StdSurface8.h
- standard/inc/StdSync.h
- standard/inc/StdVideo.h
- standard/inc/StdWindow.h
- standard/zlib/gzio.c
- standard/zlib/zutil.h
+
+add_executable(clonk WIN32 MACOSX_BUNDLE
+ ${OC_CLONK_SOURCES}
+ ${OC_SYSTEM_SOURCES}
+)
+
+source_group("Unsorted" .*)
+source_group("Library\\Platform abstraction" src/platform/.*)
+source_group("Library\\Utility" src/lib/.*)
+source_group("Library\\C4Group" src/c4group/.*)
+source_group("Library\\Graphics" src/lib/texture/.*)
+source_group("GUI" src/gui/.*)
+source_group("Network" src/network/.*)
+source_group("Game\\Objects" src/game/object/.*)
+source_group("Game\\Scenario" src/game/landscape/.*)
+source_group("Game\\Player" src/game/player/.*)
+source_group("Game\\Script" src/game/script/.*)
+source_group("Scripting" src/script/.*)
+source_group("Config" src/config/.*)
+source_group("Control" src/control/.*)
+source_group("Editing" src/editor/.*)
+
+add_executable(c4group
+ src/c4group/c4group_ng.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
+ src/lib/StdMarkup.cpp
+ src/lib/StdBuf.cpp
+ src/lib/StdCompiler.cpp
+ src/platform/StdFile.cpp
+ src/platform/StdRegistry.cpp
+ src/lib/StdResStr2.cpp
+ src/platform/StdConfig.cpp
+ src/zlib/gzio.c
)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/standard
- ${CMAKE_CURRENT_SOURCE_DIR}/standard/inc
- ${CMAKE_CURRENT_SOURCE_DIR}/engine/inc
- ${CMAKE_CURRENT_SOURCE_DIR}/engine/sec
- ${CMAKE_CURRENT_SOURCE_DIR}/engine
+ ${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/script
)
-target_link_libraries(clonk standard)
-set_property(TARGET clonk standard APPEND PROPERTY COMPILE_DEFINITIONS C4ENGINE GLEW_STATIC)
+set_property(TARGET clonk APPEND PROPERTY COMPILE_DEFINITIONS C4ENGINE GLEW_STATIC)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
include(CheckIncludeFileCXX)
CHECK_INCLUDE_FILE_CXX(direct.h HAVE_DIRECT_H)
diff --git a/Makefile.am b/Makefile.am
index dd5262546..4f13078d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,6 @@ bin_PROGRAMS = clonk
EXTRA_PROGRAMS = tstc4netio puncher c4group gunzip4c4group
-noinst_LIBRARIES = libstandard.a
-
# Some defines and warning options
if RECENT_GCC
GCC_FLAGS = -pipe
@@ -42,11 +40,23 @@ AM_CFLAGS = -Wall $(GCC_FLAGS)
AM_CPPFLAGS = \
-I$(builddir) \
- -I$(srcdir)/standard \
- -I$(srcdir)/standard/inc \
- -I$(srcdir)/engine \
- -I$(srcdir)/engine/inc \
- -I$(srcdir)/engine/sec \
+ -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 \
-DC4ENGINE \
$(GLEW_CFLAGS) $(GTK_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS)
@@ -58,11 +68,10 @@ DISTCLEANFILES = @am__quote@$(DEPDIR)/C4Include.Po@am__quote@
# Adapted from the automake compile-command for normal source files.
# Has to be updated after certain changes in this file.
-C4Include.h.gch: engine/inc/C4Include.h
-@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.h.gch$$||'`;\
-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -x c++-header -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -x c++-header -c -o $@ $<
+C4Include.h.gch: src/C4Include.h
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -x c++-header -MT C4Include.h.gch -MD -MP -MF $(DEPDIR)/C4Include.Tpo -c -o $@ $(srcdir)/src/C4Include.h
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/C4Include.Tpo $(DEPDIR)/C4Include.Po
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -x c++-header -c -o $@ $(srcdir)/src/C4Include.h
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/C4Include.Po@am__quote@
@@ -75,330 +84,405 @@ WARNING_FLAGS += -Winvalid-pch
endif
clonk_SOURCES = \
- engine/src/C4AList.cpp \
- engine/src/C4Action.cpp \
- engine/src/C4Application.cpp \
- engine/src/C4Aul.cpp \
- engine/src/C4AulExec.cpp \
- engine/src/C4AulLink.cpp \
- engine/src/C4AulParse.cpp \
- engine/src/C4ChatDlg.cpp \
- engine/src/C4Client.cpp \
- engine/src/C4Command.cpp \
- engine/src/C4ComponentHost.cpp \
- engine/src/C4Config.cpp \
- engine/src/C4Console.cpp \
- engine/src/C4Control.cpp \
- engine/src/C4Def.cpp \
- engine/src/C4DefGraphics.cpp \
- engine/src/C4DevmodeDlg.cpp \
- engine/src/C4DownloadDlg.cpp \
- engine/src/C4EditCursor.cpp \
- engine/src/C4Effect.cpp \
- engine/src/C4Extra.cpp \
- engine/src/C4Facet.cpp \
- engine/src/C4FacetEx.cpp \
- engine/src/C4FindObject.cpp \
- engine/src/C4FileMonitor.cpp \
- engine/src/C4FileSelDlg.cpp \
- engine/src/C4Folder.cpp \
- engine/src/C4Fonts.cpp \
- engine/src/C4FullScreen.cpp \
- engine/src/C4Game.cpp \
- engine/src/C4GameControl.cpp \
- engine/src/C4GameControlNetwork.cpp \
- engine/src/C4GameDialogs.cpp \
- engine/src/C4GameLobby.cpp \
- engine/src/C4GameMessage.cpp \
- engine/src/C4GameObjects.cpp \
- engine/src/C4GameOptions.cpp \
- engine/src/C4GameOverDlg.cpp \
- engine/src/C4GamePadCon.cpp \
- engine/src/C4GameParameters.cpp \
- engine/src/C4GameSave.cpp \
- engine/src/C4GraphicsResource.cpp \
- engine/src/C4GraphicsSystem.cpp \
- engine/src/C4Group.cpp \
- engine/src/C4GroupSet.cpp \
- engine/src/C4Gui.cpp \
- engine/src/C4GuiButton.cpp \
- engine/src/C4GuiCheckBox.cpp \
- engine/src/C4GuiComboBox.cpp \
- engine/src/C4GuiContainers.cpp \
- engine/src/C4GuiDialogs.cpp \
- engine/src/C4GuiEdit.cpp \
- engine/src/C4GuiLabels.cpp \
- engine/src/C4GuiListBox.cpp \
- engine/src/C4GuiMenu.cpp \
- engine/src/C4GuiTabular.cpp \
- engine/src/C4IDList.cpp \
- engine/src/C4Id.cpp \
- engine/src/C4InfoCore.cpp \
- engine/src/C4InputValidation.cpp \
- engine/src/C4InteractiveThread.cpp \
- engine/src/C4KeyboardInput.cpp \
- engine/src/C4Landscape.cpp \
- engine/src/C4LangStringTable.cpp \
- engine/src/C4Language.cpp \
- engine/src/C4League.cpp \
- engine/src/C4LoaderScreen.cpp \
- engine/src/C4Log.cpp \
- engine/src/C4LogBuf.cpp \
- engine/src/C4MainMenu.cpp \
- engine/src/C4Map.cpp \
- engine/src/C4MapCreatorS2.cpp \
- engine/src/C4MassMover.cpp \
- engine/src/C4Material.cpp \
- engine/src/C4MaterialList.cpp \
- engine/src/C4Menu.cpp \
- engine/src/C4MessageBoard.cpp \
- engine/src/C4MessageInput.cpp \
- engine/src/C4MouseControl.cpp \
- engine/src/C4Movement.cpp \
- engine/src/C4MusicFile.cpp \
- engine/src/C4MusicSystem.cpp \
- engine/src/C4NameList.cpp \
- engine/src/C4NetIO.cpp \
- engine/src/C4Network2.cpp \
- engine/src/C4Network2Client.cpp \
- engine/src/C4Network2Dialogs.cpp \
- engine/src/C4Network2Discover.cpp \
- engine/src/C4Network2IO.cpp \
- engine/src/C4Network2IRC.cpp \
- engine/src/C4Network2Players.cpp \
- engine/src/C4Network2Reference.cpp \
- engine/src/C4Network2Res.cpp \
- engine/src/C4Network2ResDlg.cpp \
- engine/src/C4Network2Stats.cpp \
- engine/src/C4Object.cpp \
- engine/src/C4ObjectCom.cpp \
- engine/src/C4ObjectMenu.cpp \
- engine/src/C4ObjectInfo.cpp \
- engine/src/C4ObjectInfoList.cpp \
- engine/src/C4ObjectList.cpp \
- engine/src/C4ObjectListDlg.cpp \
- engine/src/C4PXS.cpp \
- engine/src/C4Packet2.cpp \
- engine/src/C4Particles.cpp \
- engine/src/C4PathFinder.cpp \
- engine/src/C4Player.cpp \
- engine/src/C4PlayerInfo.cpp \
- engine/src/C4PlayerInfoConflicts.cpp \
- engine/src/C4PlayerInfoListBox.cpp \
- engine/src/C4PlayerList.cpp \
- engine/src/C4PropertyDlg.cpp \
- engine/src/C4Random.cpp \
- engine/src/C4RankSystem.cpp \
- engine/src/C4Record.cpp \
- engine/src/C4Region.cpp \
- engine/src/C4RTF.cpp \
- engine/src/C4Scenario.cpp \
- engine/src/C4Scoreboard.cpp \
- engine/src/C4Script.cpp \
- engine/src/C4ScriptHost.cpp \
- engine/src/C4Sector.cpp \
- engine/src/C4Shape.cpp \
- engine/src/C4Sky.cpp \
- engine/src/C4SolidMask.cpp \
- engine/src/C4SoundSystem.cpp \
- engine/src/C4Startup.cpp \
- engine/src/C4StartupAboutDlg.cpp \
- engine/src/C4StartupMainDlg.cpp \
- engine/src/C4StartupNetDlg.cpp \
- engine/src/C4StartupOptionsDlg.cpp \
- engine/src/C4StartupPlrSelDlg.cpp \
- engine/src/C4StartupScenSelDlg.cpp \
- engine/src/C4Stat.cpp \
- engine/src/C4StringTable.cpp \
- engine/src/C4Surface.cpp \
- engine/src/C4SurfaceFile.cpp \
- engine/src/C4Teams.cpp \
- engine/src/C4Texture.cpp \
- engine/src/C4ToolsDlg.cpp \
- engine/src/C4TransferZone.cpp \
- engine/src/C4UpdateDlg.cpp \
- engine/src/C4UpperBoard.cpp \
- engine/src/C4Value.cpp \
- engine/src/C4ValueList.cpp \
- engine/src/C4ValueMap.cpp \
- engine/src/C4Video.cpp \
- engine/src/C4VideoPlayback.cpp \
- engine/src/C4Viewport.cpp \
- engine/src/C4Weather.cpp \
- engine/src/C4WinMain.cpp \
- engine/sec/C4ConfigShareware.cpp \
- engine/sec/C4ConfigShareware.h \
- engine/sec/C4SecurityCertificates.cpp \
- engine/sec/C4SecurityCertificates.h \
- engine/inc/C4AList.h \
- engine/inc/C4Application.h \
- engine/inc/C4Aul.h \
- engine/inc/C4ChatDlg.h \
- engine/inc/C4Command.h \
- engine/inc/C4Client.h \
- engine/inc/C4ComponentHost.h \
- engine/inc/C4Components.h \
- engine/inc/C4Config.h \
- engine/inc/C4Console.h \
- engine/inc/C4Constants.h \
- engine/inc/C4Control.h \
- engine/inc/C4DefGraphics.h \
- engine/inc/C4Def.h \
- engine/inc/C4DevmodeDlg.h \
- engine/inc/C4DownloadDlg.h \
- engine/inc/C4EditCursor.h \
- engine/inc/C4Effects.h \
- engine/inc/C4Extra.h \
- engine/inc/C4FacetEx.h \
- engine/inc/C4Facet.h \
- engine/inc/C4FileClasses.h \
- engine/inc/C4FileMonitor.h \
- engine/inc/C4FileSelDlg.h \
- engine/inc/C4FindObject.h \
- engine/inc/C4Folder.h \
- engine/inc/C4Fonts.h \
- engine/inc/C4FullScreen.h \
- engine/inc/C4Game.h \
- engine/inc/C4GameControl.h \
- engine/inc/C4GameControlNetwork.h \
- engine/inc/C4GameDialogs.h \
- engine/inc/C4GameLobby.h \
- engine/inc/C4GameMessage.h \
- engine/inc/C4GameObjects.h \
- engine/inc/C4GameOptions.h \
- engine/inc/C4GameOverDlg.h \
- engine/inc/C4GamePadCon.h \
- engine/inc/C4GameParameters.h \
- engine/inc/C4GameSave.h \
- engine/inc/C4GameVersion.h \
- engine/inc/C4GraphicsResource.h \
- engine/inc/C4GraphicsSystem.h \
- engine/inc/C4Group.h \
- engine/inc/C4GroupSet.h \
- engine/inc/C4Gui.h \
- engine/inc/C4Id.h \
- engine/inc/C4IDList.h \
- engine/inc/C4Include.h \
- engine/inc/C4InfoCore.h \
- engine/inc/C4InputValidation.h \
- engine/inc/C4InteractiveThread.h \
- engine/inc/C4KeyboardInput.h \
- engine/inc/C4Landscape.h \
- engine/inc/C4LangStringTable.h \
- engine/inc/C4Language.h \
- engine/inc/C4League.h \
- engine/inc/C4LoaderScreen.h \
- engine/inc/C4LogBuf.h \
- engine/inc/C4Log.h \
- engine/inc/C4MainMenu.h \
- engine/inc/C4MapCreatorS2.h \
- engine/inc/C4Map.h \
- engine/inc/C4MassMover.h \
- engine/inc/C4Material.h \
- engine/inc/C4MaterialList.h \
- engine/inc/C4Menu.h \
- engine/inc/C4MessageBoard.h \
- engine/inc/C4MessageInput.h \
- engine/inc/C4MouseControl.h \
- engine/inc/C4MusicFile.h \
- engine/inc/C4MusicSystem.h \
- engine/inc/C4NameList.h \
- engine/inc/C4NetIO.h \
- engine/inc/C4Network2Client.h \
- engine/inc/C4Network2Dialogs.h \
- engine/inc/C4Network2Discover.h \
- engine/inc/C4Network2.h \
- engine/inc/C4Network2IO.h \
- engine/inc/C4Network2IRC.h \
- engine/inc/C4Network2Players.h \
- engine/inc/C4Network2Reference.h \
- engine/inc/C4Network2Res.h \
- engine/inc/C4Network2Stats.h \
- engine/inc/C4ObjectCom.h \
- engine/inc/C4Object.h \
- engine/inc/C4ObjectInfo.h \
- engine/inc/C4ObjectInfoList.h \
- engine/inc/C4ObjectMenu.h \
- engine/inc/C4ObjectList.h \
- engine/inc/C4ObjectListDlg.h \
- engine/inc/C4PacketBase.h \
- engine/inc/C4Particles.h \
- engine/inc/C4PathFinder.h \
- engine/inc/C4Physics.h \
- engine/inc/C4Player.h \
- engine/inc/C4PlayerInfo.h \
- engine/inc/C4PlayerInfoListBox.h \
- engine/inc/C4PlayerList.h \
- engine/inc/C4PropertyDlg.h \
- engine/inc/C4Prototypes.h \
- engine/inc/C4PXS.h \
- engine/inc/C4Random.h \
- engine/inc/C4RankSystem.h \
- engine/inc/C4Record.h \
- engine/inc/C4Region.h \
- engine/inc/C4RTF.H \
- engine/inc/C4Scenario.h \
- engine/inc/C4Scoreboard.h \
- engine/inc/C4Script.h \
- engine/inc/C4ScriptHost.h \
- engine/inc/C4Sector.h \
- engine/inc/C4Shape.h \
- engine/inc/C4Sky.h \
- engine/inc/C4SolidMask.h \
- engine/inc/C4SoundSystem.h \
- engine/inc/C4Startup.h \
- engine/inc/C4StartupAboutDlg.h \
- engine/inc/C4StartupMainDlg.h \
- engine/inc/C4StartupNetDlg.h \
- engine/inc/C4StartupOptionsDlg.h \
- engine/inc/C4StartupPlrSelDlg.h \
- engine/inc/C4StartupScenSelDlg.h \
- engine/inc/C4Stat.h \
- engine/inc/C4StringTable.h \
- engine/inc/C4SurfaceFile.h \
- engine/inc/C4Surface.h \
- engine/inc/C4Teams.h \
- engine/inc/C4Texture.h \
- engine/inc/C4ToolsDlg.h \
- engine/inc/C4TransferZone.h \
- engine/inc/C4UpdateDlg.h \
- engine/inc/C4UpperBoard.h \
- engine/inc/C4UserMessages.h \
- engine/inc/C4Value.h \
- engine/inc/C4ValueList.h \
- engine/inc/C4ValueMap.h \
- engine/inc/C4Version.h \
- engine/inc/C4Video.h \
- engine/inc/C4VideoPlayback.h \
- engine/inc/C4Viewport.h \
- engine/inc/C4Weather.h \
- engine/inc/C4RoundResults.h \
- engine/src/C4RoundResults.cpp \
- engine/res/Brush.h \
- engine/res/c4x.xpm \
- engine/res/Cursor.h \
- engine/res/Dynamic.h \
- engine/res/Exact.h \
- engine/res/Fill.h \
- engine/res/Halt.h \
- engine/res/Ift.h \
- engine/res/Line.h \
- engine/res/Mouse.h \
- engine/res/NoIft.h \
- engine/res/Picker.h \
- engine/res/Play.h \
- engine/res/Rect.h \
- engine/res/Static.h \
- engine/src/C4PropList.cpp \
- engine/inc/C4PropList.h
+src/C4Application.cpp \
+src/C4Application.h \
+src/C4FullScreen.cpp \
+src/C4FullScreen.h \
+src/C4Game.cpp \
+src/C4Game.h \
+src/C4GraphicsSystem.cpp \
+src/C4GraphicsSystem.h \
+src/c4group/C4Components.h \
+src/c4group/C4Extra.cpp \
+src/c4group/C4Extra.h \
+src/c4group/C4Group.cpp \
+src/c4group/C4Group.h \
+src/c4group/C4GroupSet.cpp \
+src/c4group/C4GroupSet.h \
+src/c4group/C4Language.cpp \
+src/c4group/C4Language.h \
+src/c4group/C4Update.cpp \
+src/c4group/C4Update.h \
+src/c4group/CStdFile.cpp \
+src/c4group/CStdFile.h \
+src/C4Include.h \
+src/C4Prototypes.h \
+src/C4Version.h \
+src/C4WinMain.cpp \
+src/config/C4Config.cpp \
+src/config/C4Config.h \
+src/config/C4ConfigShareware.cpp \
+src/config/C4ConfigShareware.h \
+src/config/C4SecurityCertificates.cpp \
+src/config/C4SecurityCertificates.h \
+src/control/C4Control.cpp \
+src/control/C4Control.h \
+src/control/C4GameControl.cpp \
+src/control/C4GameControl.h \
+src/control/C4GameParameters.cpp \
+src/control/C4GameParameters.h \
+src/control/C4GameSave.cpp \
+src/control/C4GameSave.h \
+src/control/C4PlayerInfoConflicts.cpp \
+src/control/C4PlayerInfo.cpp \
+src/control/C4PlayerInfo.h \
+src/control/C4Record.cpp \
+src/control/C4Record.h \
+src/control/C4RoundResults.cpp \
+src/control/C4RoundResults.h \
+src/control/C4Teams.cpp \
+src/control/C4Teams.h \
+src/editor/C4Console.cpp \
+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/C4PropertyDlg.cpp \
+src/editor/C4PropertyDlg.h \
+src/editor/C4ToolsDlg.cpp \
+src/editor/C4ToolsDlg.h \
+src/game/C4Constants.h \
+src/game/C4GameVersion.h \
+src/game/C4Physics.h \
+src/game/landscape/C4Landscape.cpp \
+src/game/landscape/C4Landscape.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/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/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/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/C4Script.cpp \
+src/game/script/C4Script.h \
+src/game/script/C4TransferZone.cpp \
+src/game/script/C4TransferZone.h \
+src/gui/C4ChatDlg.cpp \
+src/gui/C4ChatDlg.h \
+src/gui/C4DownloadDlg.cpp \
+src/gui/C4DownloadDlg.h \
+src/gui/C4FileSelDlg.cpp \
+src/gui/C4FileSelDlg.h \
+src/gui/C4Folder.cpp \
+src/gui/C4Folder.h \
+src/gui/C4GameDialogs.cpp \
+src/gui/C4GameDialogs.h \
+src/gui/C4GameLobby.cpp \
+src/gui/C4GameLobby.h \
+src/gui/C4GameMessage.cpp \
+src/gui/C4GameMessage.h \
+src/gui/C4GameOptions.cpp \
+src/gui/C4GameOptions.h \
+src/gui/C4GameOverDlg.cpp \
+src/gui/C4GameOverDlg.h \
+src/gui/C4GuiButton.cpp \
+src/gui/C4GuiCheckBox.cpp \
+src/gui/C4GuiComboBox.cpp \
+src/gui/C4GuiContainers.cpp \
+src/gui/C4Gui.cpp \
+src/gui/C4GuiDialogs.cpp \
+src/gui/C4GuiEdit.cpp \
+src/gui/C4Gui.h \
+src/gui/C4GuiLabels.cpp \
+src/gui/C4GuiListBox.cpp \
+src/gui/C4GuiMenu.cpp \
+src/gui/C4GuiTabular.cpp \
+src/gui/C4KeyboardInput.cpp \
+src/gui/C4KeyboardInput.h \
+src/gui/C4LoaderScreen.cpp \
+src/gui/C4LoaderScreen.h \
+src/gui/C4MainMenu.cpp \
+src/gui/C4MainMenu.h \
+src/gui/C4Menu.cpp \
+src/gui/C4Menu.h \
+src/gui/C4MessageBoard.cpp \
+src/gui/C4MessageBoard.h \
+src/gui/C4MessageInput.cpp \
+src/gui/C4MessageInput.h \
+src/gui/C4MouseControl.cpp \
+src/gui/C4MouseControl.h \
+src/gui/C4PlayerInfoListBox.cpp \
+src/gui/C4PlayerInfoListBox.h \
+src/gui/C4Scoreboard.cpp \
+src/gui/C4Scoreboard.h \
+src/gui/C4StartupAboutDlg.cpp \
+src/gui/C4StartupAboutDlg.h \
+src/gui/C4Startup.cpp \
+src/gui/C4Startup.h \
+src/gui/C4StartupMainDlg.cpp \
+src/gui/C4StartupMainDlg.h \
+src/gui/C4StartupNetDlg.cpp \
+src/gui/C4StartupNetDlg.h \
+src/gui/C4StartupOptionsDlg.cpp \
+src/gui/C4StartupOptionsDlg.h \
+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/lib/C4ComponentHost.cpp \
+src/lib/C4ComponentHost.h \
+src/lib/C4InputValidation.cpp \
+src/lib/C4InputValidation.h \
+src/lib/C4LangStringTable.cpp \
+src/lib/C4LangStringTable.h \
+src/lib/C4LogBuf.cpp \
+src/lib/C4LogBuf.h \
+src/lib/C4Log.cpp \
+src/lib/C4Log.h \
+src/lib/C4NameList.cpp \
+src/lib/C4NameList.h \
+src/lib/C4Random.cpp \
+src/lib/C4Random.h \
+src/lib/C4RTF.cpp \
+src/lib/C4RTF.H \
+src/lib/C4Stat.cpp \
+src/lib/C4Stat.h \
+src/lib/Fixed.cpp \
+src/lib/Fixed.h \
+src/lib/PathFinder.cpp \
+src/lib/PathFinder.h \
+src/lib/Standard.cpp \
+src/lib/Standard.h \
+src/lib/StdAdaptors.h \
+src/lib/StdBase64.cpp \
+src/lib/StdBase64.h \
+src/lib/StdBuf.cpp \
+src/lib/StdBuf.h \
+src/lib/StdColors.h \
+src/lib/StdCompiler.cpp \
+src/lib/StdCompiler.h \
+src/lib/StdMarkup.cpp \
+src/lib/StdMarkup.h \
+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/C4Surface.cpp \
+src/lib/texture/C4SurfaceFile.cpp \
+src/lib/texture/C4SurfaceFile.h \
+src/lib/texture/C4Surface.h \
+src/lib/texture/StdPNG.cpp \
+src/lib/texture/StdPNG.h \
+src/network/C4Client.cpp \
+src/network/C4Client.h \
+src/network/C4GameControlNetwork.cpp \
+src/network/C4GameControlNetwork.h \
+src/network/C4InteractiveThread.cpp \
+src/network/C4InteractiveThread.h \
+src/network/C4League.cpp \
+src/network/C4League.h \
+src/network/C4NetIO.cpp \
+src/network/C4NetIO.h \
+src/network/C4Network2Client.cpp \
+src/network/C4Network2Client.h \
+src/network/C4Network2.cpp \
+src/network/C4Network2Dialogs.cpp \
+src/network/C4Network2Dialogs.h \
+src/network/C4Network2Discover.cpp \
+src/network/C4Network2Discover.h \
+src/network/C4Network2.h \
+src/network/C4Network2IO.cpp \
+src/network/C4Network2IO.h \
+src/network/C4Network2IRC.cpp \
+src/network/C4Network2IRC.h \
+src/network/C4Network2Players.cpp \
+src/network/C4Network2Players.h \
+src/network/C4Network2Reference.cpp \
+src/network/C4Network2Reference.h \
+src/network/C4Network2Res.cpp \
+src/network/C4Network2ResDlg.cpp \
+src/network/C4Network2Res.h \
+src/network/C4Network2Stats.cpp \
+src/network/C4Network2Stats.h \
+src/network/C4Packet2.cpp \
+src/network/C4PacketBase.h \
+src/platform/Bitmap256.cpp \
+src/platform/Bitmap256.h \
+src/platform/C4FileClasses.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 \
+src/platform/C4MusicFile.h \
+src/platform/C4MusicSystem.cpp \
+src/platform/C4MusicSystem.h \
+src/platform/C4SoundSystem.cpp \
+src/platform/C4SoundSystem.h \
+src/platform/C4Video.cpp \
+src/platform/C4Video.h \
+src/platform/C4VideoPlayback.cpp \
+src/platform/C4VideoPlayback.h \
+src/platform/DInputX.cpp \
+src/platform/DInputX.h \
+src/platform/DSoundX.cpp \
+src/platform/DSoundX.h \
+src/platform/Midi.cpp \
+src/platform/Midi.h \
+src/platform/OpenURL.cpp \
+src/platform/StdConfig.cpp \
+src/platform/StdConfig.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/StdFacet.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/StdSurface2.cpp \
+src/platform/StdSurface2.h \
+src/platform/StdSurface8.cpp \
+src/platform/StdSurface8.h \
+src/platform/StdSync.h \
+src/platform/StdVideo.cpp \
+src/platform/StdVideo.h \
+src/platform/StdWindow.h \
+src/res/Brush.h \
+src/res/Cursor.h \
+src/res/Dynamic.h \
+src/res/Exact.h \
+src/res/Fill.h \
+src/res/Halt.h \
+src/res/Ift.h \
+src/res/Line.h \
+src/res/Mouse.h \
+src/res/NoIft.h \
+src/res/Picker.h \
+src/res/Play.h \
+src/res/Rect.h \
+src/res/resource.h \
+src/res/Static.h \
+src/script/C4AList.cpp \
+src/script/C4AList.h \
+src/script/C4Aul.cpp \
+src/script/C4AulExec.cpp \
+src/script/C4Aul.h \
+src/script/C4AulLink.cpp \
+src/script/C4AulParse.cpp \
+src/script/C4PropList.cpp \
+src/script/C4PropList.h \
+src/script/C4ScriptHost.cpp \
+src/script/C4ScriptHost.h \
+src/script/C4StringTable.cpp \
+src/script/C4StringTable.h \
+src/script/C4Value.cpp \
+src/script/C4Value.h \
+src/script/C4ValueList.cpp \
+src/script/C4ValueList.h \
+src/script/C4ValueMap.cpp \
+src/script/C4ValueMap.h \
+src/zlib/gzio.c \
+src/zlib/zutil.h
if WIN32
-clonk_SOURCES += engine/src/C4FileClasses.cpp
-clonk_SOURCES += engine/res/engine.rc engine/res/resource.h
+clonk_SOURCES += src/platform/C4FileClasses.cpp
+clonk_SOURCES += src/res/engine.rc src/res/resource.h
+clonk_SOURCES += src/platform/StdWindow.cpp src/platform/StdJoystick.cpp src/platform/StdJoystick.h
+else
+if SDL_MAIN_LOOP
+clonk_SOURCES += src/platform/StdSDLApp.cpp src/platform/StdSDLWindow.cpp
+else
+clonk_SOURCES += src/platform/StdXApp.cpp src/platform/StdXWindow.cpp src/platform/StdXPrivate.h src/platform/StdTApp.cpp
+endif
+endif
+if DEVELOPER_MODE
+clonk_SOURCES += src/platform/StdGtkWindow.cpp src/platform/StdGtkWindow.h
endif
clonk_LDADD = \
- libstandard.a \
$(LIBICONV) \
$(GTK_LIBS) \
$(FREETYPE_LIBS) \
@@ -409,116 +493,49 @@ clonk_LDADD = \
# build the resources
.rc.o:
- $(WINDRES) -I $(srcdir)/engine/res -i $< -o $@
-
-## standard
-
-# standard/src/StdBitmap.cpp \
-#
-libstandard_a_SOURCES = \
- standard/src/Bitmap256.cpp \
- standard/src/CStdFile.cpp \
- standard/src/Fixed.cpp \
- standard/src/Midi.cpp \
- standard/src/OpenURL.cpp \
- standard/src/PathFinder.cpp \
- standard/src/Standard.cpp \
- standard/src/StdBase64.cpp \
- standard/src/StdBuf.cpp \
- standard/src/StdConfig.cpp \
- standard/src/StdCompiler.cpp \
- standard/src/StdD3D.cpp \
- standard/src/StdDDraw2.cpp \
- standard/src/StdFile.cpp \
- standard/src/StdFont.cpp \
- standard/src/StdGL.cpp \
- standard/src/StdGLCtx.cpp \
- standard/src/StdMarkup.cpp \
- standard/src/StdNoGfx.cpp \
- standard/src/StdPNG.cpp \
- standard/src/StdRegistry.cpp \
- standard/src/StdResStr2.cpp \
- standard/src/StdScheduler.cpp \
- standard/src/StdSurface2.cpp \
- standard/src/StdSurface8.cpp \
- standard/src/StdVideo.cpp \
- standard/inc/Bitmap256.h \
- standard/inc/CStdFile.h \
- standard/inc/DInputX.h \
- standard/inc/DSoundX.h \
- standard/inc/Fixed.h \
- standard/inc/Midi.h \
- standard/inc/PathFinder.h \
- standard/inc/Standard.h \
- standard/inc/StdAdaptors.h \
- standard/inc/StdBase64.h \
- standard/inc/StdBuf.h \
- standard/inc/StdColors.h \
- standard/inc/StdConfig.h \
- standard/inc/StdCompiler.h \
- standard/inc/StdD3D.h \
- standard/inc/StdD3DShader.h \
- standard/inc/StdDDraw2.h \
- standard/inc/StdFacet.h \
- standard/inc/StdFile.h \
- standard/inc/StdFont.h \
- standard/inc/StdGL.h \
- standard/inc/StdMarkup.h \
- standard/inc/StdNoGfx.h \
- standard/inc/StdPNG.h \
- standard/inc/StdRandom.h \
- standard/inc/StdRegistry.h \
- standard/inc/StdResStr2.h \
- standard/inc/StdResStr.h \
- standard/inc/StdScheduler.h \
- standard/inc/StdSurface2.h \
- standard/inc/StdSurface8.h \
- standard/inc/StdSync.h \
- standard/inc/StdVideo.h \
- standard/inc/StdWindow.h \
- standard/zlib/gzio.c \
- standard/zlib/zutil.h
-
-if WIN32
-libstandard_a_SOURCES += standard/src/StdWindow.cpp standard/src/StdJoystick.cpp standard/inc/StdJoystick.h
-else
-if SDL_MAIN_LOOP
-libstandard_a_SOURCES += standard/src/StdSDLApp.cpp standard/src/StdSDLWindow.cpp
-else
-libstandard_a_SOURCES += standard/src/StdXApp.cpp standard/src/StdXWindow.cpp standard/src/StdXPrivate.h standard/src/StdTApp.cpp
-endif
-endif
-
-if DEVELOPER_MODE
-libstandard_a_SOURCES += standard/src/StdGtkWindow.cpp standard/inc/StdGtkWindow.h
-endif
+ $(WINDRES) -I $(srcdir)/src/res -I $(srcdir)/src -i $< -o $@
c4group_CPPFLAGS = \
-I$(builddir) \
- -I$(srcdir)/standard \
- -I$(srcdir)/standard/inc \
- -I$(srcdir)/engine/inc \
- -I$(srcdir)/engine/sec \
- -DC4GROUP -DUSE_CONSOLE
+ -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 \
+ -DUSE_CONSOLE
c4group_SOURCES = \
- group/c4group_ng.cpp \
- engine/src/C4Group.cpp \
- engine/src/C4InputValidation.cpp \
- engine/sec/C4SecurityCertificates.cpp \
- engine/src/C4Update.cpp \
- engine/inc/C4Update.h \
- engine/inc/C4Group.h \
- engine/inc/C4Version.h \
- standard/src/Standard.cpp \
- standard/src/CStdFile.cpp \
- standard/src/StdMarkup.cpp \
- standard/src/StdBuf.cpp \
- standard/src/StdCompiler.cpp \
- standard/src/StdFile.cpp \
- standard/src/StdRegistry.cpp \
- standard/src/StdResStr2.cpp \
- standard/src/StdConfig.cpp
+src/c4group/c4group_ng.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 \
+src/lib/StdMarkup.cpp \
+src/lib/StdBuf.cpp \
+src/lib/StdCompiler.cpp \
+src/platform/StdFile.cpp \
+src/platform/StdRegistry.cpp \
+src/lib/StdResStr2.cpp \
+src/platform/StdConfig.cpp \
+src/zlib/gzio.c
+
+if WIN32
+c4group_SOURCES += src/c4group/Resource.rc
+endif
c4group_LDADD = \
$(LIBICONV) \
@@ -528,21 +545,32 @@ c4group_LDADD = \
## gunzip4c4group
gunzip4c4group_SOURCES = \
- group/gunzip4c4group.cpp
+src/c4group/gunzip4c4group.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 \
+src/lib/StdMarkup.cpp \
+src/lib/StdBuf.cpp \
+src/lib/StdCompiler.cpp \
+src/platform/StdFile.cpp \
+src/platform/StdRegistry.cpp \
+src/lib/StdResStr2.cpp \
+src/platform/StdConfig.cpp \
+src/zlib/gzio.c
gunzip4c4group_LDADD = \
- libstandard.a \
$(PTHREAD_LIBS)
## puncher
puncher_SOURCES = \
- netpuncher/main.cpp \
- engine/src/C4NetIO.cpp \
- engine/inc/C4NetIO.h
+ src/netpuncher/main.cpp \
+ src/network/C4NetIO.cpp
puncher_LDADD = \
- libstandard.a \
$(PTHREAD_LIBS)
if WIN32
@@ -552,14 +580,11 @@ endif
## tstc4netio
tstc4netio_SOURCES = \
- engine/netio/TstC4NetIO.cpp \
- engine/src/C4NetIO.cpp \
- engine/inc/C4NetIO.h
+ src/netio/TstC4NetIO.cpp \
+ src/network/C4NetIO.cpp
tstc4netio_LDADD = \
- libstandard.a \
- libzlib.a \
- $(PTHREAD_LIBS)
+ $(PTHREAD_LIBS) -lz
if WIN32
tstc4netio_LDADD += -lwinmm -lws2_32
@@ -571,63 +596,63 @@ EXTRA_DIST = \
clonk.anjuta \
licenses \
xcode \
- engine/netio/NetIO.dsp \
- netpuncher/Puncher.dsp \
- engine/res/Brush_Trans.png \
- engine/res/Cursor_Trans.png \
- engine/res/cz.ico \
- engine/res/Dynamic_Trans.png \
- engine/res/Exact_Trans.png \
- engine/res/Fill_Trans.png \
- engine/res/Halt_Trans.png \
- engine/res/Ift_Trans.png \
- engine/res/Line_Trans.png \
- engine/res/Mouse_Trans.png \
- engine/res/NoIft_Trans.png \
- engine/res/Picker_Trans.png \
- engine/res/Play_Trans.png \
- engine/res/Rect_Trans.png \
- engine/res/Static_Trans.png \
- group/c4group_cmdl.cpp \
- group/resource.h \
- group/Resource.rc \
- engine/res/brush1.bmp \
- engine/res/c4g.ico \
- engine/res/c4s.ico \
- engine/res/Cursor2.bmp \
- engine/res/Game.pal \
- engine/res/line1.bmp \
- engine/res/Play2.bmp \
- engine/res/Brush2.bmp \
- engine/res/c4i.ico \
- engine/res/c4u.ico \
- engine/res/Cursor.bmp \
- engine/res/Grab.bmp \
- engine/res/Line.bmp \
- engine/res/Play.bmp \
- engine/res/Brush.bmp \
- engine/res/c4k.ico \
- engine/res/c4v.ico \
- engine/res/dynamic1.bmp \
- engine/res/Halt2.bmp \
- engine/res/mouse1.bmp \
- engine/res/rect1.bmp \
- engine/res/c4b.ico \
- engine/res/c4l.ico \
- engine/res/c4x.ico \
- engine/res/Halt.bmp \
- engine/res/mouse.bmp \
- engine/res/Rectangle.bmp \
- engine/res/c4d.ico \
- engine/res/c4m.ico \
- engine/res/c4x.xpm \
- engine/res/fill1.bmp \
- engine/res/ift1.bmp \
- engine/res/NoIFT.bmp \
- engine/res/c4f.ico \
- engine/res/c4p.ico \
- engine/res/Fill.bmp \
- engine/res/IFT.bmp \
- engine/res/picker1.bmp \
- engine/res/static1.bmp
+ src/netio/NetIO.dsp \
+ src/netpuncher/Puncher.dsp \
+ src/res/Brush_Trans.png \
+ src/res/Cursor_Trans.png \
+ src/res/cz.ico \
+ src/res/Dynamic_Trans.png \
+ src/res/Exact_Trans.png \
+ src/res/Fill_Trans.png \
+ src/res/Halt_Trans.png \
+ src/res/Ift_Trans.png \
+ src/res/Line_Trans.png \
+ src/res/Mouse_Trans.png \
+ src/res/NoIft_Trans.png \
+ src/res/Picker_Trans.png \
+ src/res/Play_Trans.png \
+ src/res/Rect_Trans.png \
+ src/res/Static_Trans.png \
+ src/c4group/c4group_cmdl.cpp \
+ src/c4group/resource.h \
+ src/c4group/Resource.rc \
+ src/res/brush1.bmp \
+ src/res/c4g.ico \
+ src/res/c4s.ico \
+ src/res/Cursor2.bmp \
+ src/res/Game.pal \
+ src/res/line1.bmp \
+ src/res/Play2.bmp \
+ src/res/Brush2.bmp \
+ src/res/c4i.ico \
+ src/res/c4u.ico \
+ src/res/Cursor.bmp \
+ src/res/Grab.bmp \
+ src/res/Line.bmp \
+ src/res/Play.bmp \
+ src/res/Brush.bmp \
+ src/res/c4k.ico \
+ src/res/c4v.ico \
+ src/res/dynamic1.bmp \
+ src/res/Halt2.bmp \
+ src/res/mouse1.bmp \
+ src/res/rect1.bmp \
+ src/res/c4b.ico \
+ src/res/c4l.ico \
+ src/res/c4x.ico \
+ src/res/Halt.bmp \
+ src/res/mouse.bmp \
+ src/res/Rectangle.bmp \
+ src/res/c4d.ico \
+ src/res/c4m.ico \
+ src/res/c4x.xpm \
+ src/res/fill1.bmp \
+ src/res/ift1.bmp \
+ src/res/NoIFT.bmp \
+ src/res/c4f.ico \
+ src/res/c4p.ico \
+ src/res/Fill.bmp \
+ src/res/IFT.bmp \
+ src/res/picker1.bmp \
+ src/res/static1.bmp
diff --git a/configure.ac b/configure.ac
index 9d59977c9..20684664e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(clonk, m4_format([[[%s.%s.%s.%s]]], m4_include(version)))
AC_COPYRIGHT([©2005-2009 Günther Brammer])
-AC_CONFIG_SRCDIR([engine/src/C4Map.cpp])
+AC_CONFIG_SRCDIR([/src/C4Game.cpp])
AC_CONFIG_AUX_DIR([autotools])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile])
diff --git a/docs/sdk/script/fn/CrewMember.xml b/docs/sdk/script/fn/CrewMember.xml
deleted file mode 100644
index 804844b10..000000000
--- a/docs/sdk/script/fn/CrewMember.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- CrewMember
- ObjekteMannschaft
- 4.6.5.0 CP
-
- bool
-
- ididZu prüfende Objektdefinition.
-
-
- Liefert den Wert von "CrewMember" aus der DefCore von id.
-
- GetDefCoreVal
-
-
- jwkApril 2002
-
diff --git a/engine/engine.vc9.vcproj b/engine/engine.vc9.vcproj
deleted file mode 100644
index 4212298e8..000000000
--- a/engine/engine.vc9.vcproj
+++ /dev/null
@@ -1,10566 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/group/resource.h b/group/resource.h
deleted file mode 100644
index 4beec5fc5..000000000
--- a/group/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Resource.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/planet/Objects.c4d/HUD.c4d/Controller.c4d/DefCore.txt b/planet/Objects.c4d/HUD.c4d/Controller.c4d/DefCore.txt
new file mode 100644
index 000000000..9f7083214
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Controller.c4d/DefCore.txt
@@ -0,0 +1,4 @@
+[DefCore]
+id=HUDC
+Version=4,9,5
+Category=C4D_StaticBack | C4D_Environment
diff --git a/planet/Objects.c4d/HUD.c4d/Controller.c4d/Graphics.png b/planet/Objects.c4d/HUD.c4d/Controller.c4d/Graphics.png
new file mode 100644
index 000000000..9bb8607e9
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Controller.c4d/Graphics.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Controller.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Controller.c4d/Names.txt
new file mode 100644
index 000000000..6315f2e20
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Controller.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Controller
+US:Controller
diff --git a/planet/Objects.c4d/HUD.c4d/Controller.c4d/Script.c b/planet/Objects.c4d/HUD.c4d/Controller.c4d/Script.c
new file mode 100644
index 000000000..59afb899d
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Controller.c4d/Script.c
@@ -0,0 +1,100 @@
+#strict 2
+
+/*
+ Per-Player Controller
+
+ Creates and removes the crew selectors as well as reorders them and
+ manages when a crew changes it's controller
+*/
+
+
+// following callbacks missing:
+// OnClonkUnRecruitment - clonk gets de-recruited from a crew
+
+protected func Construction()
+{
+ // find all clonks of this crew which do not have a selector yet (and can have one)
+ for(var i=GetCrewCount(GetOwner())-1; i >= 0; --i)
+ {
+ var crew = GetCrew(GetOwner(),i);
+ if(!(crew->HUDSelectable())) continue;
+
+ var sel = crew->GetSelector();
+ if(!sel)
+ CreateSelectorFor(crew);
+ }
+
+ // reorder the crew selectors
+ ReorderCrewSelectors();
+}
+
+protected func OnClonkRecruitment(object clonk, int plr)
+{
+ // not my business
+ if(plr != GetOwner()) return;
+
+ if(!(clonk->HUDSelectable())) return;
+
+ // if the clonk already has a hud, it means that he belonged to another
+ // crew. So we need another handling here in this case.
+ var sel;
+ if(sel = clonk->GetSelector())
+ {
+ var owner = sel->GetOwner();
+ sel->UpdateController();
+
+ // reorder stuff in the other one
+ var othercontroller = FindObject(Find_ID(GetID()), Find_Owner(owner));
+ othercontroller->ReorderCrewSelectors();
+ }
+ // create new crew selector
+ else
+ {
+ CreateSelectorFor(clonk);
+ }
+
+ // reorder the crew selectors
+ ReorderCrewSelectors();
+}
+
+protected func OnClonkDeath(object clonk, int killer)
+{
+ if(GetController(clonk) != GetOwner()) return;
+
+ if(!(clonk->HUDSelectable())) return;
+
+ // notify the hud
+ clonk->GetSelector()->CrewGone();
+
+ // and reorder
+ ReorderCrewSelectors();
+}
+
+private func CreateSelectorFor(object clonk)
+{
+ var selector = CreateObject(CSLR,10,10,-1);
+ selector->SetCrew(clonk);
+ clonk->SetSelector(selector);
+ return selector;
+}
+
+public func ReorderCrewSelectors()
+{
+ // somehow new crew gets sorted at the beginning
+ // because we dont want that, the for loop starts from the end
+ var j = 0;
+ for(var i=GetCrewCount(GetOwner())-1; i >= 0; --i)
+ {
+ var crew = GetCrew(GetOwner(),i);
+ var sel = crew->GetSelector();
+ if(sel)
+ {
+ sel->SetPosition(32 + j * (GetDefWidth(CSLR) + spacing) + GetDefWidth(CSLR)/2, 16+GetDefHeight(CSLR)/2);
+ if(j+1 == 10) sel->SetHotkey(0);
+ else sel->SetHotkey(j+1);
+ }
+
+ var spacing = 12;
+ j++;
+ }
+}
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/DefCore.txt b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/DefCore.txt
new file mode 100644
index 000000000..5d0548348
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/DefCore.txt
@@ -0,0 +1,8 @@
+[DefCore]
+id=BAR0
+Version=4,9,5
+Category=C4D_StaticBack
+Width=110
+Height=19
+Offset=-55,-10
+Rotate=1
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Graphics.png b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Graphics.png
new file mode 100644
index 000000000..fd6c95cce
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Graphics.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/GraphicsBar.png b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/GraphicsBar.png
new file mode 100644
index 000000000..610110675
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/GraphicsBar.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/GraphicsEmpty.png b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/GraphicsEmpty.png
new file mode 100644
index 000000000..af7036681
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/GraphicsEmpty.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Names.txt
new file mode 100644
index 000000000..99ea5aef7
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Leiste
+US:Bar
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Script.c b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Script.c
new file mode 100644
index 000000000..01bcb8b91
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Bars.c4d/Script.c
@@ -0,0 +1,72 @@
+#strict 2
+
+/*
+ Progress-Bar element
+
+ This object can show an unlimited amount of progress bars in different
+ locations, sizes and colors. Using this basic funcionality, one could create
+ floating health bars attached to clonks or include the bars as layers into
+ (HUD) objects.
+*/
+
+local offsx, offsy, layer, width, height;
+
+protected func Construction()
+{
+ offsx = CreateArray();
+ offsy = CreateArray();
+ width = CreateArray();
+ height = CreateArray();
+ layer = CreateArray();
+}
+
+public func SetBarOffset(int x, int y, int num)
+{
+ offsx[num] = x;
+ offsy[num] = y;
+}
+
+public func RemoveBarLayers(int la)
+{
+ // remove layers
+ SetGraphics(nil,nil,nil,la);
+ SetGraphics(nil,nil,nil,la+1);
+}
+
+public func SetBarLayers(int la, int num)
+{
+ RemoveBarLayers(la);
+
+ // new layers
+ layer[num] = la;
+ SetGraphics("Empty",nil,BAR0,layer[num],GFXOV_MODE_Base);
+ SetGraphics("Bar",nil,BAR0,layer[num]+1,GFXOV_MODE_Base);
+}
+
+public func SetBarDimensions(int wdt, int hgt, int num)
+{
+ width[num] = 1000 * wdt / GetDefWidth(BAR0);
+ height[num] = 1000 * hgt / GetDefHeight(BAR0);
+}
+
+public func SetBarProgress(int promille, int num)
+{
+ // not existing
+ if(GetLength(layer) <= num) return false;
+
+ // width/height not set == 1000
+ if(!width[num]) width[num] = 1000;
+ if(!height[num]) height[num] = 1000;
+
+ var w = GetDefWidth(BAR0)/2;
+
+ // the bar does not start on the left side of the graphics... correct this
+ var graphicscorrect = 100;
+
+ var baroffset = offsx[num]*1000 - width[num]*w * (1000-promille)/(1000+graphicscorrect);
+
+ SetObjDrawTransform(width[num],0,offsx[num]*1000, 0, height[num], offsy[num]*1000,nil, layer[num]);
+ SetObjDrawTransform((promille * width[num])/1000,0, baroffset, 0, height[num], offsy[num]*1000, nil, layer[num]+1);
+
+ return true;
+}
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/DefCore.txt b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/DefCore.txt
new file mode 100644
index 000000000..ebf4d5985
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/DefCore.txt
@@ -0,0 +1,7 @@
+[DefCore]
+id=CSLR
+Version=4,9,5
+Category=C4D_StaticBack | C4D_IgnoreFoW | C4D_Foreground | C4D_Parallax | C4D_MouseSelect
+Width=64
+Height=64
+Offset=-32,-32
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Graphics.png b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Graphics.png
new file mode 100644
index 000000000..0be460dec
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Graphics.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Names.txt
new file mode 100644
index 000000000..96f565614
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Crew selektieren
+US:Select crew
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Script.c b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Script.c
new file mode 100644
index 000000000..b4631b14a
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Script.c
@@ -0,0 +1,287 @@
+#strict 2
+#include BAR0
+
+/*
+ Crew selector HUD
+
+ For each crew member, one of these HUD elements exist in the top bar.
+ It shows the rank, health, breath and magic bars as well as the title
+ (or portrait) and is clickable. If clicked, the associated crew member
+ get's selected.
+ HUD elements are passive, they don't update their status by themselves
+ but rely on the HUD controller to be notified of any changes.
+
+*/
+
+local crew, breathbar, magicbar, hotkey;
+
+public func BarSpacing() { return -5; }
+public func HealthBarHeight() { return 12; }
+public func BreathBarHeight() { return 7; }
+public func MagicBarHeight() { return 7; }
+
+/*
+ usage of layers:
+ -----------------
+ layer 0 - unused
+ layer 1 - title
+ layer 2,3 - health bar
+ layer 4,5 - breath bar
+ layer 6,7 - magic bar
+
+ layer 10,11 - rank
+ layer 12 - hotkey
+*/
+
+/*
+ The crew selector needs to be notified when
+ -------------------
+ ...his clonk...
+ + changes his energy -> UpdateHealthBar()
+ + changes his breath -> UpdateBreathBar()
+ + changes his magic energy -> UpdateMagicBar()
+ + (temporarily) changes his physical (energy, breath, magic energy) -> see above
+ + gains a rank -> UpdateRank()
+ + is selected/is deselected as cursor -> UpdateSelectionStatus()
+ + changes it's title graphic (either by SetGraphics or by ChangeDef) -> UpdateTitleGraphic()
+
+*/
+
+protected func Construction()
+{
+ _inherited();
+
+ breathbar = false;
+ magicbar = false;
+ hotkey = false;
+
+ // parallaxity
+ this["Parallaxity"] = [0,0];
+
+ // visibility
+ this["Visibility"] = VIS_None;
+
+ // health bar
+ SetBarLayers(2,0);
+ SetBarOffset(0,BarOffset(0),0);
+ SetBarDimensions(GetDefWidth(GetID()),HealthBarHeight(),0);
+ SetClrModulation(RGB(200,0,0),nil,3);
+}
+
+public func MouseSelection(int plr)
+{
+ if(!crew) return false;
+ if(plr != GetOwner()) return false;
+
+ // select this clonk
+ SetCursor(plr, crew);
+
+ return true;
+}
+
+public func SetCrew(object c)
+{
+ crew = c;
+ UpdateHealthBar();
+ UpdateBreathBar();
+ UpdateMagicBar();
+ UpdateTitleGraphic();
+ UpdateRank();
+ UpdateController();
+ UpdateSelectionStatus();
+
+ this["Visibility"] = VIS_Owner;
+
+ //ScheduleCall(0,"SetCrew",1,0,c);
+}
+
+public func SetHotkey(int num)
+{
+ if(num < 0 || num > 9)
+ {
+ SetGraphics(nil,nil,nil,12);
+ hotkey = false;
+ return;
+ }
+
+ hotkey = true;
+ var name = Format("%d",num);
+ SetGraphics(name,nil,NUMB,12,GFXOV_MODE_IngamePicture);
+ SetObjDrawTransform(300,0,16000,0,300,-30000, nil, 12);
+ SetClrModulation(HSL(0,0,180),nil,12);
+}
+
+public func CrewGone()
+{
+ RemoveObject();
+}
+
+public func UpdateController()
+{
+ if(!crew) return;
+ // visibility
+ SetOwner(crew->GetController());
+}
+
+public func UpdateSelectionStatus()
+{
+ if(!crew) return;
+ if(!hotkey) return;
+
+ if(crew == GetCursor(GetOwner()))
+ SetClrModulation(HSL(0,0,250),nil,12);
+ else
+ SetClrModulation(HSL(0,0,180),nil,12);
+}
+
+public func UpdateRank()
+{
+ if(!crew) return;
+
+ var rank = crew->GetRank();
+ var nrank = rank % 25;
+ var brank = rank / 25;
+
+ var rankx = -1000 * GetDefWidth(GetID())/2 + 10000;
+ var ranky = -15000;
+
+ SetGraphics(nil,nil,RANK,10,GFXOV_MODE_Action,Format("Rank%d",nrank));
+ SetObjDrawTransform(1000,0,rankx,0,1000,ranky, nil, 10);
+
+ // extra rank (the star if the clonk is too experienced for normal ranks)
+ if(brank > 0)
+ {
+ SetGraphics(nil,nil,RANK,11,GFXOV_MODE_Action,Format("RankExtra%d",brank));
+ SetObjDrawTransform(1000,0,rankx-6000,0,1000,ranky-4000, nil, 11);
+ }
+ else
+ {
+ SetGraphics(nil,nil,nil,11);
+ }
+}
+
+public func UpdateTitleGraphic()
+{
+ if(!crew) return;
+
+ SetGraphics(nil,nil,crew->GetID(),1,GFXOV_MODE_Object,nil,nil,crew);
+
+ //SetGraphics(nil,nil,crew->GetID(),1,GFXOV_MODE_IngamePicture);
+
+ // doesn't work:
+ //SetColorDw(crew->GetColorDw());
+}
+
+public func UpdateHealthBar()
+{
+ if(!crew) return;
+ var phys = crew->GetPhysical("Energy");
+ var promille;
+ if(phys == 0) promille = 0;
+ else promille = 1000 * crew->GetEnergy() / (phys / 1000);
+
+ SetBarProgress(promille,0);
+}
+
+public func UpdateBreathBar()
+{
+ if(!crew) return;
+ var phys = crew->GetPhysical("Breath");
+ var promille;
+ if(phys == 0) promille = 0;
+ else promille = 1000 * crew->GetBreath() / (phys / 1000);
+
+ // remove breath bar if full breath
+ if(promille == 1000)
+ {
+ if(breathbar)
+ RemoveBreathBar();
+ }
+ // add breath bar if there is none
+ else
+ {
+ if(!breathbar)
+ AddBreathBar();
+
+ SetBarProgress(promille,1);
+ }
+
+}
+
+public func UpdateMagicBar()
+{
+ if(!crew) return;
+ var phys = crew->GetPhysical("Magic");
+ var promille = 0;
+ if(phys != 0) promille = 1000 * crew->GetMagicEnergy() / (phys / 1000);
+
+ // remove magic bar if no physical magic!
+ if(phys == 0)
+ {
+ if(magicbar)
+ RemoveMagicBar();
+ }
+ // add magic bar if there is none
+ else
+ {
+ if(!magicbar)
+ AddMagicBar();
+
+ SetBarProgress(promille,2);
+ }
+
+}
+
+private func BarOffset(int num)
+{
+ var offset = GetDefWidth(GetID())/2 + HealthBarHeight()/2 + num * BarSpacing() + num;
+ if(num > 0) offset += HealthBarHeight();
+ if(num > 1) offset += BreathBarHeight();
+ return offset;
+}
+
+private func AddBreathBar()
+{
+ // breath bar
+ SetBarLayers(4,1);
+ SetBarOffset(0,BarOffset(1),1);
+ SetBarDimensions(GetDefWidth(GetID()),BreathBarHeight(),1);
+ SetClrModulation(RGB(0,200,200),nil,5);
+
+ breathbar = true;
+
+ // update position of magic bar (if any)
+ if(magicbar)
+ SetBarOffset(0,BarOffset(2),2);
+}
+
+private func RemoveBreathBar()
+{
+ RemoveBarLayers(4);
+
+ breathbar = false;
+
+ // update position of magic bar (if any)
+ if(magicbar)
+ SetBarOffset(0,BarOffset(1),2);
+}
+
+private func AddMagicBar()
+{
+ var num = 1;
+ if(breathbar) num = 2;
+
+ SetBarLayers(6,2);
+ SetBarOffset(0,BarOffset(num),2);
+ SetBarDimensions(GetDefWidth(GetID()),MagicBarHeight(),2);
+ SetClrModulation(RGB(0,0,200),nil,7);
+
+ magicbar = true;
+}
+
+private func RemoveMagicBar()
+{
+ RemoveBarLayers(6);
+
+ magicbar = false;
+}
diff --git a/planet/Objects.c4d/HUD.c4d/Elements.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Names.txt
new file mode 100644
index 000000000..572ef3634
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Elements.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Elemente
+US:Elements
diff --git a/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/DefCore.txt b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/DefCore.txt
new file mode 100644
index 000000000..37519a137
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/DefCore.txt
@@ -0,0 +1,4 @@
+[DefCore]
+id=HUDS
+Version=4,9,5
+Category=C4D_StaticBack
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Graphics.png b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Graphics.png
new file mode 100644
index 000000000..9bb8607e9
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Graphics.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Names.txt
new file mode 100644
index 000000000..65533b6fb
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:HUD selektierbar
+US:HUD selectable
diff --git a/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Script.c b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Script.c
new file mode 100644
index 000000000..9e93da9da
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/HUDSelectable.c4d/Script.c
@@ -0,0 +1,28 @@
+#strict 2
+#appendto CLNK
+
+local selector;
+
+public func SetSelector(object sel)
+{
+ selector = sel;
+}
+
+public func GetSelector()
+{
+ return selector;
+}
+
+public func HUDSelectable()
+{
+ return true;
+}
+
+// bootstrap the hud
+protected func Recruitment(int iPlr)
+{
+ if(!FindObject(Find_ID(HUDC),Find_Owner(iPlr)))
+ CreateObject(HUDC,10,10,iPlr);
+
+ return _inherited(...);
+}
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/Names.txt
new file mode 100644
index 000000000..888b96863
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Functionalities.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Funktionalitäten
+US:Functionalities
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Names.txt
new file mode 100644
index 000000000..d07a9af87
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Ressourcen
+US:Resources
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/DefCore.txt b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/DefCore.txt
new file mode 100644
index 000000000..33df9bace
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/DefCore.txt
@@ -0,0 +1,8 @@
+[DefCore]
+id=NUMB
+Version=4,9,5
+Category=C4D_StaticBack
+Picture=0,0,64,64
+Width=64
+Height=64
+Offset=-32,-32
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics.png
new file mode 100644
index 000000000..f7e58fc5b
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics0.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics0.png
new file mode 100644
index 000000000..21466c248
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics0.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics1.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics1.png
new file mode 100644
index 000000000..3e22327b9
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics1.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics2.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics2.png
new file mode 100644
index 000000000..b8b71e22a
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics2.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics3.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics3.png
new file mode 100644
index 000000000..8e8abb398
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics3.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics4.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics4.png
new file mode 100644
index 000000000..53c651f52
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics4.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics5.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics5.png
new file mode 100644
index 000000000..ab2d12273
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics5.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics6.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics6.png
new file mode 100644
index 000000000..0664ada79
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics6.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics7.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics7.png
new file mode 100644
index 000000000..75e8bdd95
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics7.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics8.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics8.png
new file mode 100644
index 000000000..774908303
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics8.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics9.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics9.png
new file mode 100644
index 000000000..45a36886e
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Graphics9.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Names.txt
new file mode 100644
index 000000000..1ba4a1073
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Number.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Ziffer
+US:Number
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/ActMap.txt b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/ActMap.txt
new file mode 100644
index 000000000..c30034906
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/ActMap.txt
@@ -0,0 +1,115 @@
+[Action]
+Name=Rank0
+Facet=0,0,16,16
+
+[Action]
+Name=Rank1
+Facet=16,0,16,16
+
+[Action]
+Name=Rank2
+Facet=32,0,16,16
+
+[Action]
+Name=Rank3
+Facet=48,0,16,16
+
+[Action]
+Name=Rank4
+Facet=64,0,16,16
+
+[Action]
+Name=Rank5
+Facet=80,0,16,16
+
+[Action]
+Name=Rank6
+Facet=96,0,16,16
+
+[Action]
+Name=Rank7
+Facet=112,0,16,16
+
+[Action]
+Name=Rank8
+Facet=128,0,16,16
+
+[Action]
+Name=Rank9
+Facet=144,0,16,16
+
+[Action]
+Name=Rank10
+Facet=160,0,16,16
+
+[Action]
+Name=Rank11
+Facet=176,0,16,16
+
+[Action]
+Name=Rank12
+Facet=192,0,16,16
+
+[Action]
+Name=Rank13
+Facet=208,0,16,16
+
+[Action]
+Name=Rank14
+Facet=224,0,16,16
+
+[Action]
+Name=Rank15
+Facet=240,0,16,16
+
+[Action]
+Name=Rank16
+Facet=256,0,16,16
+
+[Action]
+Name=Rank17
+Facet=272,0,16,16
+
+[Action]
+Name=Rank18
+Facet=288,0,16,16
+
+[Action]
+Name=Rank19
+Facet=304,0,16,16
+
+[Action]
+Name=Rank20
+Facet=320,0,16,16
+
+[Action]
+Name=Rank21
+Facet=336,0,16,16
+
+[Action]
+Name=Rank22
+Facet=352,0,16,16
+
+[Action]
+Name=Rank23
+Facet=368,0,16,16
+
+[Action]
+Name=Rank24
+Facet=384,0,16,16
+
+[Action]
+Name=RankExtra1
+Facet=400,0,16,16
+
+[Action]
+Name=RankExtra2
+Facet=416,0,16,16
+
+[Action]
+Name=RankExtra3
+Facet=432,0,16,16
+
+[Action]
+Name=RankExtra4
+Facet=448,0,16,16
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/DefCore.txt b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/DefCore.txt
new file mode 100644
index 000000000..cb9fbe5af
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/DefCore.txt
@@ -0,0 +1,8 @@
+[DefCore]
+id=RANK
+Version=4,9,5
+Category=C4D_StaticBack
+Picture=0,0,16,16
+Width=16
+Height=16
+Offset=-8,-8
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Graphics.png b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Graphics.png
new file mode 100644
index 000000000..6f608514d
Binary files /dev/null and b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Graphics.png differ
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Names.txt b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Names.txt
new file mode 100644
index 000000000..f9d9c891c
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Names.txt
@@ -0,0 +1,2 @@
+DE:Zeichen
+US:Character
diff --git a/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Script.c b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Script.c
new file mode 100644
index 000000000..fb4ed45f8
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/Resources.c4d/Rank.c4d/Script.c
@@ -0,0 +1,37 @@
+#strict 2
+
+func Definition(def) {
+ def["ActMap"] = {
+
+ Rank0 = { Prototype = Action, Name = "Rank0", X = 0, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank1 = { Prototype = Action, Name = "Rank1", X = 16, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank2 = { Prototype = Action, Name = "Rank2", X = 32, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank3 = { Prototype = Action, Name = "Rank3", X = 48, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank4 = { Prototype = Action, Name = "Rank4", X = 64, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank5 = { Prototype = Action, Name = "Rank5", X = 80, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank6 = { Prototype = Action, Name = "Rank6", X = 96, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank7 = { Prototype = Action, Name = "Rank7", X = 112, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank8 = { Prototype = Action, Name = "Rank8", X = 128, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank9 = { Prototype = Action, Name = "Rank9", X = 144, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank10 = { Prototype = Action, Name = "Rank10", X = 160, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank11 = { Prototype = Action, Name = "Rank11", X = 176, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank12 = { Prototype = Action, Name = "Rank12", X = 192, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank13 = { Prototype = Action, Name = "Rank13", X = 208, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank14 = { Prototype = Action, Name = "Rank14", X = 224, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank15 = { Prototype = Action, Name = "Rank15", X = 240, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank16 = { Prototype = Action, Name = "Rank16", X = 256, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank17 = { Prototype = Action, Name = "Rank17", X = 272, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank18 = { Prototype = Action, Name = "Rank18", X = 288, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank19 = { Prototype = Action, Name = "Rank19", X = 304, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank20 = { Prototype = Action, Name = "Rank20", X = 320, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank21 = { Prototype = Action, Name = "Rank21", X = 336, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank22 = { Prototype = Action, Name = "Rank22", X = 352, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank23 = { Prototype = Action, Name = "Rank23", X = 368, Y = 0, Wdt = 16, Hgt = 16 },
+ Rank24 = { Prototype = Action, Name = "Rank24", X = 384, Y = 0, Wdt = 16, Hgt = 16 },
+ RankExtra1 = { Prototype = Action, Name = "RankExtra1", X = 400, Y = 0, Wdt = 16, Hgt = 16 },
+ RankExtra2 = { Prototype = Action, Name = "RankExtra2", X = 416, Y = 0, Wdt = 16, Hgt = 16 },
+ RankExtra3 = { Prototype = Action, Name = "RankExtra3", X = 432, Y = 0, Wdt = 16, Hgt = 16 },
+ RankExtra4 = { Prototype = Action, Name = "RankExtra4", X = 448, Y = 0, Wdt = 16, Hgt = 16 }
+
+ };
+}
\ No newline at end of file
diff --git a/planet/Objects.c4d/HUD.c4d/c4d_hud.txt b/planet/Objects.c4d/HUD.c4d/c4d_hud.txt
new file mode 100644
index 000000000..7eb4f0d87
--- /dev/null
+++ b/planet/Objects.c4d/HUD.c4d/c4d_hud.txt
@@ -0,0 +1,13 @@
+C4D_HUD:
++ parallax
++ über allem, über fow
++ für mausklicks, maus-drag-and-drops etc zugänglich
++ bekommt die GameCallEx calls mit
++ kein Zoom!
+
+----
+Funktion: SetViewportBorder(top/bottom, pixels) - verkleinert den Viewport so dass Platz ist für HUD-Elemente die nix verdecken
+
+
+-----
+
diff --git a/engine/src/C4Application.cpp b/src/C4Application.cpp
similarity index 100%
rename from engine/src/C4Application.cpp
rename to src/C4Application.cpp
diff --git a/engine/inc/C4Application.h b/src/C4Application.h
similarity index 100%
rename from engine/inc/C4Application.h
rename to src/C4Application.h
diff --git a/engine/src/C4FullScreen.cpp b/src/C4FullScreen.cpp
similarity index 100%
rename from engine/src/C4FullScreen.cpp
rename to src/C4FullScreen.cpp
diff --git a/engine/inc/C4FullScreen.h b/src/C4FullScreen.h
similarity index 100%
rename from engine/inc/C4FullScreen.h
rename to src/C4FullScreen.h
diff --git a/engine/src/C4Game.cpp b/src/C4Game.cpp
similarity index 99%
rename from engine/src/C4Game.cpp
rename to src/C4Game.cpp
index a4eb0c5c9..1fe0f7198 100644
--- a/engine/src/C4Game.cpp
+++ b/src/C4Game.cpp
@@ -804,7 +804,7 @@ BOOL C4Game::Execute() // Returns true if the game is over
// show stat each 1000 ticks
if(!(FrameCounter % 1000))
{
- C4ST_SHOWPARTSTAT
+ C4ST_SHOWPARTSTAT(FrameCounter)
C4ST_RESETPART
}
diff --git a/engine/inc/C4Game.h b/src/C4Game.h
similarity index 100%
rename from engine/inc/C4Game.h
rename to src/C4Game.h
diff --git a/engine/src/C4GraphicsSystem.cpp b/src/C4GraphicsSystem.cpp
similarity index 100%
rename from engine/src/C4GraphicsSystem.cpp
rename to src/C4GraphicsSystem.cpp
diff --git a/engine/inc/C4GraphicsSystem.h b/src/C4GraphicsSystem.h
similarity index 100%
rename from engine/inc/C4GraphicsSystem.h
rename to src/C4GraphicsSystem.h
diff --git a/engine/src/C4Include.cpp b/src/C4Include.cpp
similarity index 100%
rename from engine/src/C4Include.cpp
rename to src/C4Include.cpp
diff --git a/engine/inc/C4Include.h b/src/C4Include.h
similarity index 100%
rename from engine/inc/C4Include.h
rename to src/C4Include.h
diff --git a/engine/inc/C4Prototypes.h b/src/C4Prototypes.h
similarity index 100%
rename from engine/inc/C4Prototypes.h
rename to src/C4Prototypes.h
diff --git a/engine/inc/C4Version.h b/src/C4Version.h
similarity index 100%
rename from engine/inc/C4Version.h
rename to src/C4Version.h
diff --git a/engine/src/C4WinMain.cpp b/src/C4WinMain.cpp
similarity index 100%
rename from engine/src/C4WinMain.cpp
rename to src/C4WinMain.cpp
diff --git a/engine/inc/C4Components.h b/src/c4group/C4Components.h
similarity index 100%
rename from engine/inc/C4Components.h
rename to src/c4group/C4Components.h
diff --git a/engine/src/C4Extra.cpp b/src/c4group/C4Extra.cpp
similarity index 100%
rename from engine/src/C4Extra.cpp
rename to src/c4group/C4Extra.cpp
diff --git a/engine/inc/C4Extra.h b/src/c4group/C4Extra.h
similarity index 100%
rename from engine/inc/C4Extra.h
rename to src/c4group/C4Extra.h
diff --git a/engine/src/C4Group.cpp b/src/c4group/C4Group.cpp
similarity index 100%
rename from engine/src/C4Group.cpp
rename to src/c4group/C4Group.cpp
diff --git a/engine/inc/C4Group.h b/src/c4group/C4Group.h
similarity index 100%
rename from engine/inc/C4Group.h
rename to src/c4group/C4Group.h
diff --git a/engine/src/C4GroupSet.cpp b/src/c4group/C4GroupSet.cpp
similarity index 99%
rename from engine/src/C4GroupSet.cpp
rename to src/c4group/C4GroupSet.cpp
index 20fc59cf7..b7e1c4a57 100644
--- a/engine/src/C4GroupSet.cpp
+++ b/src/c4group/C4GroupSet.cpp
@@ -24,6 +24,8 @@
#include
#include
+#include
+#include
#include
C4GroupSetNode::C4GroupSetNode(C4GroupSet &rParent, C4GroupSetNode *pPrev, C4Group &rGroup, bool fGrpOwned, int32_t id)
diff --git a/engine/inc/C4GroupSet.h b/src/c4group/C4GroupSet.h
similarity index 100%
rename from engine/inc/C4GroupSet.h
rename to src/c4group/C4GroupSet.h
diff --git a/engine/src/C4Language.cpp b/src/c4group/C4Language.cpp
similarity index 100%
rename from engine/src/C4Language.cpp
rename to src/c4group/C4Language.cpp
diff --git a/engine/inc/C4Language.h b/src/c4group/C4Language.h
similarity index 100%
rename from engine/inc/C4Language.h
rename to src/c4group/C4Language.h
diff --git a/engine/src/C4Update.cpp b/src/c4group/C4Update.cpp
similarity index 100%
rename from engine/src/C4Update.cpp
rename to src/c4group/C4Update.cpp
diff --git a/engine/inc/C4Update.h b/src/c4group/C4Update.h
similarity index 100%
rename from engine/inc/C4Update.h
rename to src/c4group/C4Update.h
diff --git a/standard/src/CStdFile.cpp b/src/c4group/CStdFile.cpp
similarity index 100%
rename from standard/src/CStdFile.cpp
rename to src/c4group/CStdFile.cpp
diff --git a/standard/inc/CStdFile.h b/src/c4group/CStdFile.h
similarity index 100%
rename from standard/inc/CStdFile.h
rename to src/c4group/CStdFile.h
diff --git a/group/Resource.rc b/src/c4group/Resource.rc
similarity index 98%
rename from group/Resource.rc
rename to src/c4group/Resource.rc
index e3f209c63..85ab46969 100644
--- a/group/Resource.rc
+++ b/src/c4group/Resource.rc
@@ -9,7 +9,7 @@
//
#include "afxres.h"
-#include "..\engine\inc\C4Version.h"
+#include "C4Version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/group/c4group_cmdl.cpp b/src/c4group/c4group_cmdl.cpp
similarity index 100%
rename from group/c4group_cmdl.cpp
rename to src/c4group/c4group_cmdl.cpp
diff --git a/group/c4group_ng.cpp b/src/c4group/c4group_ng.cpp
similarity index 100%
rename from group/c4group_ng.cpp
rename to src/c4group/c4group_ng.cpp
diff --git a/group/gunzip4c4group.cpp b/src/c4group/gunzip4c4group.cpp
similarity index 100%
rename from group/gunzip4c4group.cpp
rename to src/c4group/gunzip4c4group.cpp
diff --git a/engine/src/C4Config.cpp b/src/config/C4Config.cpp
similarity index 100%
rename from engine/src/C4Config.cpp
rename to src/config/C4Config.cpp
diff --git a/engine/inc/C4Config.h b/src/config/C4Config.h
similarity index 100%
rename from engine/inc/C4Config.h
rename to src/config/C4Config.h
diff --git a/engine/sec/C4ConfigShareware.cpp b/src/config/C4ConfigShareware.cpp
similarity index 100%
rename from engine/sec/C4ConfigShareware.cpp
rename to src/config/C4ConfigShareware.cpp
diff --git a/engine/sec/C4ConfigShareware.h b/src/config/C4ConfigShareware.h
similarity index 100%
rename from engine/sec/C4ConfigShareware.h
rename to src/config/C4ConfigShareware.h
diff --git a/engine/sec/C4SecurityCertificates.cpp b/src/config/C4SecurityCertificates.cpp
similarity index 100%
rename from engine/sec/C4SecurityCertificates.cpp
rename to src/config/C4SecurityCertificates.cpp
diff --git a/engine/sec/C4SecurityCertificates.h b/src/config/C4SecurityCertificates.h
similarity index 100%
rename from engine/sec/C4SecurityCertificates.h
rename to src/config/C4SecurityCertificates.h
diff --git a/engine/src/C4Control.cpp b/src/control/C4Control.cpp
similarity index 100%
rename from engine/src/C4Control.cpp
rename to src/control/C4Control.cpp
diff --git a/engine/inc/C4Control.h b/src/control/C4Control.h
similarity index 100%
rename from engine/inc/C4Control.h
rename to src/control/C4Control.h
diff --git a/engine/src/C4GameControl.cpp b/src/control/C4GameControl.cpp
similarity index 100%
rename from engine/src/C4GameControl.cpp
rename to src/control/C4GameControl.cpp
diff --git a/engine/inc/C4GameControl.h b/src/control/C4GameControl.h
similarity index 100%
rename from engine/inc/C4GameControl.h
rename to src/control/C4GameControl.h
diff --git a/engine/src/C4GameParameters.cpp b/src/control/C4GameParameters.cpp
similarity index 100%
rename from engine/src/C4GameParameters.cpp
rename to src/control/C4GameParameters.cpp
diff --git a/engine/inc/C4GameParameters.h b/src/control/C4GameParameters.h
similarity index 100%
rename from engine/inc/C4GameParameters.h
rename to src/control/C4GameParameters.h
diff --git a/engine/src/C4GameSave.cpp b/src/control/C4GameSave.cpp
similarity index 100%
rename from engine/src/C4GameSave.cpp
rename to src/control/C4GameSave.cpp
diff --git a/engine/inc/C4GameSave.h b/src/control/C4GameSave.h
similarity index 100%
rename from engine/inc/C4GameSave.h
rename to src/control/C4GameSave.h
diff --git a/engine/src/C4PlayerInfo.cpp b/src/control/C4PlayerInfo.cpp
similarity index 100%
rename from engine/src/C4PlayerInfo.cpp
rename to src/control/C4PlayerInfo.cpp
diff --git a/engine/inc/C4PlayerInfo.h b/src/control/C4PlayerInfo.h
similarity index 100%
rename from engine/inc/C4PlayerInfo.h
rename to src/control/C4PlayerInfo.h
diff --git a/engine/src/C4PlayerInfoConflicts.cpp b/src/control/C4PlayerInfoConflicts.cpp
similarity index 100%
rename from engine/src/C4PlayerInfoConflicts.cpp
rename to src/control/C4PlayerInfoConflicts.cpp
diff --git a/engine/src/C4Record.cpp b/src/control/C4Record.cpp
similarity index 100%
rename from engine/src/C4Record.cpp
rename to src/control/C4Record.cpp
diff --git a/engine/inc/C4Record.h b/src/control/C4Record.h
similarity index 100%
rename from engine/inc/C4Record.h
rename to src/control/C4Record.h
diff --git a/engine/src/C4RoundResults.cpp b/src/control/C4RoundResults.cpp
similarity index 100%
rename from engine/src/C4RoundResults.cpp
rename to src/control/C4RoundResults.cpp
diff --git a/engine/inc/C4RoundResults.h b/src/control/C4RoundResults.h
similarity index 100%
rename from engine/inc/C4RoundResults.h
rename to src/control/C4RoundResults.h
diff --git a/engine/src/C4Teams.cpp b/src/control/C4Teams.cpp
similarity index 100%
rename from engine/src/C4Teams.cpp
rename to src/control/C4Teams.cpp
diff --git a/engine/inc/C4Teams.h b/src/control/C4Teams.h
similarity index 100%
rename from engine/inc/C4Teams.h
rename to src/control/C4Teams.h
diff --git a/engine/src/C4Console.cpp b/src/editor/C4Console.cpp
similarity index 100%
rename from engine/src/C4Console.cpp
rename to src/editor/C4Console.cpp
diff --git a/engine/inc/C4Console.h b/src/editor/C4Console.h
similarity index 100%
rename from engine/inc/C4Console.h
rename to src/editor/C4Console.h
diff --git a/engine/src/C4DevmodeDlg.cpp b/src/editor/C4DevmodeDlg.cpp
similarity index 100%
rename from engine/src/C4DevmodeDlg.cpp
rename to src/editor/C4DevmodeDlg.cpp
diff --git a/engine/inc/C4DevmodeDlg.h b/src/editor/C4DevmodeDlg.h
similarity index 100%
rename from engine/inc/C4DevmodeDlg.h
rename to src/editor/C4DevmodeDlg.h
diff --git a/engine/src/C4EditCursor.cpp b/src/editor/C4EditCursor.cpp
similarity index 100%
rename from engine/src/C4EditCursor.cpp
rename to src/editor/C4EditCursor.cpp
diff --git a/engine/inc/C4EditCursor.h b/src/editor/C4EditCursor.h
similarity index 100%
rename from engine/inc/C4EditCursor.h
rename to src/editor/C4EditCursor.h
diff --git a/engine/src/C4ObjectListDlg.cpp b/src/editor/C4ObjectListDlg.cpp
similarity index 100%
rename from engine/src/C4ObjectListDlg.cpp
rename to src/editor/C4ObjectListDlg.cpp
diff --git a/engine/inc/C4ObjectListDlg.h b/src/editor/C4ObjectListDlg.h
similarity index 100%
rename from engine/inc/C4ObjectListDlg.h
rename to src/editor/C4ObjectListDlg.h
diff --git a/engine/src/C4PropertyDlg.cpp b/src/editor/C4PropertyDlg.cpp
similarity index 100%
rename from engine/src/C4PropertyDlg.cpp
rename to src/editor/C4PropertyDlg.cpp
diff --git a/engine/inc/C4PropertyDlg.h b/src/editor/C4PropertyDlg.h
similarity index 100%
rename from engine/inc/C4PropertyDlg.h
rename to src/editor/C4PropertyDlg.h
diff --git a/engine/src/C4ToolsDlg.cpp b/src/editor/C4ToolsDlg.cpp
similarity index 100%
rename from engine/src/C4ToolsDlg.cpp
rename to src/editor/C4ToolsDlg.cpp
diff --git a/engine/inc/C4ToolsDlg.h b/src/editor/C4ToolsDlg.h
similarity index 100%
rename from engine/inc/C4ToolsDlg.h
rename to src/editor/C4ToolsDlg.h
diff --git a/engine/inc/C4Constants.h b/src/game/C4Constants.h
similarity index 100%
rename from engine/inc/C4Constants.h
rename to src/game/C4Constants.h
diff --git a/engine/inc/C4GameVersion.h b/src/game/C4GameVersion.h
similarity index 100%
rename from engine/inc/C4GameVersion.h
rename to src/game/C4GameVersion.h
diff --git a/engine/inc/C4Physics.h b/src/game/C4Physics.h
similarity index 100%
rename from engine/inc/C4Physics.h
rename to src/game/C4Physics.h
diff --git a/engine/src/C4Landscape.cpp b/src/game/landscape/C4Landscape.cpp
similarity index 100%
rename from engine/src/C4Landscape.cpp
rename to src/game/landscape/C4Landscape.cpp
diff --git a/engine/inc/C4Landscape.h b/src/game/landscape/C4Landscape.h
similarity index 100%
rename from engine/inc/C4Landscape.h
rename to src/game/landscape/C4Landscape.h
diff --git a/engine/src/C4Map.cpp b/src/game/landscape/C4Map.cpp
similarity index 100%
rename from engine/src/C4Map.cpp
rename to src/game/landscape/C4Map.cpp
diff --git a/engine/inc/C4Map.h b/src/game/landscape/C4Map.h
similarity index 100%
rename from engine/inc/C4Map.h
rename to src/game/landscape/C4Map.h
diff --git a/engine/src/C4MapCreatorS2.cpp b/src/game/landscape/C4MapCreatorS2.cpp
similarity index 100%
rename from engine/src/C4MapCreatorS2.cpp
rename to src/game/landscape/C4MapCreatorS2.cpp
diff --git a/engine/inc/C4MapCreatorS2.h b/src/game/landscape/C4MapCreatorS2.h
similarity index 100%
rename from engine/inc/C4MapCreatorS2.h
rename to src/game/landscape/C4MapCreatorS2.h
diff --git a/engine/src/C4MassMover.cpp b/src/game/landscape/C4MassMover.cpp
similarity index 100%
rename from engine/src/C4MassMover.cpp
rename to src/game/landscape/C4MassMover.cpp
diff --git a/engine/inc/C4MassMover.h b/src/game/landscape/C4MassMover.h
similarity index 100%
rename from engine/inc/C4MassMover.h
rename to src/game/landscape/C4MassMover.h
diff --git a/engine/src/C4Material.cpp b/src/game/landscape/C4Material.cpp
similarity index 100%
rename from engine/src/C4Material.cpp
rename to src/game/landscape/C4Material.cpp
diff --git a/engine/inc/C4Material.h b/src/game/landscape/C4Material.h
similarity index 100%
rename from engine/inc/C4Material.h
rename to src/game/landscape/C4Material.h
diff --git a/engine/src/C4MaterialList.cpp b/src/game/landscape/C4MaterialList.cpp
similarity index 100%
rename from engine/src/C4MaterialList.cpp
rename to src/game/landscape/C4MaterialList.cpp
diff --git a/engine/inc/C4MaterialList.h b/src/game/landscape/C4MaterialList.h
similarity index 100%
rename from engine/inc/C4MaterialList.h
rename to src/game/landscape/C4MaterialList.h
diff --git a/engine/src/C4PXS.cpp b/src/game/landscape/C4PXS.cpp
similarity index 100%
rename from engine/src/C4PXS.cpp
rename to src/game/landscape/C4PXS.cpp
diff --git a/engine/inc/C4PXS.h b/src/game/landscape/C4PXS.h
similarity index 100%
rename from engine/inc/C4PXS.h
rename to src/game/landscape/C4PXS.h
diff --git a/engine/src/C4Particles.cpp b/src/game/landscape/C4Particles.cpp
similarity index 100%
rename from engine/src/C4Particles.cpp
rename to src/game/landscape/C4Particles.cpp
diff --git a/engine/inc/C4Particles.h b/src/game/landscape/C4Particles.h
similarity index 100%
rename from engine/inc/C4Particles.h
rename to src/game/landscape/C4Particles.h
diff --git a/engine/src/C4PathFinder.cpp b/src/game/landscape/C4PathFinder.cpp
similarity index 100%
rename from engine/src/C4PathFinder.cpp
rename to src/game/landscape/C4PathFinder.cpp
diff --git a/engine/inc/C4PathFinder.h b/src/game/landscape/C4PathFinder.h
similarity index 100%
rename from engine/inc/C4PathFinder.h
rename to src/game/landscape/C4PathFinder.h
diff --git a/engine/src/C4Region.cpp b/src/game/landscape/C4Region.cpp
similarity index 100%
rename from engine/src/C4Region.cpp
rename to src/game/landscape/C4Region.cpp
diff --git a/engine/inc/C4Region.h b/src/game/landscape/C4Region.h
similarity index 100%
rename from engine/inc/C4Region.h
rename to src/game/landscape/C4Region.h
diff --git a/engine/src/C4Scenario.cpp b/src/game/landscape/C4Scenario.cpp
similarity index 100%
rename from engine/src/C4Scenario.cpp
rename to src/game/landscape/C4Scenario.cpp
diff --git a/engine/inc/C4Scenario.h b/src/game/landscape/C4Scenario.h
similarity index 100%
rename from engine/inc/C4Scenario.h
rename to src/game/landscape/C4Scenario.h
diff --git a/engine/src/C4Sky.cpp b/src/game/landscape/C4Sky.cpp
similarity index 100%
rename from engine/src/C4Sky.cpp
rename to src/game/landscape/C4Sky.cpp
diff --git a/engine/inc/C4Sky.h b/src/game/landscape/C4Sky.h
similarity index 100%
rename from engine/inc/C4Sky.h
rename to src/game/landscape/C4Sky.h
diff --git a/engine/src/C4SolidMask.cpp b/src/game/landscape/C4SolidMask.cpp
similarity index 100%
rename from engine/src/C4SolidMask.cpp
rename to src/game/landscape/C4SolidMask.cpp
diff --git a/engine/inc/C4SolidMask.h b/src/game/landscape/C4SolidMask.h
similarity index 100%
rename from engine/inc/C4SolidMask.h
rename to src/game/landscape/C4SolidMask.h
diff --git a/engine/src/C4Texture.cpp b/src/game/landscape/C4Texture.cpp
similarity index 100%
rename from engine/src/C4Texture.cpp
rename to src/game/landscape/C4Texture.cpp
diff --git a/engine/inc/C4Texture.h b/src/game/landscape/C4Texture.h
similarity index 100%
rename from engine/inc/C4Texture.h
rename to src/game/landscape/C4Texture.h
diff --git a/engine/src/C4Weather.cpp b/src/game/landscape/C4Weather.cpp
similarity index 100%
rename from engine/src/C4Weather.cpp
rename to src/game/landscape/C4Weather.cpp
diff --git a/engine/inc/C4Weather.h b/src/game/landscape/C4Weather.h
similarity index 100%
rename from engine/inc/C4Weather.h
rename to src/game/landscape/C4Weather.h
diff --git a/engine/src/C4Action.cpp b/src/game/object/C4Action.cpp
similarity index 100%
rename from engine/src/C4Action.cpp
rename to src/game/object/C4Action.cpp
diff --git a/engine/src/C4Command.cpp b/src/game/object/C4Command.cpp
similarity index 100%
rename from engine/src/C4Command.cpp
rename to src/game/object/C4Command.cpp
diff --git a/engine/inc/C4Command.h b/src/game/object/C4Command.h
similarity index 100%
rename from engine/inc/C4Command.h
rename to src/game/object/C4Command.h
diff --git a/engine/src/C4Def.cpp b/src/game/object/C4Def.cpp
similarity index 100%
rename from engine/src/C4Def.cpp
rename to src/game/object/C4Def.cpp
diff --git a/engine/inc/C4Def.h b/src/game/object/C4Def.h
similarity index 100%
rename from engine/inc/C4Def.h
rename to src/game/object/C4Def.h
diff --git a/engine/src/C4DefGraphics.cpp b/src/game/object/C4DefGraphics.cpp
similarity index 100%
rename from engine/src/C4DefGraphics.cpp
rename to src/game/object/C4DefGraphics.cpp
diff --git a/engine/inc/C4DefGraphics.h b/src/game/object/C4DefGraphics.h
similarity index 100%
rename from engine/inc/C4DefGraphics.h
rename to src/game/object/C4DefGraphics.h
diff --git a/engine/src/C4GameObjects.cpp b/src/game/object/C4GameObjects.cpp
similarity index 100%
rename from engine/src/C4GameObjects.cpp
rename to src/game/object/C4GameObjects.cpp
diff --git a/engine/inc/C4GameObjects.h b/src/game/object/C4GameObjects.h
similarity index 100%
rename from engine/inc/C4GameObjects.h
rename to src/game/object/C4GameObjects.h
diff --git a/engine/src/C4IDList.cpp b/src/game/object/C4IDList.cpp
similarity index 100%
rename from engine/src/C4IDList.cpp
rename to src/game/object/C4IDList.cpp
diff --git a/engine/inc/C4IDList.h b/src/game/object/C4IDList.h
similarity index 100%
rename from engine/inc/C4IDList.h
rename to src/game/object/C4IDList.h
diff --git a/engine/src/C4Id.cpp b/src/game/object/C4Id.cpp
similarity index 100%
rename from engine/src/C4Id.cpp
rename to src/game/object/C4Id.cpp
diff --git a/engine/inc/C4Id.h b/src/game/object/C4Id.h
similarity index 100%
rename from engine/inc/C4Id.h
rename to src/game/object/C4Id.h
diff --git a/engine/src/C4InfoCore.cpp b/src/game/object/C4InfoCore.cpp
similarity index 100%
rename from engine/src/C4InfoCore.cpp
rename to src/game/object/C4InfoCore.cpp
diff --git a/engine/inc/C4InfoCore.h b/src/game/object/C4InfoCore.h
similarity index 100%
rename from engine/inc/C4InfoCore.h
rename to src/game/object/C4InfoCore.h
diff --git a/engine/src/C4Movement.cpp b/src/game/object/C4Movement.cpp
similarity index 100%
rename from engine/src/C4Movement.cpp
rename to src/game/object/C4Movement.cpp
diff --git a/engine/src/C4Object.cpp b/src/game/object/C4Object.cpp
similarity index 100%
rename from engine/src/C4Object.cpp
rename to src/game/object/C4Object.cpp
diff --git a/engine/inc/C4Object.h b/src/game/object/C4Object.h
similarity index 100%
rename from engine/inc/C4Object.h
rename to src/game/object/C4Object.h
diff --git a/engine/src/C4ObjectCom.cpp b/src/game/object/C4ObjectCom.cpp
similarity index 100%
rename from engine/src/C4ObjectCom.cpp
rename to src/game/object/C4ObjectCom.cpp
diff --git a/engine/inc/C4ObjectCom.h b/src/game/object/C4ObjectCom.h
similarity index 100%
rename from engine/inc/C4ObjectCom.h
rename to src/game/object/C4ObjectCom.h
diff --git a/engine/src/C4ObjectInfo.cpp b/src/game/object/C4ObjectInfo.cpp
similarity index 100%
rename from engine/src/C4ObjectInfo.cpp
rename to src/game/object/C4ObjectInfo.cpp
diff --git a/engine/inc/C4ObjectInfo.h b/src/game/object/C4ObjectInfo.h
similarity index 100%
rename from engine/inc/C4ObjectInfo.h
rename to src/game/object/C4ObjectInfo.h
diff --git a/engine/src/C4ObjectInfoList.cpp b/src/game/object/C4ObjectInfoList.cpp
similarity index 100%
rename from engine/src/C4ObjectInfoList.cpp
rename to src/game/object/C4ObjectInfoList.cpp
diff --git a/engine/inc/C4ObjectInfoList.h b/src/game/object/C4ObjectInfoList.h
similarity index 100%
rename from engine/inc/C4ObjectInfoList.h
rename to src/game/object/C4ObjectInfoList.h
diff --git a/engine/src/C4ObjectList.cpp b/src/game/object/C4ObjectList.cpp
similarity index 100%
rename from engine/src/C4ObjectList.cpp
rename to src/game/object/C4ObjectList.cpp
diff --git a/engine/inc/C4ObjectList.h b/src/game/object/C4ObjectList.h
similarity index 100%
rename from engine/inc/C4ObjectList.h
rename to src/game/object/C4ObjectList.h
diff --git a/engine/src/C4ObjectMenu.cpp b/src/game/object/C4ObjectMenu.cpp
similarity index 100%
rename from engine/src/C4ObjectMenu.cpp
rename to src/game/object/C4ObjectMenu.cpp
diff --git a/engine/inc/C4ObjectMenu.h b/src/game/object/C4ObjectMenu.h
similarity index 100%
rename from engine/inc/C4ObjectMenu.h
rename to src/game/object/C4ObjectMenu.h
diff --git a/engine/src/C4Sector.cpp b/src/game/object/C4Sector.cpp
similarity index 100%
rename from engine/src/C4Sector.cpp
rename to src/game/object/C4Sector.cpp
diff --git a/engine/inc/C4Sector.h b/src/game/object/C4Sector.h
similarity index 100%
rename from engine/inc/C4Sector.h
rename to src/game/object/C4Sector.h
diff --git a/engine/src/C4Shape.cpp b/src/game/object/C4Shape.cpp
similarity index 100%
rename from engine/src/C4Shape.cpp
rename to src/game/object/C4Shape.cpp
diff --git a/engine/inc/C4Shape.h b/src/game/object/C4Shape.h
similarity index 100%
rename from engine/inc/C4Shape.h
rename to src/game/object/C4Shape.h
diff --git a/engine/src/C4Player.cpp b/src/game/player/C4Player.cpp
similarity index 100%
rename from engine/src/C4Player.cpp
rename to src/game/player/C4Player.cpp
diff --git a/engine/inc/C4Player.h b/src/game/player/C4Player.h
similarity index 100%
rename from engine/inc/C4Player.h
rename to src/game/player/C4Player.h
diff --git a/engine/src/C4PlayerList.cpp b/src/game/player/C4PlayerList.cpp
similarity index 100%
rename from engine/src/C4PlayerList.cpp
rename to src/game/player/C4PlayerList.cpp
diff --git a/engine/inc/C4PlayerList.h b/src/game/player/C4PlayerList.h
similarity index 100%
rename from engine/inc/C4PlayerList.h
rename to src/game/player/C4PlayerList.h
diff --git a/engine/src/C4RankSystem.cpp b/src/game/player/C4RankSystem.cpp
similarity index 100%
rename from engine/src/C4RankSystem.cpp
rename to src/game/player/C4RankSystem.cpp
diff --git a/engine/inc/C4RankSystem.h b/src/game/player/C4RankSystem.h
similarity index 100%
rename from engine/inc/C4RankSystem.h
rename to src/game/player/C4RankSystem.h
diff --git a/engine/src/C4Effect.cpp b/src/game/script/C4Effect.cpp
similarity index 100%
rename from engine/src/C4Effect.cpp
rename to src/game/script/C4Effect.cpp
diff --git a/engine/inc/C4Effects.h b/src/game/script/C4Effects.h
similarity index 100%
rename from engine/inc/C4Effects.h
rename to src/game/script/C4Effects.h
diff --git a/engine/src/C4FindObject.cpp b/src/game/script/C4FindObject.cpp
similarity index 100%
rename from engine/src/C4FindObject.cpp
rename to src/game/script/C4FindObject.cpp
diff --git a/engine/inc/C4FindObject.h b/src/game/script/C4FindObject.h
similarity index 100%
rename from engine/inc/C4FindObject.h
rename to src/game/script/C4FindObject.h
diff --git a/engine/src/C4Script.cpp b/src/game/script/C4Script.cpp
similarity index 99%
rename from engine/src/C4Script.cpp
rename to src/game/script/C4Script.cpp
index b7addcf23..261442b1e 100644
--- a/engine/src/C4Script.cpp
+++ b/src/game/script/C4Script.cpp
@@ -1352,12 +1352,6 @@ static long FnGetOwner(C4AulContext *cthr, C4Object *pObj)
return pObj->Owner;
}
-static long FnCrewMember(C4AulContext *cthr, C4Object *pObj)
- {
- if (!pObj) pObj=cthr->Obj; if (!pObj) return FALSE;
- return pObj->Def->CrewMember;
- }
-
static long FnGetController(C4AulContext *cthr, C4Object *pObj)
{
if (!pObj) pObj=cthr->Obj; if (!pObj) return NO_OWNER;
@@ -5887,7 +5881,6 @@ void InitFunctionMap(C4AulScriptEngine *pEngine)
AddFunc(pEngine, "SetAlive", FnSetAlive);
AddFunc(pEngine, "GetAlive", FnGetAlive);
AddFunc(pEngine, "GetDamage", FnGetDamage);
- AddFunc(pEngine, "CrewMember", FnCrewMember);
AddFunc(pEngine, "ComponentAll", FnComponentAll);
AddFunc(pEngine, "SetComDir", FnSetComDir);
AddFunc(pEngine, "GetComDir", FnGetComDir);
@@ -6512,9 +6505,9 @@ C4ScriptFnDef C4ScriptFnMap[]={
//{ "FindConstructionSite", 0 ,C4V_Bool ,{ C4V_C4ID ,C4V_Int ,C4V_Int ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,MkFnC4V FnFindConstructionSite , 0 },
{ "PathFree2", 1 ,C4V_Bool ,{ C4V_pC4Value,C4V_pC4Value,C4V_Int ,C4V_Int ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,MkFnC4V FnPathFree2_C4V , 0 },
{ "DeathAnnounce", 1 ,C4V_Bool ,{ C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,0 , FnDeathAnnounce },
- { "FindObject", 1 ,C4V_C4Object ,{ C4V_PropList,C4V_Int ,C4V_Int ,C4V_Int ,C4V_Int ,C4V_Int ,C4V_String ,C4V_C4Object,C4V_Any ,C4V_C4Object} ,0 , FnFindObject },
+ { "FindObject", 1 ,C4V_C4Object ,{ C4V_Array ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,0 , FnFindObject },
{ "FindObjects", 1 ,C4V_Array ,{ C4V_Array ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,0 , FnFindObjects },
- { "ObjectCount", 1 ,C4V_Int ,{ C4V_PropList,C4V_Int ,C4V_Int ,C4V_Int ,C4V_Int ,C4V_Int ,C4V_String ,C4V_C4Object,C4V_Any ,C4V_Int},0 , FnObjectCount },
+ { "ObjectCount", 1 ,C4V_Int ,{ C4V_Array ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,0 , FnObjectCount },
{ "ProtectedCall", 1 ,C4V_Any ,{ C4V_C4Object,C4V_String,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,MkFnC4V FnProtectedCall_C4V , 0 },
{ "PrivateCall", 1 ,C4V_Any ,{ C4V_C4Object,C4V_String,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,MkFnC4V FnPrivateCall_C4V , 0 },
{ "GameCall", 1 ,C4V_Any ,{ C4V_String ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any ,C4V_Any} ,MkFnC4V FnGameCall_C4V , 0 },
diff --git a/engine/inc/C4Script.h b/src/game/script/C4Script.h
similarity index 100%
rename from engine/inc/C4Script.h
rename to src/game/script/C4Script.h
diff --git a/engine/src/C4TransferZone.cpp b/src/game/script/C4TransferZone.cpp
similarity index 100%
rename from engine/src/C4TransferZone.cpp
rename to src/game/script/C4TransferZone.cpp
diff --git a/engine/inc/C4TransferZone.h b/src/game/script/C4TransferZone.h
similarity index 100%
rename from engine/inc/C4TransferZone.h
rename to src/game/script/C4TransferZone.h
diff --git a/engine/src/C4ChatDlg.cpp b/src/gui/C4ChatDlg.cpp
similarity index 100%
rename from engine/src/C4ChatDlg.cpp
rename to src/gui/C4ChatDlg.cpp
diff --git a/engine/inc/C4ChatDlg.h b/src/gui/C4ChatDlg.h
similarity index 100%
rename from engine/inc/C4ChatDlg.h
rename to src/gui/C4ChatDlg.h
diff --git a/engine/src/C4DownloadDlg.cpp b/src/gui/C4DownloadDlg.cpp
similarity index 100%
rename from engine/src/C4DownloadDlg.cpp
rename to src/gui/C4DownloadDlg.cpp
diff --git a/engine/inc/C4DownloadDlg.h b/src/gui/C4DownloadDlg.h
similarity index 100%
rename from engine/inc/C4DownloadDlg.h
rename to src/gui/C4DownloadDlg.h
diff --git a/engine/src/C4FileSelDlg.cpp b/src/gui/C4FileSelDlg.cpp
similarity index 100%
rename from engine/src/C4FileSelDlg.cpp
rename to src/gui/C4FileSelDlg.cpp
diff --git a/engine/inc/C4FileSelDlg.h b/src/gui/C4FileSelDlg.h
similarity index 100%
rename from engine/inc/C4FileSelDlg.h
rename to src/gui/C4FileSelDlg.h
diff --git a/engine/src/C4Folder.cpp b/src/gui/C4Folder.cpp
similarity index 100%
rename from engine/src/C4Folder.cpp
rename to src/gui/C4Folder.cpp
diff --git a/engine/inc/C4Folder.h b/src/gui/C4Folder.h
similarity index 100%
rename from engine/inc/C4Folder.h
rename to src/gui/C4Folder.h
diff --git a/engine/src/C4GameDialogs.cpp b/src/gui/C4GameDialogs.cpp
similarity index 100%
rename from engine/src/C4GameDialogs.cpp
rename to src/gui/C4GameDialogs.cpp
diff --git a/engine/inc/C4GameDialogs.h b/src/gui/C4GameDialogs.h
similarity index 100%
rename from engine/inc/C4GameDialogs.h
rename to src/gui/C4GameDialogs.h
diff --git a/engine/src/C4GameLobby.cpp b/src/gui/C4GameLobby.cpp
similarity index 100%
rename from engine/src/C4GameLobby.cpp
rename to src/gui/C4GameLobby.cpp
diff --git a/engine/inc/C4GameLobby.h b/src/gui/C4GameLobby.h
similarity index 100%
rename from engine/inc/C4GameLobby.h
rename to src/gui/C4GameLobby.h
diff --git a/engine/src/C4GameMessage.cpp b/src/gui/C4GameMessage.cpp
similarity index 100%
rename from engine/src/C4GameMessage.cpp
rename to src/gui/C4GameMessage.cpp
diff --git a/engine/inc/C4GameMessage.h b/src/gui/C4GameMessage.h
similarity index 100%
rename from engine/inc/C4GameMessage.h
rename to src/gui/C4GameMessage.h
diff --git a/engine/src/C4GameOptions.cpp b/src/gui/C4GameOptions.cpp
similarity index 100%
rename from engine/src/C4GameOptions.cpp
rename to src/gui/C4GameOptions.cpp
diff --git a/engine/inc/C4GameOptions.h b/src/gui/C4GameOptions.h
similarity index 100%
rename from engine/inc/C4GameOptions.h
rename to src/gui/C4GameOptions.h
diff --git a/engine/src/C4GameOverDlg.cpp b/src/gui/C4GameOverDlg.cpp
similarity index 100%
rename from engine/src/C4GameOverDlg.cpp
rename to src/gui/C4GameOverDlg.cpp
diff --git a/engine/inc/C4GameOverDlg.h b/src/gui/C4GameOverDlg.h
similarity index 100%
rename from engine/inc/C4GameOverDlg.h
rename to src/gui/C4GameOverDlg.h
diff --git a/engine/src/C4Gui.cpp b/src/gui/C4Gui.cpp
similarity index 100%
rename from engine/src/C4Gui.cpp
rename to src/gui/C4Gui.cpp
diff --git a/engine/inc/C4Gui.h b/src/gui/C4Gui.h
similarity index 100%
rename from engine/inc/C4Gui.h
rename to src/gui/C4Gui.h
diff --git a/engine/src/C4GuiButton.cpp b/src/gui/C4GuiButton.cpp
similarity index 100%
rename from engine/src/C4GuiButton.cpp
rename to src/gui/C4GuiButton.cpp
diff --git a/engine/src/C4GuiCheckBox.cpp b/src/gui/C4GuiCheckBox.cpp
similarity index 100%
rename from engine/src/C4GuiCheckBox.cpp
rename to src/gui/C4GuiCheckBox.cpp
diff --git a/engine/src/C4GuiComboBox.cpp b/src/gui/C4GuiComboBox.cpp
similarity index 100%
rename from engine/src/C4GuiComboBox.cpp
rename to src/gui/C4GuiComboBox.cpp
diff --git a/engine/src/C4GuiContainers.cpp b/src/gui/C4GuiContainers.cpp
similarity index 100%
rename from engine/src/C4GuiContainers.cpp
rename to src/gui/C4GuiContainers.cpp
diff --git a/engine/src/C4GuiDialogs.cpp b/src/gui/C4GuiDialogs.cpp
similarity index 100%
rename from engine/src/C4GuiDialogs.cpp
rename to src/gui/C4GuiDialogs.cpp
diff --git a/engine/src/C4GuiEdit.cpp b/src/gui/C4GuiEdit.cpp
similarity index 100%
rename from engine/src/C4GuiEdit.cpp
rename to src/gui/C4GuiEdit.cpp
diff --git a/engine/src/C4GuiLabels.cpp b/src/gui/C4GuiLabels.cpp
similarity index 100%
rename from engine/src/C4GuiLabels.cpp
rename to src/gui/C4GuiLabels.cpp
diff --git a/engine/src/C4GuiListBox.cpp b/src/gui/C4GuiListBox.cpp
similarity index 100%
rename from engine/src/C4GuiListBox.cpp
rename to src/gui/C4GuiListBox.cpp
diff --git a/engine/src/C4GuiMenu.cpp b/src/gui/C4GuiMenu.cpp
similarity index 100%
rename from engine/src/C4GuiMenu.cpp
rename to src/gui/C4GuiMenu.cpp
diff --git a/engine/src/C4GuiTabular.cpp b/src/gui/C4GuiTabular.cpp
similarity index 100%
rename from engine/src/C4GuiTabular.cpp
rename to src/gui/C4GuiTabular.cpp
diff --git a/engine/src/C4KeyboardInput.cpp b/src/gui/C4KeyboardInput.cpp
similarity index 100%
rename from engine/src/C4KeyboardInput.cpp
rename to src/gui/C4KeyboardInput.cpp
diff --git a/engine/inc/C4KeyboardInput.h b/src/gui/C4KeyboardInput.h
similarity index 100%
rename from engine/inc/C4KeyboardInput.h
rename to src/gui/C4KeyboardInput.h
diff --git a/engine/src/C4LoaderScreen.cpp b/src/gui/C4LoaderScreen.cpp
similarity index 100%
rename from engine/src/C4LoaderScreen.cpp
rename to src/gui/C4LoaderScreen.cpp
diff --git a/engine/inc/C4LoaderScreen.h b/src/gui/C4LoaderScreen.h
similarity index 100%
rename from engine/inc/C4LoaderScreen.h
rename to src/gui/C4LoaderScreen.h
diff --git a/engine/src/C4MainMenu.cpp b/src/gui/C4MainMenu.cpp
similarity index 100%
rename from engine/src/C4MainMenu.cpp
rename to src/gui/C4MainMenu.cpp
diff --git a/engine/inc/C4MainMenu.h b/src/gui/C4MainMenu.h
similarity index 100%
rename from engine/inc/C4MainMenu.h
rename to src/gui/C4MainMenu.h
diff --git a/engine/src/C4Menu.cpp b/src/gui/C4Menu.cpp
similarity index 100%
rename from engine/src/C4Menu.cpp
rename to src/gui/C4Menu.cpp
diff --git a/engine/inc/C4Menu.h b/src/gui/C4Menu.h
similarity index 100%
rename from engine/inc/C4Menu.h
rename to src/gui/C4Menu.h
diff --git a/engine/src/C4MessageBoard.cpp b/src/gui/C4MessageBoard.cpp
similarity index 100%
rename from engine/src/C4MessageBoard.cpp
rename to src/gui/C4MessageBoard.cpp
diff --git a/engine/inc/C4MessageBoard.h b/src/gui/C4MessageBoard.h
similarity index 100%
rename from engine/inc/C4MessageBoard.h
rename to src/gui/C4MessageBoard.h
diff --git a/engine/src/C4MessageInput.cpp b/src/gui/C4MessageInput.cpp
similarity index 100%
rename from engine/src/C4MessageInput.cpp
rename to src/gui/C4MessageInput.cpp
diff --git a/engine/inc/C4MessageInput.h b/src/gui/C4MessageInput.h
similarity index 100%
rename from engine/inc/C4MessageInput.h
rename to src/gui/C4MessageInput.h
diff --git a/engine/src/C4MouseControl.cpp b/src/gui/C4MouseControl.cpp
similarity index 100%
rename from engine/src/C4MouseControl.cpp
rename to src/gui/C4MouseControl.cpp
diff --git a/engine/inc/C4MouseControl.h b/src/gui/C4MouseControl.h
similarity index 100%
rename from engine/inc/C4MouseControl.h
rename to src/gui/C4MouseControl.h
diff --git a/engine/src/C4PlayerInfoListBox.cpp b/src/gui/C4PlayerInfoListBox.cpp
similarity index 100%
rename from engine/src/C4PlayerInfoListBox.cpp
rename to src/gui/C4PlayerInfoListBox.cpp
diff --git a/engine/inc/C4PlayerInfoListBox.h b/src/gui/C4PlayerInfoListBox.h
similarity index 100%
rename from engine/inc/C4PlayerInfoListBox.h
rename to src/gui/C4PlayerInfoListBox.h
diff --git a/engine/src/C4Scoreboard.cpp b/src/gui/C4Scoreboard.cpp
similarity index 100%
rename from engine/src/C4Scoreboard.cpp
rename to src/gui/C4Scoreboard.cpp
diff --git a/engine/inc/C4Scoreboard.h b/src/gui/C4Scoreboard.h
similarity index 100%
rename from engine/inc/C4Scoreboard.h
rename to src/gui/C4Scoreboard.h
diff --git a/engine/src/C4Startup.cpp b/src/gui/C4Startup.cpp
similarity index 100%
rename from engine/src/C4Startup.cpp
rename to src/gui/C4Startup.cpp
diff --git a/engine/inc/C4Startup.h b/src/gui/C4Startup.h
similarity index 100%
rename from engine/inc/C4Startup.h
rename to src/gui/C4Startup.h
diff --git a/engine/src/C4StartupAboutDlg.cpp b/src/gui/C4StartupAboutDlg.cpp
similarity index 100%
rename from engine/src/C4StartupAboutDlg.cpp
rename to src/gui/C4StartupAboutDlg.cpp
diff --git a/engine/inc/C4StartupAboutDlg.h b/src/gui/C4StartupAboutDlg.h
similarity index 100%
rename from engine/inc/C4StartupAboutDlg.h
rename to src/gui/C4StartupAboutDlg.h
diff --git a/engine/src/C4StartupMainDlg.cpp b/src/gui/C4StartupMainDlg.cpp
similarity index 100%
rename from engine/src/C4StartupMainDlg.cpp
rename to src/gui/C4StartupMainDlg.cpp
diff --git a/engine/inc/C4StartupMainDlg.h b/src/gui/C4StartupMainDlg.h
similarity index 100%
rename from engine/inc/C4StartupMainDlg.h
rename to src/gui/C4StartupMainDlg.h
diff --git a/engine/src/C4StartupNetDlg.cpp b/src/gui/C4StartupNetDlg.cpp
similarity index 100%
rename from engine/src/C4StartupNetDlg.cpp
rename to src/gui/C4StartupNetDlg.cpp
diff --git a/engine/inc/C4StartupNetDlg.h b/src/gui/C4StartupNetDlg.h
similarity index 100%
rename from engine/inc/C4StartupNetDlg.h
rename to src/gui/C4StartupNetDlg.h
diff --git a/engine/src/C4StartupOptionsDlg.cpp b/src/gui/C4StartupOptionsDlg.cpp
similarity index 100%
rename from engine/src/C4StartupOptionsDlg.cpp
rename to src/gui/C4StartupOptionsDlg.cpp
diff --git a/engine/inc/C4StartupOptionsDlg.h b/src/gui/C4StartupOptionsDlg.h
similarity index 100%
rename from engine/inc/C4StartupOptionsDlg.h
rename to src/gui/C4StartupOptionsDlg.h
diff --git a/engine/src/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp
similarity index 100%
rename from engine/src/C4StartupPlrSelDlg.cpp
rename to src/gui/C4StartupPlrSelDlg.cpp
diff --git a/engine/inc/C4StartupPlrSelDlg.h b/src/gui/C4StartupPlrSelDlg.h
similarity index 100%
rename from engine/inc/C4StartupPlrSelDlg.h
rename to src/gui/C4StartupPlrSelDlg.h
diff --git a/engine/src/C4StartupScenSelDlg.cpp b/src/gui/C4StartupScenSelDlg.cpp
similarity index 100%
rename from engine/src/C4StartupScenSelDlg.cpp
rename to src/gui/C4StartupScenSelDlg.cpp
diff --git a/engine/inc/C4StartupScenSelDlg.h b/src/gui/C4StartupScenSelDlg.h
similarity index 100%
rename from engine/inc/C4StartupScenSelDlg.h
rename to src/gui/C4StartupScenSelDlg.h
diff --git a/engine/src/C4UpdateDlg.cpp b/src/gui/C4UpdateDlg.cpp
similarity index 100%
rename from engine/src/C4UpdateDlg.cpp
rename to src/gui/C4UpdateDlg.cpp
diff --git a/engine/inc/C4UpdateDlg.h b/src/gui/C4UpdateDlg.h
similarity index 100%
rename from engine/inc/C4UpdateDlg.h
rename to src/gui/C4UpdateDlg.h
diff --git a/engine/src/C4UpperBoard.cpp b/src/gui/C4UpperBoard.cpp
similarity index 100%
rename from engine/src/C4UpperBoard.cpp
rename to src/gui/C4UpperBoard.cpp
diff --git a/engine/inc/C4UpperBoard.h b/src/gui/C4UpperBoard.h
similarity index 100%
rename from engine/inc/C4UpperBoard.h
rename to src/gui/C4UpperBoard.h
diff --git a/engine/inc/C4UserMessages.h b/src/gui/C4UserMessages.h
similarity index 100%
rename from engine/inc/C4UserMessages.h
rename to src/gui/C4UserMessages.h
diff --git a/engine/src/C4Viewport.cpp b/src/gui/C4Viewport.cpp
similarity index 100%
rename from engine/src/C4Viewport.cpp
rename to src/gui/C4Viewport.cpp
diff --git a/engine/inc/C4Viewport.h b/src/gui/C4Viewport.h
similarity index 100%
rename from engine/inc/C4Viewport.h
rename to src/gui/C4Viewport.h
diff --git a/engine/src/C4ComponentHost.cpp b/src/lib/C4ComponentHost.cpp
similarity index 100%
rename from engine/src/C4ComponentHost.cpp
rename to src/lib/C4ComponentHost.cpp
diff --git a/engine/inc/C4ComponentHost.h b/src/lib/C4ComponentHost.h
similarity index 100%
rename from engine/inc/C4ComponentHost.h
rename to src/lib/C4ComponentHost.h
diff --git a/engine/src/C4InputValidation.cpp b/src/lib/C4InputValidation.cpp
similarity index 100%
rename from engine/src/C4InputValidation.cpp
rename to src/lib/C4InputValidation.cpp
diff --git a/engine/inc/C4InputValidation.h b/src/lib/C4InputValidation.h
similarity index 100%
rename from engine/inc/C4InputValidation.h
rename to src/lib/C4InputValidation.h
diff --git a/engine/src/C4LangStringTable.cpp b/src/lib/C4LangStringTable.cpp
similarity index 100%
rename from engine/src/C4LangStringTable.cpp
rename to src/lib/C4LangStringTable.cpp
diff --git a/engine/inc/C4LangStringTable.h b/src/lib/C4LangStringTable.h
similarity index 100%
rename from engine/inc/C4LangStringTable.h
rename to src/lib/C4LangStringTable.h
diff --git a/engine/src/C4Log.cpp b/src/lib/C4Log.cpp
similarity index 100%
rename from engine/src/C4Log.cpp
rename to src/lib/C4Log.cpp
diff --git a/engine/inc/C4Log.h b/src/lib/C4Log.h
similarity index 100%
rename from engine/inc/C4Log.h
rename to src/lib/C4Log.h
diff --git a/engine/src/C4LogBuf.cpp b/src/lib/C4LogBuf.cpp
similarity index 100%
rename from engine/src/C4LogBuf.cpp
rename to src/lib/C4LogBuf.cpp
diff --git a/engine/inc/C4LogBuf.h b/src/lib/C4LogBuf.h
similarity index 100%
rename from engine/inc/C4LogBuf.h
rename to src/lib/C4LogBuf.h
diff --git a/engine/src/C4NameList.cpp b/src/lib/C4NameList.cpp
similarity index 100%
rename from engine/src/C4NameList.cpp
rename to src/lib/C4NameList.cpp
diff --git a/engine/inc/C4NameList.h b/src/lib/C4NameList.h
similarity index 100%
rename from engine/inc/C4NameList.h
rename to src/lib/C4NameList.h
diff --git a/engine/inc/C4RTF.H b/src/lib/C4RTF.H
similarity index 100%
rename from engine/inc/C4RTF.H
rename to src/lib/C4RTF.H
diff --git a/engine/src/C4RTF.cpp b/src/lib/C4RTF.cpp
similarity index 100%
rename from engine/src/C4RTF.cpp
rename to src/lib/C4RTF.cpp
diff --git a/engine/src/C4Random.cpp b/src/lib/C4Random.cpp
similarity index 95%
rename from engine/src/C4Random.cpp
rename to src/lib/C4Random.cpp
index 10271706a..e56de64c9 100644
--- a/engine/src/C4Random.cpp
+++ b/src/lib/C4Random.cpp
@@ -21,6 +21,9 @@
#include
#include
+int RandomCount = 0;
+unsigned int RandomHold = 0;
+
//--------------------------------------- Random3 -------------------------------------------------------
const int FRndRes=500;
diff --git a/engine/inc/C4Random.h b/src/lib/C4Random.h
similarity index 100%
rename from engine/inc/C4Random.h
rename to src/lib/C4Random.h
diff --git a/engine/src/C4Stat.cpp b/src/lib/C4Stat.cpp
similarity index 96%
rename from engine/src/C4Stat.cpp
rename to src/lib/C4Stat.cpp
index 53a34c28f..137eca64a 100644
--- a/engine/src/C4Stat.cpp
+++ b/src/lib/C4Stat.cpp
@@ -21,10 +21,6 @@
#include
#include
-#ifndef BIG_C4INCLUDE
-#include
-#endif
-
// ** implemetation of C4MainStat
C4MainStat::C4MainStat()
@@ -155,12 +151,12 @@ void C4MainStat::Show()
LogSilent("** Stat end");
}
-void C4MainStat::ShowPart()
+void C4MainStat::ShowPart(int FrameCounter)
{
C4Stat* pAkt;
// insert tick nr
- LogSilentF("** PartStat begin %d", Game.FrameCounter);
+ LogSilentF("** PartStat begin %d", FrameCounter);
// insert all stats
for(pAkt = pFirst; pAkt; pAkt = pAkt->pNext)
diff --git a/engine/inc/C4Stat.h b/src/lib/C4Stat.h
similarity index 95%
rename from engine/inc/C4Stat.h
rename to src/lib/C4Stat.h
index 0c4721a78..6428c6e7f 100644
--- a/engine/inc/C4Stat.h
+++ b/src/lib/C4Stat.h
@@ -32,7 +32,7 @@ public:
~C4MainStat();
void Show();
- void ShowPart();
+ void ShowPart(int FrameCounter);
void Reset();
void ResetPart();
@@ -141,7 +141,7 @@ protected:
#define C4ST_SHOWSTAT C4Stat::getMainStat()->Show();
// shows the statistic (to log)
- #define C4ST_SHOWPARTSTAT C4Stat::getMainStat()->ShowPart();
+ #define C4ST_SHOWPARTSTAT(FrameCounter) C4Stat::getMainStat()->ShowPart(FrameCounter);
// resets the whole statistic
#define C4ST_RESET C4Stat::getMainStat()->Reset();
@@ -156,7 +156,7 @@ protected:
#define C4ST_START(StatName)
#define C4ST_STOP(StatName)
#define C4ST_SHOWSTAT
- #define C4ST_SHOWPARTSTAT
+ #define C4ST_SHOWPARTSTAT(FrameCounter)
#define C4ST_RESET
#define C4ST_RESETPART
diff --git a/standard/src/Fixed.cpp b/src/lib/Fixed.cpp
similarity index 100%
rename from standard/src/Fixed.cpp
rename to src/lib/Fixed.cpp
diff --git a/standard/inc/Fixed.h b/src/lib/Fixed.h
similarity index 100%
rename from standard/inc/Fixed.h
rename to src/lib/Fixed.h
diff --git a/standard/src/PathFinder.cpp b/src/lib/PathFinder.cpp
similarity index 100%
rename from standard/src/PathFinder.cpp
rename to src/lib/PathFinder.cpp
diff --git a/standard/inc/PathFinder.h b/src/lib/PathFinder.h
similarity index 100%
rename from standard/inc/PathFinder.h
rename to src/lib/PathFinder.h
diff --git a/standard/src/Standard.cpp b/src/lib/Standard.cpp
similarity index 99%
rename from standard/src/Standard.cpp
rename to src/lib/Standard.cpp
index c30927f34..1f1329a3a 100644
--- a/standard/src/Standard.cpp
+++ b/src/lib/Standard.cpp
@@ -790,11 +790,6 @@ const char* SGetParameter(const char *strCommandLine, int iParameter, char *strT
return NULL;
}
-//------------------------- Global variables used by StdRandom -------------------------------
-
-/* extern */ int RandomCount = 0;
-/* extern */ unsigned int RandomHold = 0;
-
/* Some part of the Winapi */
#if defined(HAVE_PTHREAD) && defined(C4ENGINE) && defined(NEED_FALLBACK_ATOMIC_FUNCS)
diff --git a/standard/inc/Standard.h b/src/lib/Standard.h
similarity index 100%
rename from standard/inc/Standard.h
rename to src/lib/Standard.h
diff --git a/standard/inc/StdAdaptors.h b/src/lib/StdAdaptors.h
similarity index 100%
rename from standard/inc/StdAdaptors.h
rename to src/lib/StdAdaptors.h
diff --git a/standard/src/StdBase64.cpp b/src/lib/StdBase64.cpp
similarity index 100%
rename from standard/src/StdBase64.cpp
rename to src/lib/StdBase64.cpp
diff --git a/standard/inc/StdBase64.h b/src/lib/StdBase64.h
similarity index 100%
rename from standard/inc/StdBase64.h
rename to src/lib/StdBase64.h
diff --git a/standard/src/StdBuf.cpp b/src/lib/StdBuf.cpp
similarity index 100%
rename from standard/src/StdBuf.cpp
rename to src/lib/StdBuf.cpp
diff --git a/standard/inc/StdBuf.h b/src/lib/StdBuf.h
similarity index 100%
rename from standard/inc/StdBuf.h
rename to src/lib/StdBuf.h
diff --git a/standard/inc/StdColors.h b/src/lib/StdColors.h
similarity index 100%
rename from standard/inc/StdColors.h
rename to src/lib/StdColors.h
diff --git a/standard/src/StdCompiler.cpp b/src/lib/StdCompiler.cpp
similarity index 100%
rename from standard/src/StdCompiler.cpp
rename to src/lib/StdCompiler.cpp
diff --git a/standard/inc/StdCompiler.h b/src/lib/StdCompiler.h
similarity index 100%
rename from standard/inc/StdCompiler.h
rename to src/lib/StdCompiler.h
diff --git a/standard/src/StdMarkup.cpp b/src/lib/StdMarkup.cpp
similarity index 100%
rename from standard/src/StdMarkup.cpp
rename to src/lib/StdMarkup.cpp
diff --git a/standard/inc/StdMarkup.h b/src/lib/StdMarkup.h
similarity index 100%
rename from standard/inc/StdMarkup.h
rename to src/lib/StdMarkup.h
diff --git a/standard/inc/StdResStr.h b/src/lib/StdResStr.h
similarity index 100%
rename from standard/inc/StdResStr.h
rename to src/lib/StdResStr.h
diff --git a/standard/src/StdResStr2.cpp b/src/lib/StdResStr2.cpp
similarity index 100%
rename from standard/src/StdResStr2.cpp
rename to src/lib/StdResStr2.cpp
diff --git a/standard/inc/StdResStr2.h b/src/lib/StdResStr2.h
similarity index 100%
rename from standard/inc/StdResStr2.h
rename to src/lib/StdResStr2.h
diff --git a/engine/src/C4Facet.cpp b/src/lib/texture/C4Facet.cpp
similarity index 99%
rename from engine/src/C4Facet.cpp
rename to src/lib/texture/C4Facet.cpp
index ec3a1a801..4a43c6532 100644
--- a/engine/src/C4Facet.cpp
+++ b/src/lib/texture/C4Facet.cpp
@@ -23,7 +23,6 @@
#include
#include
-#include
#include
#include
diff --git a/engine/inc/C4Facet.h b/src/lib/texture/C4Facet.h
similarity index 100%
rename from engine/inc/C4Facet.h
rename to src/lib/texture/C4Facet.h
diff --git a/engine/src/C4FacetEx.cpp b/src/lib/texture/C4FacetEx.cpp
similarity index 100%
rename from engine/src/C4FacetEx.cpp
rename to src/lib/texture/C4FacetEx.cpp
diff --git a/engine/inc/C4FacetEx.h b/src/lib/texture/C4FacetEx.h
similarity index 100%
rename from engine/inc/C4FacetEx.h
rename to src/lib/texture/C4FacetEx.h
diff --git a/engine/src/C4GraphicsResource.cpp b/src/lib/texture/C4GraphicsResource.cpp
similarity index 99%
rename from engine/src/C4GraphicsResource.cpp
rename to src/lib/texture/C4GraphicsResource.cpp
index 9308b9b13..8bab17afe 100644
--- a/engine/src/C4GraphicsResource.cpp
+++ b/src/lib/texture/C4GraphicsResource.cpp
@@ -30,7 +30,7 @@
#include
#include
#include
-#include
+#include
#endif
#include
diff --git a/engine/inc/C4GraphicsResource.h b/src/lib/texture/C4GraphicsResource.h
similarity index 100%
rename from engine/inc/C4GraphicsResource.h
rename to src/lib/texture/C4GraphicsResource.h
diff --git a/engine/src/C4Surface.cpp b/src/lib/texture/C4Surface.cpp
similarity index 100%
rename from engine/src/C4Surface.cpp
rename to src/lib/texture/C4Surface.cpp
diff --git a/engine/inc/C4Surface.h b/src/lib/texture/C4Surface.h
similarity index 100%
rename from engine/inc/C4Surface.h
rename to src/lib/texture/C4Surface.h
diff --git a/engine/src/C4SurfaceFile.cpp b/src/lib/texture/C4SurfaceFile.cpp
similarity index 100%
rename from engine/src/C4SurfaceFile.cpp
rename to src/lib/texture/C4SurfaceFile.cpp
diff --git a/engine/inc/C4SurfaceFile.h b/src/lib/texture/C4SurfaceFile.h
similarity index 100%
rename from engine/inc/C4SurfaceFile.h
rename to src/lib/texture/C4SurfaceFile.h
diff --git a/standard/src/StdPNG.cpp b/src/lib/texture/StdPNG.cpp
similarity index 100%
rename from standard/src/StdPNG.cpp
rename to src/lib/texture/StdPNG.cpp
diff --git a/standard/inc/StdPNG.h b/src/lib/texture/StdPNG.h
similarity index 100%
rename from standard/inc/StdPNG.h
rename to src/lib/texture/StdPNG.h
diff --git a/engine/netio/NetIO.dsp b/src/netio/NetIO.dsp
similarity index 100%
rename from engine/netio/NetIO.dsp
rename to src/netio/NetIO.dsp
diff --git a/engine/netio/TstC4NetIO.cpp b/src/netio/TstC4NetIO.cpp
similarity index 100%
rename from engine/netio/TstC4NetIO.cpp
rename to src/netio/TstC4NetIO.cpp
diff --git a/netpuncher/Puncher.dsp b/src/netpuncher/Puncher.dsp
similarity index 100%
rename from netpuncher/Puncher.dsp
rename to src/netpuncher/Puncher.dsp
diff --git a/netpuncher/main.cpp b/src/netpuncher/main.cpp
similarity index 100%
rename from netpuncher/main.cpp
rename to src/netpuncher/main.cpp
diff --git a/engine/src/C4Client.cpp b/src/network/C4Client.cpp
similarity index 100%
rename from engine/src/C4Client.cpp
rename to src/network/C4Client.cpp
diff --git a/engine/inc/C4Client.h b/src/network/C4Client.h
similarity index 100%
rename from engine/inc/C4Client.h
rename to src/network/C4Client.h
diff --git a/engine/src/C4GameControlNetwork.cpp b/src/network/C4GameControlNetwork.cpp
similarity index 100%
rename from engine/src/C4GameControlNetwork.cpp
rename to src/network/C4GameControlNetwork.cpp
diff --git a/engine/inc/C4GameControlNetwork.h b/src/network/C4GameControlNetwork.h
similarity index 100%
rename from engine/inc/C4GameControlNetwork.h
rename to src/network/C4GameControlNetwork.h
diff --git a/engine/src/C4InteractiveThread.cpp b/src/network/C4InteractiveThread.cpp
similarity index 100%
rename from engine/src/C4InteractiveThread.cpp
rename to src/network/C4InteractiveThread.cpp
diff --git a/engine/inc/C4InteractiveThread.h b/src/network/C4InteractiveThread.h
similarity index 100%
rename from engine/inc/C4InteractiveThread.h
rename to src/network/C4InteractiveThread.h
diff --git a/engine/src/C4League.cpp b/src/network/C4League.cpp
similarity index 100%
rename from engine/src/C4League.cpp
rename to src/network/C4League.cpp
diff --git a/engine/inc/C4League.h b/src/network/C4League.h
similarity index 100%
rename from engine/inc/C4League.h
rename to src/network/C4League.h
diff --git a/engine/src/C4NetIO.cpp b/src/network/C4NetIO.cpp
similarity index 100%
rename from engine/src/C4NetIO.cpp
rename to src/network/C4NetIO.cpp
diff --git a/engine/inc/C4NetIO.h b/src/network/C4NetIO.h
similarity index 100%
rename from engine/inc/C4NetIO.h
rename to src/network/C4NetIO.h
diff --git a/engine/src/C4Network2.cpp b/src/network/C4Network2.cpp
similarity index 100%
rename from engine/src/C4Network2.cpp
rename to src/network/C4Network2.cpp
diff --git a/engine/inc/C4Network2.h b/src/network/C4Network2.h
similarity index 100%
rename from engine/inc/C4Network2.h
rename to src/network/C4Network2.h
diff --git a/engine/src/C4Network2Client.cpp b/src/network/C4Network2Client.cpp
similarity index 100%
rename from engine/src/C4Network2Client.cpp
rename to src/network/C4Network2Client.cpp
diff --git a/engine/inc/C4Network2Client.h b/src/network/C4Network2Client.h
similarity index 100%
rename from engine/inc/C4Network2Client.h
rename to src/network/C4Network2Client.h
diff --git a/engine/src/C4Network2Dialogs.cpp b/src/network/C4Network2Dialogs.cpp
similarity index 100%
rename from engine/src/C4Network2Dialogs.cpp
rename to src/network/C4Network2Dialogs.cpp
diff --git a/engine/inc/C4Network2Dialogs.h b/src/network/C4Network2Dialogs.h
similarity index 100%
rename from engine/inc/C4Network2Dialogs.h
rename to src/network/C4Network2Dialogs.h
diff --git a/engine/src/C4Network2Discover.cpp b/src/network/C4Network2Discover.cpp
similarity index 100%
rename from engine/src/C4Network2Discover.cpp
rename to src/network/C4Network2Discover.cpp
diff --git a/engine/inc/C4Network2Discover.h b/src/network/C4Network2Discover.h
similarity index 100%
rename from engine/inc/C4Network2Discover.h
rename to src/network/C4Network2Discover.h
diff --git a/engine/src/C4Network2IO.cpp b/src/network/C4Network2IO.cpp
similarity index 100%
rename from engine/src/C4Network2IO.cpp
rename to src/network/C4Network2IO.cpp
diff --git a/engine/inc/C4Network2IO.h b/src/network/C4Network2IO.h
similarity index 100%
rename from engine/inc/C4Network2IO.h
rename to src/network/C4Network2IO.h
diff --git a/engine/src/C4Network2IRC.cpp b/src/network/C4Network2IRC.cpp
similarity index 100%
rename from engine/src/C4Network2IRC.cpp
rename to src/network/C4Network2IRC.cpp
diff --git a/engine/inc/C4Network2IRC.h b/src/network/C4Network2IRC.h
similarity index 100%
rename from engine/inc/C4Network2IRC.h
rename to src/network/C4Network2IRC.h
diff --git a/engine/src/C4Network2Players.cpp b/src/network/C4Network2Players.cpp
similarity index 100%
rename from engine/src/C4Network2Players.cpp
rename to src/network/C4Network2Players.cpp
diff --git a/engine/inc/C4Network2Players.h b/src/network/C4Network2Players.h
similarity index 100%
rename from engine/inc/C4Network2Players.h
rename to src/network/C4Network2Players.h
diff --git a/engine/src/C4Network2Reference.cpp b/src/network/C4Network2Reference.cpp
similarity index 100%
rename from engine/src/C4Network2Reference.cpp
rename to src/network/C4Network2Reference.cpp
diff --git a/engine/inc/C4Network2Reference.h b/src/network/C4Network2Reference.h
similarity index 100%
rename from engine/inc/C4Network2Reference.h
rename to src/network/C4Network2Reference.h
diff --git a/engine/src/C4Network2Res.cpp b/src/network/C4Network2Res.cpp
similarity index 100%
rename from engine/src/C4Network2Res.cpp
rename to src/network/C4Network2Res.cpp
diff --git a/engine/inc/C4Network2Res.h b/src/network/C4Network2Res.h
similarity index 100%
rename from engine/inc/C4Network2Res.h
rename to src/network/C4Network2Res.h
diff --git a/engine/src/C4Network2ResDlg.cpp b/src/network/C4Network2ResDlg.cpp
similarity index 100%
rename from engine/src/C4Network2ResDlg.cpp
rename to src/network/C4Network2ResDlg.cpp
diff --git a/engine/src/C4Network2Stats.cpp b/src/network/C4Network2Stats.cpp
similarity index 100%
rename from engine/src/C4Network2Stats.cpp
rename to src/network/C4Network2Stats.cpp
diff --git a/engine/inc/C4Network2Stats.h b/src/network/C4Network2Stats.h
similarity index 100%
rename from engine/inc/C4Network2Stats.h
rename to src/network/C4Network2Stats.h
diff --git a/engine/src/C4Packet2.cpp b/src/network/C4Packet2.cpp
similarity index 100%
rename from engine/src/C4Packet2.cpp
rename to src/network/C4Packet2.cpp
diff --git a/engine/inc/C4PacketBase.h b/src/network/C4PacketBase.h
similarity index 100%
rename from engine/inc/C4PacketBase.h
rename to src/network/C4PacketBase.h
diff --git a/standard/src/Bitmap256.cpp b/src/platform/Bitmap256.cpp
similarity index 100%
rename from standard/src/Bitmap256.cpp
rename to src/platform/Bitmap256.cpp
diff --git a/standard/inc/Bitmap256.h b/src/platform/Bitmap256.h
similarity index 100%
rename from standard/inc/Bitmap256.h
rename to src/platform/Bitmap256.h
diff --git a/engine/src/C4FileClasses.cpp b/src/platform/C4FileClasses.cpp
similarity index 100%
rename from engine/src/C4FileClasses.cpp
rename to src/platform/C4FileClasses.cpp
diff --git a/engine/inc/C4FileClasses.h b/src/platform/C4FileClasses.h
similarity index 100%
rename from engine/inc/C4FileClasses.h
rename to src/platform/C4FileClasses.h
diff --git a/engine/src/C4FileMonitor.cpp b/src/platform/C4FileMonitor.cpp
similarity index 100%
rename from engine/src/C4FileMonitor.cpp
rename to src/platform/C4FileMonitor.cpp
diff --git a/engine/inc/C4FileMonitor.h b/src/platform/C4FileMonitor.h
similarity index 100%
rename from engine/inc/C4FileMonitor.h
rename to src/platform/C4FileMonitor.h
diff --git a/engine/src/C4Fonts.cpp b/src/platform/C4Fonts.cpp
similarity index 100%
rename from engine/src/C4Fonts.cpp
rename to src/platform/C4Fonts.cpp
diff --git a/engine/inc/C4Fonts.h b/src/platform/C4Fonts.h
similarity index 100%
rename from engine/inc/C4Fonts.h
rename to src/platform/C4Fonts.h
diff --git a/engine/src/C4GamePadCon.cpp b/src/platform/C4GamePadCon.cpp
similarity index 100%
rename from engine/src/C4GamePadCon.cpp
rename to src/platform/C4GamePadCon.cpp
diff --git a/engine/inc/C4GamePadCon.h b/src/platform/C4GamePadCon.h
similarity index 100%
rename from engine/inc/C4GamePadCon.h
rename to src/platform/C4GamePadCon.h
diff --git a/engine/src/C4MusicFile.cpp b/src/platform/C4MusicFile.cpp
similarity index 100%
rename from engine/src/C4MusicFile.cpp
rename to src/platform/C4MusicFile.cpp
diff --git a/engine/inc/C4MusicFile.h b/src/platform/C4MusicFile.h
similarity index 100%
rename from engine/inc/C4MusicFile.h
rename to src/platform/C4MusicFile.h
diff --git a/engine/src/C4MusicSystem.cpp b/src/platform/C4MusicSystem.cpp
similarity index 100%
rename from engine/src/C4MusicSystem.cpp
rename to src/platform/C4MusicSystem.cpp
diff --git a/engine/inc/C4MusicSystem.h b/src/platform/C4MusicSystem.h
similarity index 100%
rename from engine/inc/C4MusicSystem.h
rename to src/platform/C4MusicSystem.h
diff --git a/engine/src/C4SoundSystem.cpp b/src/platform/C4SoundSystem.cpp
similarity index 100%
rename from engine/src/C4SoundSystem.cpp
rename to src/platform/C4SoundSystem.cpp
diff --git a/engine/inc/C4SoundSystem.h b/src/platform/C4SoundSystem.h
similarity index 100%
rename from engine/inc/C4SoundSystem.h
rename to src/platform/C4SoundSystem.h
diff --git a/engine/src/C4Video.cpp b/src/platform/C4Video.cpp
similarity index 100%
rename from engine/src/C4Video.cpp
rename to src/platform/C4Video.cpp
diff --git a/engine/inc/C4Video.h b/src/platform/C4Video.h
similarity index 100%
rename from engine/inc/C4Video.h
rename to src/platform/C4Video.h
diff --git a/engine/src/C4VideoPlayback.cpp b/src/platform/C4VideoPlayback.cpp
similarity index 100%
rename from engine/src/C4VideoPlayback.cpp
rename to src/platform/C4VideoPlayback.cpp
diff --git a/engine/inc/C4VideoPlayback.h b/src/platform/C4VideoPlayback.h
similarity index 100%
rename from engine/inc/C4VideoPlayback.h
rename to src/platform/C4VideoPlayback.h
diff --git a/standard/src/DInputX.cpp b/src/platform/DInputX.cpp
similarity index 100%
rename from standard/src/DInputX.cpp
rename to src/platform/DInputX.cpp
diff --git a/standard/inc/DInputX.h b/src/platform/DInputX.h
similarity index 100%
rename from standard/inc/DInputX.h
rename to src/platform/DInputX.h
diff --git a/standard/src/DSoundX.cpp b/src/platform/DSoundX.cpp
similarity index 100%
rename from standard/src/DSoundX.cpp
rename to src/platform/DSoundX.cpp
diff --git a/standard/inc/DSoundX.h b/src/platform/DSoundX.h
similarity index 100%
rename from standard/inc/DSoundX.h
rename to src/platform/DSoundX.h
diff --git a/standard/src/MacUtility.mm b/src/platform/MacUtility.mm
similarity index 100%
rename from standard/src/MacUtility.mm
rename to src/platform/MacUtility.mm
diff --git a/standard/src/Midi.cpp b/src/platform/Midi.cpp
similarity index 100%
rename from standard/src/Midi.cpp
rename to src/platform/Midi.cpp
diff --git a/standard/inc/Midi.h b/src/platform/Midi.h
similarity index 100%
rename from standard/inc/Midi.h
rename to src/platform/Midi.h
diff --git a/standard/src/OpenURL.cpp b/src/platform/OpenURL.cpp
similarity index 100%
rename from standard/src/OpenURL.cpp
rename to src/platform/OpenURL.cpp
diff --git a/standard/src/StdConfig.cpp b/src/platform/StdConfig.cpp
similarity index 100%
rename from standard/src/StdConfig.cpp
rename to src/platform/StdConfig.cpp
diff --git a/standard/inc/StdConfig.h b/src/platform/StdConfig.h
similarity index 100%
rename from standard/inc/StdConfig.h
rename to src/platform/StdConfig.h
diff --git a/standard/src/StdD3D.cpp b/src/platform/StdD3D.cpp
similarity index 100%
rename from standard/src/StdD3D.cpp
rename to src/platform/StdD3D.cpp
diff --git a/standard/inc/StdD3D.h b/src/platform/StdD3D.h
similarity index 100%
rename from standard/inc/StdD3D.h
rename to src/platform/StdD3D.h
diff --git a/standard/src/StdD3DShader.cpp b/src/platform/StdD3DShader.cpp
similarity index 100%
rename from standard/src/StdD3DShader.cpp
rename to src/platform/StdD3DShader.cpp
diff --git a/standard/inc/StdD3DShader.h b/src/platform/StdD3DShader.h
similarity index 100%
rename from standard/inc/StdD3DShader.h
rename to src/platform/StdD3DShader.h
diff --git a/standard/src/StdDDraw2.cpp b/src/platform/StdDDraw2.cpp
similarity index 100%
rename from standard/src/StdDDraw2.cpp
rename to src/platform/StdDDraw2.cpp
diff --git a/standard/inc/StdDDraw2.h b/src/platform/StdDDraw2.h
similarity index 100%
rename from standard/inc/StdDDraw2.h
rename to src/platform/StdDDraw2.h
diff --git a/standard/inc/StdFacet.h b/src/platform/StdFacet.h
similarity index 100%
rename from standard/inc/StdFacet.h
rename to src/platform/StdFacet.h
diff --git a/standard/src/StdFile.cpp b/src/platform/StdFile.cpp
similarity index 100%
rename from standard/src/StdFile.cpp
rename to src/platform/StdFile.cpp
diff --git a/standard/inc/StdFile.h b/src/platform/StdFile.h
similarity index 100%
rename from standard/inc/StdFile.h
rename to src/platform/StdFile.h
diff --git a/standard/src/StdFont.cpp b/src/platform/StdFont.cpp
similarity index 100%
rename from standard/src/StdFont.cpp
rename to src/platform/StdFont.cpp
diff --git a/standard/inc/StdFont.h b/src/platform/StdFont.h
similarity index 100%
rename from standard/inc/StdFont.h
rename to src/platform/StdFont.h
diff --git a/standard/src/StdGL.cpp b/src/platform/StdGL.cpp
similarity index 100%
rename from standard/src/StdGL.cpp
rename to src/platform/StdGL.cpp
diff --git a/standard/inc/StdGL.h b/src/platform/StdGL.h
similarity index 100%
rename from standard/inc/StdGL.h
rename to src/platform/StdGL.h
diff --git a/standard/src/StdGLCtx.cpp b/src/platform/StdGLCtx.cpp
similarity index 100%
rename from standard/src/StdGLCtx.cpp
rename to src/platform/StdGLCtx.cpp
diff --git a/standard/src/StdGtkWindow.cpp b/src/platform/StdGtkWindow.cpp
similarity index 98%
rename from standard/src/StdGtkWindow.cpp
rename to src/platform/StdGtkWindow.cpp
index df78ee112..6569c40f0 100644
--- a/standard/src/StdGtkWindow.cpp
+++ b/src/platform/StdGtkWindow.cpp
@@ -20,13 +20,13 @@
#include
-#include "../../engine/res/c4x.xpm"
+#include "c4x.xpm"
#include
#include
#include
#include
-#include "../../engine/inc/C4Version.h"
+#include "C4Version.h"
/* CStdGtkWindow */
diff --git a/standard/inc/StdGtkWindow.h b/src/platform/StdGtkWindow.h
similarity index 100%
rename from standard/inc/StdGtkWindow.h
rename to src/platform/StdGtkWindow.h
diff --git a/standard/src/StdJoystick.cpp b/src/platform/StdJoystick.cpp
similarity index 100%
rename from standard/src/StdJoystick.cpp
rename to src/platform/StdJoystick.cpp
diff --git a/standard/inc/StdJoystick.h b/src/platform/StdJoystick.h
similarity index 100%
rename from standard/inc/StdJoystick.h
rename to src/platform/StdJoystick.h
diff --git a/standard/src/StdNoGfx.cpp b/src/platform/StdNoGfx.cpp
similarity index 100%
rename from standard/src/StdNoGfx.cpp
rename to src/platform/StdNoGfx.cpp
diff --git a/standard/inc/StdNoGfx.h b/src/platform/StdNoGfx.h
similarity index 100%
rename from standard/inc/StdNoGfx.h
rename to src/platform/StdNoGfx.h
diff --git a/standard/src/StdRegistry.cpp b/src/platform/StdRegistry.cpp
similarity index 100%
rename from standard/src/StdRegistry.cpp
rename to src/platform/StdRegistry.cpp
diff --git a/standard/inc/StdRegistry.h b/src/platform/StdRegistry.h
similarity index 100%
rename from standard/inc/StdRegistry.h
rename to src/platform/StdRegistry.h
diff --git a/standard/src/StdSDLApp.cpp b/src/platform/StdSDLApp.cpp
similarity index 100%
rename from standard/src/StdSDLApp.cpp
rename to src/platform/StdSDLApp.cpp
diff --git a/standard/src/StdSDLWindow.cpp b/src/platform/StdSDLWindow.cpp
similarity index 98%
rename from standard/src/StdSDLWindow.cpp
rename to src/platform/StdSDLWindow.cpp
index 9cc76461d..a587ab0cf 100644
--- a/standard/src/StdSDLWindow.cpp
+++ b/src/platform/StdSDLWindow.cpp
@@ -25,7 +25,7 @@
#include
#include
-#include "../../engine/inc/C4Version.h"
+#include "C4Version.h"
/* CStdWindow */
diff --git a/standard/src/StdScheduler.cpp b/src/platform/StdScheduler.cpp
similarity index 100%
rename from standard/src/StdScheduler.cpp
rename to src/platform/StdScheduler.cpp
diff --git a/standard/inc/StdScheduler.h b/src/platform/StdScheduler.h
similarity index 100%
rename from standard/inc/StdScheduler.h
rename to src/platform/StdScheduler.h
diff --git a/standard/src/StdSurface2.cpp b/src/platform/StdSurface2.cpp
similarity index 100%
rename from standard/src/StdSurface2.cpp
rename to src/platform/StdSurface2.cpp
diff --git a/standard/inc/StdSurface2.h b/src/platform/StdSurface2.h
similarity index 100%
rename from standard/inc/StdSurface2.h
rename to src/platform/StdSurface2.h
diff --git a/standard/src/StdSurface8.cpp b/src/platform/StdSurface8.cpp
similarity index 100%
rename from standard/src/StdSurface8.cpp
rename to src/platform/StdSurface8.cpp
diff --git a/standard/inc/StdSurface8.h b/src/platform/StdSurface8.h
similarity index 100%
rename from standard/inc/StdSurface8.h
rename to src/platform/StdSurface8.h
diff --git a/standard/inc/StdSync.h b/src/platform/StdSync.h
similarity index 100%
rename from standard/inc/StdSync.h
rename to src/platform/StdSync.h
diff --git a/standard/src/StdTApp.cpp b/src/platform/StdTApp.cpp
similarity index 100%
rename from standard/src/StdTApp.cpp
rename to src/platform/StdTApp.cpp
diff --git a/standard/src/StdVideo.cpp b/src/platform/StdVideo.cpp
similarity index 100%
rename from standard/src/StdVideo.cpp
rename to src/platform/StdVideo.cpp
diff --git a/standard/inc/StdVideo.h b/src/platform/StdVideo.h
similarity index 100%
rename from standard/inc/StdVideo.h
rename to src/platform/StdVideo.h
diff --git a/standard/src/StdWindow.cpp b/src/platform/StdWindow.cpp
similarity index 99%
rename from standard/src/StdWindow.cpp
rename to src/platform/StdWindow.cpp
index c13649c3c..bf9a7fc35 100644
--- a/standard/src/StdWindow.cpp
+++ b/src/platform/StdWindow.cpp
@@ -46,8 +46,8 @@
#endif
-#include "../../engine/res/resource.h"
-#include "../../engine/inc/C4Version.h"
+#include "resource.h"
+#include "C4Version.h"
#define C4FullScreenClassName "C4FullScreen"
LRESULT APIENTRY FullScreenWinProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
diff --git a/standard/inc/StdWindow.h b/src/platform/StdWindow.h
similarity index 100%
rename from standard/inc/StdWindow.h
rename to src/platform/StdWindow.h
diff --git a/standard/src/StdXApp.cpp b/src/platform/StdXApp.cpp
similarity index 100%
rename from standard/src/StdXApp.cpp
rename to src/platform/StdXApp.cpp
diff --git a/standard/src/StdXPrivate.h b/src/platform/StdXPrivate.h
similarity index 100%
rename from standard/src/StdXPrivate.h
rename to src/platform/StdXPrivate.h
diff --git a/standard/src/StdXWindow.cpp b/src/platform/StdXWindow.cpp
similarity index 99%
rename from standard/src/StdXWindow.cpp
rename to src/platform/StdXWindow.cpp
index 4308e713f..676064055 100644
--- a/standard/src/StdXWindow.cpp
+++ b/src/platform/StdXWindow.cpp
@@ -27,11 +27,11 @@
#include
#include
-#include "../../engine/inc/C4Version.h"
+#include "C4Version.h"
#ifdef USE_X11
#define BOOL _BOOL
-#include "../../engine/res/c4x.xpm"
+#include "c4x.xpm"
#include
#include
#include
diff --git a/engine/res/Brush.bmp b/src/res/Brush.bmp
similarity index 100%
rename from engine/res/Brush.bmp
rename to src/res/Brush.bmp
diff --git a/engine/res/Brush.h b/src/res/Brush.h
similarity index 100%
rename from engine/res/Brush.h
rename to src/res/Brush.h
diff --git a/engine/res/Brush2.bmp b/src/res/Brush2.bmp
similarity index 100%
rename from engine/res/Brush2.bmp
rename to src/res/Brush2.bmp
diff --git a/engine/res/Brush_Trans.png b/src/res/Brush_Trans.png
similarity index 100%
rename from engine/res/Brush_Trans.png
rename to src/res/Brush_Trans.png
diff --git a/engine/res/Cursor.bmp b/src/res/Cursor.bmp
similarity index 100%
rename from engine/res/Cursor.bmp
rename to src/res/Cursor.bmp
diff --git a/engine/res/Cursor.h b/src/res/Cursor.h
similarity index 100%
rename from engine/res/Cursor.h
rename to src/res/Cursor.h
diff --git a/engine/res/Cursor2.bmp b/src/res/Cursor2.bmp
similarity index 100%
rename from engine/res/Cursor2.bmp
rename to src/res/Cursor2.bmp
diff --git a/engine/res/Cursor_Trans.png b/src/res/Cursor_Trans.png
similarity index 100%
rename from engine/res/Cursor_Trans.png
rename to src/res/Cursor_Trans.png
diff --git a/engine/res/Dynamic.h b/src/res/Dynamic.h
similarity index 100%
rename from engine/res/Dynamic.h
rename to src/res/Dynamic.h
diff --git a/engine/res/Dynamic_Trans.png b/src/res/Dynamic_Trans.png
similarity index 100%
rename from engine/res/Dynamic_Trans.png
rename to src/res/Dynamic_Trans.png
diff --git a/engine/res/Exact.h b/src/res/Exact.h
similarity index 100%
rename from engine/res/Exact.h
rename to src/res/Exact.h
diff --git a/engine/res/Exact_Trans.png b/src/res/Exact_Trans.png
similarity index 100%
rename from engine/res/Exact_Trans.png
rename to src/res/Exact_Trans.png
diff --git a/engine/res/Fill.bmp b/src/res/Fill.bmp
similarity index 100%
rename from engine/res/Fill.bmp
rename to src/res/Fill.bmp
diff --git a/engine/res/Fill.h b/src/res/Fill.h
similarity index 100%
rename from engine/res/Fill.h
rename to src/res/Fill.h
diff --git a/engine/res/Fill_Trans.png b/src/res/Fill_Trans.png
similarity index 100%
rename from engine/res/Fill_Trans.png
rename to src/res/Fill_Trans.png
diff --git a/engine/res/Game.pal b/src/res/Game.pal
similarity index 100%
rename from engine/res/Game.pal
rename to src/res/Game.pal
diff --git a/engine/res/Grab.bmp b/src/res/Grab.bmp
similarity index 100%
rename from engine/res/Grab.bmp
rename to src/res/Grab.bmp
diff --git a/engine/res/Halt.bmp b/src/res/Halt.bmp
similarity index 100%
rename from engine/res/Halt.bmp
rename to src/res/Halt.bmp
diff --git a/engine/res/Halt.h b/src/res/Halt.h
similarity index 100%
rename from engine/res/Halt.h
rename to src/res/Halt.h
diff --git a/engine/res/Halt2.bmp b/src/res/Halt2.bmp
similarity index 100%
rename from engine/res/Halt2.bmp
rename to src/res/Halt2.bmp
diff --git a/engine/res/Halt_Trans.png b/src/res/Halt_Trans.png
similarity index 100%
rename from engine/res/Halt_Trans.png
rename to src/res/Halt_Trans.png
diff --git a/engine/res/IFT.bmp b/src/res/IFT.bmp
similarity index 100%
rename from engine/res/IFT.bmp
rename to src/res/IFT.bmp
diff --git a/engine/res/Ift.h b/src/res/Ift.h
similarity index 100%
rename from engine/res/Ift.h
rename to src/res/Ift.h
diff --git a/engine/res/Ift_Trans.png b/src/res/Ift_Trans.png
similarity index 100%
rename from engine/res/Ift_Trans.png
rename to src/res/Ift_Trans.png
diff --git a/engine/res/Line.bmp b/src/res/Line.bmp
similarity index 100%
rename from engine/res/Line.bmp
rename to src/res/Line.bmp
diff --git a/engine/res/Line.h b/src/res/Line.h
similarity index 100%
rename from engine/res/Line.h
rename to src/res/Line.h
diff --git a/engine/res/Line_Trans.png b/src/res/Line_Trans.png
similarity index 100%
rename from engine/res/Line_Trans.png
rename to src/res/Line_Trans.png
diff --git a/engine/res/Mouse.h b/src/res/Mouse.h
similarity index 100%
rename from engine/res/Mouse.h
rename to src/res/Mouse.h
diff --git a/engine/res/Mouse_Trans.png b/src/res/Mouse_Trans.png
similarity index 100%
rename from engine/res/Mouse_Trans.png
rename to src/res/Mouse_Trans.png
diff --git a/engine/res/NoIFT.bmp b/src/res/NoIFT.bmp
similarity index 100%
rename from engine/res/NoIFT.bmp
rename to src/res/NoIFT.bmp
diff --git a/engine/res/NoIft.h b/src/res/NoIft.h
similarity index 100%
rename from engine/res/NoIft.h
rename to src/res/NoIft.h
diff --git a/engine/res/NoIft_Trans.png b/src/res/NoIft_Trans.png
similarity index 100%
rename from engine/res/NoIft_Trans.png
rename to src/res/NoIft_Trans.png
diff --git a/engine/res/Picker.h b/src/res/Picker.h
similarity index 100%
rename from engine/res/Picker.h
rename to src/res/Picker.h
diff --git a/engine/res/Picker_Trans.png b/src/res/Picker_Trans.png
similarity index 100%
rename from engine/res/Picker_Trans.png
rename to src/res/Picker_Trans.png
diff --git a/engine/res/Play.bmp b/src/res/Play.bmp
similarity index 100%
rename from engine/res/Play.bmp
rename to src/res/Play.bmp
diff --git a/engine/res/Play.h b/src/res/Play.h
similarity index 100%
rename from engine/res/Play.h
rename to src/res/Play.h
diff --git a/engine/res/Play2.bmp b/src/res/Play2.bmp
similarity index 100%
rename from engine/res/Play2.bmp
rename to src/res/Play2.bmp
diff --git a/engine/res/Play_Trans.png b/src/res/Play_Trans.png
similarity index 100%
rename from engine/res/Play_Trans.png
rename to src/res/Play_Trans.png
diff --git a/engine/res/Rect.h b/src/res/Rect.h
similarity index 100%
rename from engine/res/Rect.h
rename to src/res/Rect.h
diff --git a/engine/res/Rect_Trans.png b/src/res/Rect_Trans.png
similarity index 100%
rename from engine/res/Rect_Trans.png
rename to src/res/Rect_Trans.png
diff --git a/engine/res/Rectangle.bmp b/src/res/Rectangle.bmp
similarity index 100%
rename from engine/res/Rectangle.bmp
rename to src/res/Rectangle.bmp
diff --git a/engine/res/Static.h b/src/res/Static.h
similarity index 100%
rename from engine/res/Static.h
rename to src/res/Static.h
diff --git a/engine/res/Static_Trans.png b/src/res/Static_Trans.png
similarity index 100%
rename from engine/res/Static_Trans.png
rename to src/res/Static_Trans.png
diff --git a/engine/res/brush1.bmp b/src/res/brush1.bmp
similarity index 100%
rename from engine/res/brush1.bmp
rename to src/res/brush1.bmp
diff --git a/engine/res/c4b.ico b/src/res/c4b.ico
similarity index 100%
rename from engine/res/c4b.ico
rename to src/res/c4b.ico
diff --git a/engine/res/c4d.ico b/src/res/c4d.ico
similarity index 100%
rename from engine/res/c4d.ico
rename to src/res/c4d.ico
diff --git a/engine/res/c4f.ico b/src/res/c4f.ico
similarity index 100%
rename from engine/res/c4f.ico
rename to src/res/c4f.ico
diff --git a/engine/res/c4g.ico b/src/res/c4g.ico
similarity index 100%
rename from engine/res/c4g.ico
rename to src/res/c4g.ico
diff --git a/engine/res/c4i.ico b/src/res/c4i.ico
similarity index 100%
rename from engine/res/c4i.ico
rename to src/res/c4i.ico
diff --git a/engine/res/c4k.ico b/src/res/c4k.ico
similarity index 100%
rename from engine/res/c4k.ico
rename to src/res/c4k.ico
diff --git a/engine/res/c4l.ico b/src/res/c4l.ico
similarity index 100%
rename from engine/res/c4l.ico
rename to src/res/c4l.ico
diff --git a/engine/res/c4m.ico b/src/res/c4m.ico
similarity index 100%
rename from engine/res/c4m.ico
rename to src/res/c4m.ico
diff --git a/engine/res/c4p.ico b/src/res/c4p.ico
similarity index 100%
rename from engine/res/c4p.ico
rename to src/res/c4p.ico
diff --git a/engine/res/c4s.ico b/src/res/c4s.ico
similarity index 100%
rename from engine/res/c4s.ico
rename to src/res/c4s.ico
diff --git a/engine/res/c4u.ico b/src/res/c4u.ico
similarity index 100%
rename from engine/res/c4u.ico
rename to src/res/c4u.ico
diff --git a/engine/res/c4v.ico b/src/res/c4v.ico
similarity index 100%
rename from engine/res/c4v.ico
rename to src/res/c4v.ico
diff --git a/engine/res/c4x.ico b/src/res/c4x.ico
similarity index 100%
rename from engine/res/c4x.ico
rename to src/res/c4x.ico
diff --git a/engine/res/c4x.xpm b/src/res/c4x.xpm
similarity index 100%
rename from engine/res/c4x.xpm
rename to src/res/c4x.xpm
diff --git a/engine/res/cz.ico b/src/res/cz.ico
similarity index 100%
rename from engine/res/cz.ico
rename to src/res/cz.ico
diff --git a/engine/res/dynamic1.bmp b/src/res/dynamic1.bmp
similarity index 100%
rename from engine/res/dynamic1.bmp
rename to src/res/dynamic1.bmp
diff --git a/engine/res/engine.rc b/src/res/engine.rc
similarity index 99%
rename from engine/res/engine.rc
rename to src/res/engine.rc
index 49cc9d45e..76cd607ca 100644
--- a/engine/res/engine.rc
+++ b/src/res/engine.rc
@@ -2,7 +2,7 @@
//
#include "resource.h"
-#include "../inc/C4Version.h"
+#include "C4Version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
diff --git a/engine/res/fill1.bmp b/src/res/fill1.bmp
similarity index 100%
rename from engine/res/fill1.bmp
rename to src/res/fill1.bmp
diff --git a/engine/res/ift1.bmp b/src/res/ift1.bmp
similarity index 100%
rename from engine/res/ift1.bmp
rename to src/res/ift1.bmp
diff --git a/engine/res/line1.bmp b/src/res/line1.bmp
similarity index 100%
rename from engine/res/line1.bmp
rename to src/res/line1.bmp
diff --git a/engine/res/mouse.bmp b/src/res/mouse.bmp
similarity index 100%
rename from engine/res/mouse.bmp
rename to src/res/mouse.bmp
diff --git a/engine/res/mouse1.bmp b/src/res/mouse1.bmp
similarity index 100%
rename from engine/res/mouse1.bmp
rename to src/res/mouse1.bmp
diff --git a/engine/res/picker1.bmp b/src/res/picker1.bmp
similarity index 100%
rename from engine/res/picker1.bmp
rename to src/res/picker1.bmp
diff --git a/engine/res/rect1.bmp b/src/res/rect1.bmp
similarity index 100%
rename from engine/res/rect1.bmp
rename to src/res/rect1.bmp
diff --git a/engine/res/resource.h b/src/res/resource.h
similarity index 100%
rename from engine/res/resource.h
rename to src/res/resource.h
diff --git a/engine/res/static1.bmp b/src/res/static1.bmp
similarity index 100%
rename from engine/res/static1.bmp
rename to src/res/static1.bmp
diff --git a/engine/src/C4AList.cpp b/src/script/C4AList.cpp
similarity index 100%
rename from engine/src/C4AList.cpp
rename to src/script/C4AList.cpp
diff --git a/engine/inc/C4AList.h b/src/script/C4AList.h
similarity index 100%
rename from engine/inc/C4AList.h
rename to src/script/C4AList.h
diff --git a/engine/src/C4Aul.cpp b/src/script/C4Aul.cpp
similarity index 100%
rename from engine/src/C4Aul.cpp
rename to src/script/C4Aul.cpp
diff --git a/engine/inc/C4Aul.h b/src/script/C4Aul.h
similarity index 100%
rename from engine/inc/C4Aul.h
rename to src/script/C4Aul.h
diff --git a/engine/src/C4AulExec.cpp b/src/script/C4AulExec.cpp
similarity index 100%
rename from engine/src/C4AulExec.cpp
rename to src/script/C4AulExec.cpp
diff --git a/engine/src/C4AulLink.cpp b/src/script/C4AulLink.cpp
similarity index 100%
rename from engine/src/C4AulLink.cpp
rename to src/script/C4AulLink.cpp
diff --git a/engine/src/C4AulParse.cpp b/src/script/C4AulParse.cpp
similarity index 100%
rename from engine/src/C4AulParse.cpp
rename to src/script/C4AulParse.cpp
diff --git a/engine/src/C4PropList.cpp b/src/script/C4PropList.cpp
similarity index 100%
rename from engine/src/C4PropList.cpp
rename to src/script/C4PropList.cpp
diff --git a/engine/inc/C4PropList.h b/src/script/C4PropList.h
similarity index 100%
rename from engine/inc/C4PropList.h
rename to src/script/C4PropList.h
diff --git a/engine/src/C4ScriptHost.cpp b/src/script/C4ScriptHost.cpp
similarity index 100%
rename from engine/src/C4ScriptHost.cpp
rename to src/script/C4ScriptHost.cpp
diff --git a/engine/inc/C4ScriptHost.h b/src/script/C4ScriptHost.h
similarity index 100%
rename from engine/inc/C4ScriptHost.h
rename to src/script/C4ScriptHost.h
diff --git a/engine/src/C4StringTable.cpp b/src/script/C4StringTable.cpp
similarity index 100%
rename from engine/src/C4StringTable.cpp
rename to src/script/C4StringTable.cpp
diff --git a/engine/inc/C4StringTable.h b/src/script/C4StringTable.h
similarity index 100%
rename from engine/inc/C4StringTable.h
rename to src/script/C4StringTable.h
diff --git a/engine/src/C4Value.cpp b/src/script/C4Value.cpp
similarity index 100%
rename from engine/src/C4Value.cpp
rename to src/script/C4Value.cpp
diff --git a/engine/inc/C4Value.h b/src/script/C4Value.h
similarity index 100%
rename from engine/inc/C4Value.h
rename to src/script/C4Value.h
diff --git a/engine/src/C4ValueList.cpp b/src/script/C4ValueList.cpp
similarity index 100%
rename from engine/src/C4ValueList.cpp
rename to src/script/C4ValueList.cpp
diff --git a/engine/inc/C4ValueList.h b/src/script/C4ValueList.h
similarity index 100%
rename from engine/inc/C4ValueList.h
rename to src/script/C4ValueList.h
diff --git a/engine/src/C4ValueMap.cpp b/src/script/C4ValueMap.cpp
similarity index 100%
rename from engine/src/C4ValueMap.cpp
rename to src/script/C4ValueMap.cpp
diff --git a/engine/inc/C4ValueMap.h b/src/script/C4ValueMap.h
similarity index 100%
rename from engine/inc/C4ValueMap.h
rename to src/script/C4ValueMap.h
diff --git a/standard/zlib/gzio.c b/src/zlib/gzio.c
similarity index 100%
rename from standard/zlib/gzio.c
rename to src/zlib/gzio.c
diff --git a/standard/zlib/zutil.h b/src/zlib/zutil.h
similarity index 100%
rename from standard/zlib/zutil.h
rename to src/zlib/zutil.h
diff --git a/standard/inc/StdRandom.h b/standard/inc/StdRandom.h
deleted file mode 100644
index 16402bc03..000000000
--- a/standard/inc/StdRandom.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * OpenClonk, http://www.openclonk.org
- *
- * Copyright (c) 1998-2000 Matthes Bender
- * Copyright (c) 2002, 2004 Sven Eberhardt
- * 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.
- */
-
-/* Some wrappers to runtime-library random */
-
-#ifndef INC_STDRANDOM
-#define INC_STDRANDOM
-
-#include
-
-extern int RandomCount;
-extern unsigned int RandomHold;
-
-inline void FixedRandom(DWORD dwSeed)
- {
- RandomHold=dwSeed; // srand
- RandomCount=0;
- }
-
-inline void Randomize()
- {
- FixedRandom((unsigned)time(NULL));
- }
-
-inline int Random(int iRange)
- {
- RandomCount++;
- if (iRange==0) return 0;
- RandomHold = RandomHold * 214013L + 2531011L;
- return (RandomHold >> 16) % iRange;
- }
-
-#endif // INC_STDRANDOM