From 572d00c32eec1adbd8dc6acd3ec6388f585b84dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Mon, 10 Aug 2009 17:59:18 +0200 Subject: [PATCH] Move all source files This might make stuff easier to find. --- CMakeLists.txt | 866 +++++++------- Makefile.am | 1038 +++++++++-------- configure.ac | 2 +- group/resource.h | 15 - {engine/src => src}/C4Application.cpp | 0 {engine/inc => src}/C4Application.h | 0 {engine/src => src}/C4FullScreen.cpp | 0 {engine/inc => src}/C4FullScreen.h | 0 {engine/src => src}/C4Game.cpp | 0 {engine/inc => src}/C4Game.h | 0 {engine/src => src}/C4GraphicsSystem.cpp | 0 {engine/inc => src}/C4GraphicsSystem.h | 0 {engine/src => src}/C4Include.cpp | 0 {engine/inc => src}/C4Include.h | 0 {engine/inc => src}/C4Prototypes.h | 0 {engine/inc => src}/C4Version.h | 0 {engine/src => src}/C4WinMain.cpp | 0 {engine/inc => src/c4group}/C4Components.h | 0 {engine/src => src/c4group}/C4Extra.cpp | 0 {engine/inc => src/c4group}/C4Extra.h | 0 {engine/src => src/c4group}/C4Group.cpp | 0 {engine/inc => src/c4group}/C4Group.h | 0 {engine/src => src/c4group}/C4GroupSet.cpp | 0 {engine/inc => src/c4group}/C4GroupSet.h | 0 {engine/src => src/c4group}/C4Language.cpp | 0 {engine/inc => src/c4group}/C4Language.h | 0 {engine/src => src/c4group}/C4Update.cpp | 0 {engine/inc => src/c4group}/C4Update.h | 0 {standard/src => src/c4group}/CStdFile.cpp | 0 {standard/inc => src/c4group}/CStdFile.h | 0 {group => src/c4group}/Resource.rc | 2 +- {group => src/c4group}/c4group_cmdl.cpp | 0 {group => src/c4group}/c4group_ng.cpp | 0 {group => src/c4group}/gunzip4c4group.cpp | 0 {engine/src => src/config}/C4Config.cpp | 0 {engine/inc => src/config}/C4Config.h | 0 .../sec => src/config}/C4ConfigShareware.cpp | 0 .../sec => src/config}/C4ConfigShareware.h | 0 .../config}/C4SecurityCertificates.cpp | 0 .../config}/C4SecurityCertificates.h | 0 {engine/src => src/control}/C4Control.cpp | 0 {engine/inc => src/control}/C4Control.h | 0 {engine/src => src/control}/C4GameControl.cpp | 0 {engine/inc => src/control}/C4GameControl.h | 0 .../src => src/control}/C4GameParameters.cpp | 0 .../inc => src/control}/C4GameParameters.h | 0 {engine/src => src/control}/C4GameSave.cpp | 0 {engine/inc => src/control}/C4GameSave.h | 0 {engine/src => src/control}/C4PlayerInfo.cpp | 0 {engine/inc => src/control}/C4PlayerInfo.h | 0 .../control}/C4PlayerInfoConflicts.cpp | 0 {engine/src => src/control}/C4Record.cpp | 0 {engine/inc => src/control}/C4Record.h | 0 .../src => src/control}/C4RoundResults.cpp | 0 {engine/inc => src/control}/C4RoundResults.h | 0 {engine/src => src/control}/C4Teams.cpp | 0 {engine/inc => src/control}/C4Teams.h | 0 {engine/src => src/editor}/C4Console.cpp | 0 {engine/inc => src/editor}/C4Console.h | 0 {engine/src => src/editor}/C4DevmodeDlg.cpp | 0 {engine/inc => src/editor}/C4DevmodeDlg.h | 0 {engine/src => src/editor}/C4EditCursor.cpp | 0 {engine/inc => src/editor}/C4EditCursor.h | 0 .../src => src/editor}/C4ObjectListDlg.cpp | 0 {engine/inc => src/editor}/C4ObjectListDlg.h | 0 {engine/src => src/editor}/C4PropertyDlg.cpp | 0 {engine/inc => src/editor}/C4PropertyDlg.h | 0 {engine/src => src/editor}/C4ToolsDlg.cpp | 0 {engine/inc => src/editor}/C4ToolsDlg.h | 0 {engine/inc => src/game}/C4Constants.h | 0 {engine/inc => src/game}/C4GameVersion.h | 0 {engine/inc => src/game}/C4Physics.h | 0 .../game/landscape}/C4Landscape.cpp | 0 .../inc => src/game/landscape}/C4Landscape.h | 0 {engine/src => src/game/landscape}/C4Map.cpp | 0 {engine/inc => src/game/landscape}/C4Map.h | 0 .../game/landscape}/C4MapCreatorS2.cpp | 0 .../game/landscape}/C4MapCreatorS2.h | 0 .../game/landscape}/C4MassMover.cpp | 0 .../inc => src/game/landscape}/C4MassMover.h | 0 .../src => src/game/landscape}/C4Material.cpp | 0 .../inc => src/game/landscape}/C4Material.h | 0 .../game/landscape}/C4MaterialList.cpp | 0 .../game/landscape}/C4MaterialList.h | 0 {engine/src => src/game/landscape}/C4PXS.cpp | 0 {engine/inc => src/game/landscape}/C4PXS.h | 0 .../game/landscape}/C4Particles.cpp | 0 .../inc => src/game/landscape}/C4Particles.h | 0 .../game/landscape}/C4PathFinder.cpp | 0 .../inc => src/game/landscape}/C4PathFinder.h | 0 .../src => src/game/landscape}/C4Region.cpp | 0 {engine/inc => src/game/landscape}/C4Region.h | 0 .../src => src/game/landscape}/C4Scenario.cpp | 0 .../inc => src/game/landscape}/C4Scenario.h | 0 {engine/src => src/game/landscape}/C4Sky.cpp | 0 {engine/inc => src/game/landscape}/C4Sky.h | 0 .../game/landscape}/C4SolidMask.cpp | 0 .../inc => src/game/landscape}/C4SolidMask.h | 0 .../src => src/game/landscape}/C4Texture.cpp | 0 .../inc => src/game/landscape}/C4Texture.h | 0 .../src => src/game/landscape}/C4Weather.cpp | 0 .../inc => src/game/landscape}/C4Weather.h | 0 {engine/src => src/game/object}/C4Action.cpp | 0 {engine/src => src/game/object}/C4Command.cpp | 0 {engine/inc => src/game/object}/C4Command.h | 0 {engine/src => src/game/object}/C4Def.cpp | 0 {engine/inc => src/game/object}/C4Def.h | 0 .../src => src/game/object}/C4DefGraphics.cpp | 0 .../inc => src/game/object}/C4DefGraphics.h | 0 .../src => src/game/object}/C4GameObjects.cpp | 0 .../inc => src/game/object}/C4GameObjects.h | 0 {engine/src => src/game/object}/C4IDList.cpp | 0 {engine/inc => src/game/object}/C4IDList.h | 0 {engine/src => src/game/object}/C4Id.cpp | 0 {engine/inc => src/game/object}/C4Id.h | 0 .../src => src/game/object}/C4InfoCore.cpp | 0 {engine/inc => src/game/object}/C4InfoCore.h | 0 .../src => src/game/object}/C4Movement.cpp | 0 {engine/src => src/game/object}/C4Object.cpp | 0 {engine/inc => src/game/object}/C4Object.h | 0 .../src => src/game/object}/C4ObjectCom.cpp | 0 {engine/inc => src/game/object}/C4ObjectCom.h | 0 .../src => src/game/object}/C4ObjectInfo.cpp | 0 .../inc => src/game/object}/C4ObjectInfo.h | 0 .../game/object}/C4ObjectInfoList.cpp | 0 .../game/object}/C4ObjectInfoList.h | 0 .../src => src/game/object}/C4ObjectList.cpp | 0 .../inc => src/game/object}/C4ObjectList.h | 0 .../src => src/game/object}/C4ObjectMenu.cpp | 0 .../inc => src/game/object}/C4ObjectMenu.h | 0 {engine/src => src/game/object}/C4Sector.cpp | 0 {engine/inc => src/game/object}/C4Sector.h | 0 {engine/src => src/game/object}/C4Shape.cpp | 0 {engine/inc => src/game/object}/C4Shape.h | 0 {engine/src => src/game/player}/C4Player.cpp | 0 {engine/inc => src/game/player}/C4Player.h | 0 .../src => src/game/player}/C4PlayerList.cpp | 0 .../inc => src/game/player}/C4PlayerList.h | 0 .../src => src/game/player}/C4RankSystem.cpp | 0 .../inc => src/game/player}/C4RankSystem.h | 0 {engine/src => src/game/script}/C4Effect.cpp | 0 {engine/inc => src/game/script}/C4Effects.h | 0 .../src => src/game/script}/C4FindObject.cpp | 0 .../inc => src/game/script}/C4FindObject.h | 0 {engine/src => src/game/script}/C4Script.cpp | 0 {engine/inc => src/game/script}/C4Script.h | 0 .../game/script}/C4TransferZone.cpp | 0 .../inc => src/game/script}/C4TransferZone.h | 0 {engine/src => src/gui}/C4ChatDlg.cpp | 0 {engine/inc => src/gui}/C4ChatDlg.h | 0 {engine/src => src/gui}/C4DownloadDlg.cpp | 0 {engine/inc => src/gui}/C4DownloadDlg.h | 0 {engine/src => src/gui}/C4FileSelDlg.cpp | 0 {engine/inc => src/gui}/C4FileSelDlg.h | 0 {engine/src => src/gui}/C4Folder.cpp | 0 {engine/inc => src/gui}/C4Folder.h | 0 {engine/src => src/gui}/C4GameDialogs.cpp | 0 {engine/inc => src/gui}/C4GameDialogs.h | 0 {engine/src => src/gui}/C4GameLobby.cpp | 0 {engine/inc => src/gui}/C4GameLobby.h | 0 {engine/src => src/gui}/C4GameMessage.cpp | 0 {engine/inc => src/gui}/C4GameMessage.h | 0 {engine/src => src/gui}/C4GameOptions.cpp | 0 {engine/inc => src/gui}/C4GameOptions.h | 0 {engine/src => src/gui}/C4GameOverDlg.cpp | 0 {engine/inc => src/gui}/C4GameOverDlg.h | 0 {engine/src => src/gui}/C4Gui.cpp | 0 {engine/inc => src/gui}/C4Gui.h | 0 {engine/src => src/gui}/C4GuiButton.cpp | 0 {engine/src => src/gui}/C4GuiCheckBox.cpp | 0 {engine/src => src/gui}/C4GuiComboBox.cpp | 0 {engine/src => src/gui}/C4GuiContainers.cpp | 0 {engine/src => src/gui}/C4GuiDialogs.cpp | 0 {engine/src => src/gui}/C4GuiEdit.cpp | 0 {engine/src => src/gui}/C4GuiLabels.cpp | 0 {engine/src => src/gui}/C4GuiListBox.cpp | 0 {engine/src => src/gui}/C4GuiMenu.cpp | 0 {engine/src => src/gui}/C4GuiTabular.cpp | 0 {engine/src => src/gui}/C4KeyboardInput.cpp | 0 {engine/inc => src/gui}/C4KeyboardInput.h | 0 {engine/src => src/gui}/C4LoaderScreen.cpp | 0 {engine/inc => src/gui}/C4LoaderScreen.h | 0 {engine/src => src/gui}/C4MainMenu.cpp | 0 {engine/inc => src/gui}/C4MainMenu.h | 0 {engine/src => src/gui}/C4Menu.cpp | 0 {engine/inc => src/gui}/C4Menu.h | 0 {engine/src => src/gui}/C4MessageBoard.cpp | 0 {engine/inc => src/gui}/C4MessageBoard.h | 0 {engine/src => src/gui}/C4MessageInput.cpp | 0 {engine/inc => src/gui}/C4MessageInput.h | 0 {engine/src => src/gui}/C4MouseControl.cpp | 0 {engine/inc => src/gui}/C4MouseControl.h | 0 .../src => src/gui}/C4PlayerInfoListBox.cpp | 0 {engine/inc => src/gui}/C4PlayerInfoListBox.h | 0 {engine/src => src/gui}/C4Scoreboard.cpp | 0 {engine/inc => src/gui}/C4Scoreboard.h | 0 {engine/src => src/gui}/C4Startup.cpp | 0 {engine/inc => src/gui}/C4Startup.h | 0 {engine/src => src/gui}/C4StartupAboutDlg.cpp | 0 {engine/inc => src/gui}/C4StartupAboutDlg.h | 0 {engine/src => src/gui}/C4StartupMainDlg.cpp | 0 {engine/inc => src/gui}/C4StartupMainDlg.h | 0 {engine/src => src/gui}/C4StartupNetDlg.cpp | 0 {engine/inc => src/gui}/C4StartupNetDlg.h | 0 .../src => src/gui}/C4StartupOptionsDlg.cpp | 0 {engine/inc => src/gui}/C4StartupOptionsDlg.h | 0 .../src => src/gui}/C4StartupPlrSelDlg.cpp | 0 {engine/inc => src/gui}/C4StartupPlrSelDlg.h | 0 .../src => src/gui}/C4StartupScenSelDlg.cpp | 0 {engine/inc => src/gui}/C4StartupScenSelDlg.h | 0 {engine/src => src/gui}/C4UpdateDlg.cpp | 0 {engine/inc => src/gui}/C4UpdateDlg.h | 0 {engine/src => src/gui}/C4UpperBoard.cpp | 0 {engine/inc => src/gui}/C4UpperBoard.h | 0 {engine/inc => src/gui}/C4UserMessages.h | 0 {engine/src => src/gui}/C4Viewport.cpp | 0 {engine/inc => src/gui}/C4Viewport.h | 0 {engine/src => src/lib}/C4ComponentHost.cpp | 0 {engine/inc => src/lib}/C4ComponentHost.h | 0 {engine/src => src/lib}/C4InputValidation.cpp | 0 {engine/inc => src/lib}/C4InputValidation.h | 0 {engine/src => src/lib}/C4LangStringTable.cpp | 0 {engine/inc => src/lib}/C4LangStringTable.h | 0 {engine/src => src/lib}/C4Log.cpp | 0 {engine/inc => src/lib}/C4Log.h | 0 {engine/src => src/lib}/C4LogBuf.cpp | 0 {engine/inc => src/lib}/C4LogBuf.h | 0 {engine/src => src/lib}/C4NameList.cpp | 0 {engine/inc => src/lib}/C4NameList.h | 0 {engine/inc => src/lib}/C4RTF.H | 0 {engine/src => src/lib}/C4RTF.cpp | 0 {engine/src => src/lib}/C4Random.cpp | 0 {engine/inc => src/lib}/C4Random.h | 0 {engine/src => src/lib}/C4Stat.cpp | 0 {engine/inc => src/lib}/C4Stat.h | 0 {standard/src => src/lib}/Fixed.cpp | 0 {standard/inc => src/lib}/Fixed.h | 0 {standard/src => src/lib}/PathFinder.cpp | 0 {standard/inc => src/lib}/PathFinder.h | 0 {standard/src => src/lib}/Standard.cpp | 0 {standard/inc => src/lib}/Standard.h | 0 {standard/inc => src/lib}/StdAdaptors.h | 0 {standard/src => src/lib}/StdBase64.cpp | 0 {standard/inc => src/lib}/StdBase64.h | 0 {standard/src => src/lib}/StdBuf.cpp | 0 {standard/inc => src/lib}/StdBuf.h | 0 {standard/inc => src/lib}/StdColors.h | 0 {standard/src => src/lib}/StdCompiler.cpp | 0 {standard/inc => src/lib}/StdCompiler.h | 0 {standard/src => src/lib}/StdMarkup.cpp | 0 {standard/inc => src/lib}/StdMarkup.h | 0 {standard/inc => src/lib}/StdResStr.h | 0 {standard/src => src/lib}/StdResStr2.cpp | 0 {standard/inc => src/lib}/StdResStr2.h | 0 {engine/src => src/lib/texture}/C4Facet.cpp | 0 {engine/inc => src/lib/texture}/C4Facet.h | 0 {engine/src => src/lib/texture}/C4FacetEx.cpp | 0 {engine/inc => src/lib/texture}/C4FacetEx.h | 0 .../lib/texture}/C4GraphicsResource.cpp | 0 .../lib/texture}/C4GraphicsResource.h | 0 {engine/src => src/lib/texture}/C4Surface.cpp | 0 {engine/inc => src/lib/texture}/C4Surface.h | 0 .../src => src/lib/texture}/C4SurfaceFile.cpp | 0 .../inc => src/lib/texture}/C4SurfaceFile.h | 0 {standard/src => src/lib/texture}/StdPNG.cpp | 0 {standard/inc => src/lib/texture}/StdPNG.h | 0 {engine => src}/netio/NetIO.dsp | 0 {engine => src}/netio/TstC4NetIO.cpp | 0 {netpuncher => src/netpuncher}/Puncher.dsp | 0 {netpuncher => src/netpuncher}/main.cpp | 0 {engine/src => src/network}/C4Client.cpp | 0 {engine/inc => src/network}/C4Client.h | 0 .../network}/C4GameControlNetwork.cpp | 0 .../network}/C4GameControlNetwork.h | 0 .../network}/C4InteractiveThread.cpp | 0 .../inc => src/network}/C4InteractiveThread.h | 0 {engine/src => src/network}/C4League.cpp | 0 {engine/inc => src/network}/C4League.h | 0 {engine/src => src/network}/C4NetIO.cpp | 0 {engine/inc => src/network}/C4NetIO.h | 0 {engine/src => src/network}/C4Network2.cpp | 0 {engine/inc => src/network}/C4Network2.h | 0 .../src => src/network}/C4Network2Client.cpp | 0 .../inc => src/network}/C4Network2Client.h | 0 .../src => src/network}/C4Network2Dialogs.cpp | 0 .../inc => src/network}/C4Network2Dialogs.h | 0 .../network}/C4Network2Discover.cpp | 0 .../inc => src/network}/C4Network2Discover.h | 0 {engine/src => src/network}/C4Network2IO.cpp | 0 {engine/inc => src/network}/C4Network2IO.h | 0 {engine/src => src/network}/C4Network2IRC.cpp | 0 {engine/inc => src/network}/C4Network2IRC.h | 0 .../src => src/network}/C4Network2Players.cpp | 0 .../inc => src/network}/C4Network2Players.h | 0 .../network}/C4Network2Reference.cpp | 0 .../inc => src/network}/C4Network2Reference.h | 0 {engine/src => src/network}/C4Network2Res.cpp | 0 {engine/inc => src/network}/C4Network2Res.h | 0 .../src => src/network}/C4Network2ResDlg.cpp | 0 .../src => src/network}/C4Network2Stats.cpp | 0 {engine/inc => src/network}/C4Network2Stats.h | 0 {engine/src => src/network}/C4Packet2.cpp | 0 {engine/inc => src/network}/C4PacketBase.h | 0 {standard/src => src/platform}/Bitmap256.cpp | 0 {standard/inc => src/platform}/Bitmap256.h | 0 .../src => src/platform}/C4FileClasses.cpp | 0 {engine/inc => src/platform}/C4FileClasses.h | 0 .../src => src/platform}/C4FileMonitor.cpp | 0 {engine/inc => src/platform}/C4FileMonitor.h | 0 {engine/src => src/platform}/C4Fonts.cpp | 0 {engine/inc => src/platform}/C4Fonts.h | 0 {engine/src => src/platform}/C4GamePadCon.cpp | 0 {engine/inc => src/platform}/C4GamePadCon.h | 0 {engine/src => src/platform}/C4MusicFile.cpp | 0 {engine/inc => src/platform}/C4MusicFile.h | 0 .../src => src/platform}/C4MusicSystem.cpp | 0 {engine/inc => src/platform}/C4MusicSystem.h | 0 .../src => src/platform}/C4SoundSystem.cpp | 0 {engine/inc => src/platform}/C4SoundSystem.h | 0 {engine/src => src/platform}/C4Video.cpp | 0 {engine/inc => src/platform}/C4Video.h | 0 .../src => src/platform}/C4VideoPlayback.cpp | 0 .../inc => src/platform}/C4VideoPlayback.h | 0 {standard/src => src/platform}/DInputX.cpp | 0 {standard/inc => src/platform}/DInputX.h | 0 {standard/src => src/platform}/DSoundX.cpp | 0 {standard/inc => src/platform}/DSoundX.h | 0 {standard/src => src/platform}/MacUtility.mm | 0 {standard/src => src/platform}/Midi.cpp | 0 {standard/inc => src/platform}/Midi.h | 0 {standard/src => src/platform}/OpenURL.cpp | 0 {standard/src => src/platform}/StdConfig.cpp | 0 {standard/inc => src/platform}/StdConfig.h | 0 {standard/src => src/platform}/StdD3D.cpp | 0 {standard/inc => src/platform}/StdD3D.h | 0 .../src => src/platform}/StdD3DShader.cpp | 0 {standard/inc => src/platform}/StdD3DShader.h | 0 {standard/src => src/platform}/StdDDraw2.cpp | 0 {standard/inc => src/platform}/StdDDraw2.h | 0 {standard/inc => src/platform}/StdFacet.h | 0 {standard/src => src/platform}/StdFile.cpp | 0 {standard/inc => src/platform}/StdFile.h | 0 {standard/src => src/platform}/StdFont.cpp | 0 {standard/inc => src/platform}/StdFont.h | 0 {standard/src => src/platform}/StdGL.cpp | 0 {standard/inc => src/platform}/StdGL.h | 0 {standard/src => src/platform}/StdGLCtx.cpp | 0 .../src => src/platform}/StdGtkWindow.cpp | 4 +- {standard/inc => src/platform}/StdGtkWindow.h | 0 .../src => src/platform}/StdJoystick.cpp | 0 {standard/inc => src/platform}/StdJoystick.h | 0 {standard/src => src/platform}/StdNoGfx.cpp | 0 {standard/inc => src/platform}/StdNoGfx.h | 0 .../src => src/platform}/StdRegistry.cpp | 0 {standard/inc => src/platform}/StdRegistry.h | 0 {standard/src => src/platform}/StdSDLApp.cpp | 0 .../src => src/platform}/StdSDLWindow.cpp | 2 +- .../src => src/platform}/StdScheduler.cpp | 0 {standard/inc => src/platform}/StdScheduler.h | 0 .../src => src/platform}/StdSurface2.cpp | 0 {standard/inc => src/platform}/StdSurface2.h | 0 .../src => src/platform}/StdSurface8.cpp | 0 {standard/inc => src/platform}/StdSurface8.h | 0 {standard/inc => src/platform}/StdSync.h | 0 {standard/src => src/platform}/StdTApp.cpp | 0 {standard/src => src/platform}/StdVideo.cpp | 0 {standard/inc => src/platform}/StdVideo.h | 0 {standard/src => src/platform}/StdWindow.cpp | 4 +- {standard/inc => src/platform}/StdWindow.h | 0 {standard/src => src/platform}/StdXApp.cpp | 0 {standard/src => src/platform}/StdXPrivate.h | 0 {standard/src => src/platform}/StdXWindow.cpp | 4 +- {engine => src}/res/Brush.bmp | Bin {engine => src}/res/Brush.h | 0 {engine => src}/res/Brush2.bmp | Bin {engine => src}/res/Brush_Trans.png | Bin {engine => src}/res/Cursor.bmp | Bin {engine => src}/res/Cursor.h | 0 {engine => src}/res/Cursor2.bmp | Bin {engine => src}/res/Cursor_Trans.png | Bin {engine => src}/res/Dynamic.h | 0 {engine => src}/res/Dynamic_Trans.png | Bin {engine => src}/res/Exact.h | 0 {engine => src}/res/Exact_Trans.png | Bin {engine => src}/res/Fill.bmp | Bin {engine => src}/res/Fill.h | 0 {engine => src}/res/Fill_Trans.png | Bin {engine => src}/res/Game.pal | 0 {engine => src}/res/Grab.bmp | Bin {engine => src}/res/Halt.bmp | Bin {engine => src}/res/Halt.h | 0 {engine => src}/res/Halt2.bmp | Bin {engine => src}/res/Halt_Trans.png | Bin {engine => src}/res/IFT.bmp | Bin {engine => src}/res/Ift.h | 0 {engine => src}/res/Ift_Trans.png | Bin {engine => src}/res/Line.bmp | Bin {engine => src}/res/Line.h | 0 {engine => src}/res/Line_Trans.png | Bin {engine => src}/res/Mouse.h | 0 {engine => src}/res/Mouse_Trans.png | Bin {engine => src}/res/NoIFT.bmp | Bin {engine => src}/res/NoIft.h | 0 {engine => src}/res/NoIft_Trans.png | Bin {engine => src}/res/Picker.h | 0 {engine => src}/res/Picker_Trans.png | Bin {engine => src}/res/Play.bmp | Bin {engine => src}/res/Play.h | 0 {engine => src}/res/Play2.bmp | Bin {engine => src}/res/Play_Trans.png | Bin {engine => src}/res/Rect.h | 0 {engine => src}/res/Rect_Trans.png | Bin {engine => src}/res/Rectangle.bmp | Bin {engine => src}/res/Static.h | 0 {engine => src}/res/Static_Trans.png | Bin {engine => src}/res/brush1.bmp | Bin {engine => src}/res/c4b.ico | Bin {engine => src}/res/c4d.ico | Bin {engine => src}/res/c4f.ico | Bin {engine => src}/res/c4g.ico | Bin {engine => src}/res/c4i.ico | Bin {engine => src}/res/c4k.ico | Bin {engine => src}/res/c4l.ico | Bin {engine => src}/res/c4m.ico | Bin {engine => src}/res/c4p.ico | Bin {engine => src}/res/c4s.ico | Bin {engine => src}/res/c4u.ico | Bin {engine => src}/res/c4v.ico | Bin {engine => src}/res/c4x.ico | Bin {engine => src}/res/c4x.xpm | 0 {engine => src}/res/cz.ico | Bin {engine => src}/res/dynamic1.bmp | Bin {engine => src}/res/engine.rc | 2 +- {engine => src}/res/fill1.bmp | Bin {engine => src}/res/ift1.bmp | Bin {engine => src}/res/line1.bmp | Bin {engine => src}/res/mouse.bmp | Bin {engine => src}/res/mouse1.bmp | Bin {engine => src}/res/picker1.bmp | Bin {engine => src}/res/rect1.bmp | Bin {engine => src}/res/resource.h | 0 {engine => src}/res/static1.bmp | Bin {engine/src => src/script}/C4AList.cpp | 0 {engine/inc => src/script}/C4AList.h | 0 {engine/src => src/script}/C4Aul.cpp | 0 {engine/inc => src/script}/C4Aul.h | 0 {engine/src => src/script}/C4AulExec.cpp | 0 {engine/src => src/script}/C4AulLink.cpp | 0 {engine/src => src/script}/C4AulParse.cpp | 0 {engine/src => src/script}/C4PropList.cpp | 0 {engine/inc => src/script}/C4PropList.h | 0 {engine/src => src/script}/C4ScriptHost.cpp | 0 {engine/inc => src/script}/C4ScriptHost.h | 0 {engine/src => src/script}/C4StringTable.cpp | 0 {engine/inc => src/script}/C4StringTable.h | 0 {engine/src => src/script}/C4Value.cpp | 0 {engine/inc => src/script}/C4Value.h | 0 {engine/src => src/script}/C4ValueList.cpp | 0 {engine/inc => src/script}/C4ValueList.h | 0 {engine/src => src/script}/C4ValueMap.cpp | 0 {engine/inc => src/script}/C4ValueMap.h | 0 {standard => src}/zlib/gzio.c | 0 {standard => src}/zlib/zutil.h | 0 463 files changed, 984 insertions(+), 955 deletions(-) delete mode 100644 group/resource.h rename {engine/src => src}/C4Application.cpp (100%) rename {engine/inc => src}/C4Application.h (100%) rename {engine/src => src}/C4FullScreen.cpp (100%) rename {engine/inc => src}/C4FullScreen.h (100%) rename {engine/src => src}/C4Game.cpp (100%) rename {engine/inc => src}/C4Game.h (100%) rename {engine/src => src}/C4GraphicsSystem.cpp (100%) rename {engine/inc => src}/C4GraphicsSystem.h (100%) rename {engine/src => src}/C4Include.cpp (100%) rename {engine/inc => src}/C4Include.h (100%) rename {engine/inc => src}/C4Prototypes.h (100%) rename {engine/inc => src}/C4Version.h (100%) rename {engine/src => src}/C4WinMain.cpp (100%) rename {engine/inc => src/c4group}/C4Components.h (100%) rename {engine/src => src/c4group}/C4Extra.cpp (100%) rename {engine/inc => src/c4group}/C4Extra.h (100%) rename {engine/src => src/c4group}/C4Group.cpp (100%) rename {engine/inc => src/c4group}/C4Group.h (100%) rename {engine/src => src/c4group}/C4GroupSet.cpp (100%) rename {engine/inc => src/c4group}/C4GroupSet.h (100%) rename {engine/src => src/c4group}/C4Language.cpp (100%) rename {engine/inc => src/c4group}/C4Language.h (100%) rename {engine/src => src/c4group}/C4Update.cpp (100%) rename {engine/inc => src/c4group}/C4Update.h (100%) rename {standard/src => src/c4group}/CStdFile.cpp (100%) rename {standard/inc => src/c4group}/CStdFile.h (100%) rename {group => src/c4group}/Resource.rc (98%) rename {group => src/c4group}/c4group_cmdl.cpp (100%) rename {group => src/c4group}/c4group_ng.cpp (100%) rename {group => src/c4group}/gunzip4c4group.cpp (100%) rename {engine/src => src/config}/C4Config.cpp (100%) rename {engine/inc => src/config}/C4Config.h (100%) rename {engine/sec => src/config}/C4ConfigShareware.cpp (100%) rename {engine/sec => src/config}/C4ConfigShareware.h (100%) rename {engine/sec => src/config}/C4SecurityCertificates.cpp (100%) rename {engine/sec => src/config}/C4SecurityCertificates.h (100%) rename {engine/src => src/control}/C4Control.cpp (100%) rename {engine/inc => src/control}/C4Control.h (100%) rename {engine/src => src/control}/C4GameControl.cpp (100%) rename {engine/inc => src/control}/C4GameControl.h (100%) rename {engine/src => src/control}/C4GameParameters.cpp (100%) rename {engine/inc => src/control}/C4GameParameters.h (100%) rename {engine/src => src/control}/C4GameSave.cpp (100%) rename {engine/inc => src/control}/C4GameSave.h (100%) rename {engine/src => src/control}/C4PlayerInfo.cpp (100%) rename {engine/inc => src/control}/C4PlayerInfo.h (100%) rename {engine/src => src/control}/C4PlayerInfoConflicts.cpp (100%) rename {engine/src => src/control}/C4Record.cpp (100%) rename {engine/inc => src/control}/C4Record.h (100%) rename {engine/src => src/control}/C4RoundResults.cpp (100%) rename {engine/inc => src/control}/C4RoundResults.h (100%) rename {engine/src => src/control}/C4Teams.cpp (100%) rename {engine/inc => src/control}/C4Teams.h (100%) rename {engine/src => src/editor}/C4Console.cpp (100%) rename {engine/inc => src/editor}/C4Console.h (100%) rename {engine/src => src/editor}/C4DevmodeDlg.cpp (100%) rename {engine/inc => src/editor}/C4DevmodeDlg.h (100%) rename {engine/src => src/editor}/C4EditCursor.cpp (100%) rename {engine/inc => src/editor}/C4EditCursor.h (100%) rename {engine/src => src/editor}/C4ObjectListDlg.cpp (100%) rename {engine/inc => src/editor}/C4ObjectListDlg.h (100%) rename {engine/src => src/editor}/C4PropertyDlg.cpp (100%) rename {engine/inc => src/editor}/C4PropertyDlg.h (100%) rename {engine/src => src/editor}/C4ToolsDlg.cpp (100%) rename {engine/inc => src/editor}/C4ToolsDlg.h (100%) rename {engine/inc => src/game}/C4Constants.h (100%) rename {engine/inc => src/game}/C4GameVersion.h (100%) rename {engine/inc => src/game}/C4Physics.h (100%) rename {engine/src => src/game/landscape}/C4Landscape.cpp (100%) rename {engine/inc => src/game/landscape}/C4Landscape.h (100%) rename {engine/src => src/game/landscape}/C4Map.cpp (100%) rename {engine/inc => src/game/landscape}/C4Map.h (100%) rename {engine/src => src/game/landscape}/C4MapCreatorS2.cpp (100%) rename {engine/inc => src/game/landscape}/C4MapCreatorS2.h (100%) rename {engine/src => src/game/landscape}/C4MassMover.cpp (100%) rename {engine/inc => src/game/landscape}/C4MassMover.h (100%) rename {engine/src => src/game/landscape}/C4Material.cpp (100%) rename {engine/inc => src/game/landscape}/C4Material.h (100%) rename {engine/src => src/game/landscape}/C4MaterialList.cpp (100%) rename {engine/inc => src/game/landscape}/C4MaterialList.h (100%) rename {engine/src => src/game/landscape}/C4PXS.cpp (100%) rename {engine/inc => src/game/landscape}/C4PXS.h (100%) rename {engine/src => src/game/landscape}/C4Particles.cpp (100%) rename {engine/inc => src/game/landscape}/C4Particles.h (100%) rename {engine/src => src/game/landscape}/C4PathFinder.cpp (100%) rename {engine/inc => src/game/landscape}/C4PathFinder.h (100%) rename {engine/src => src/game/landscape}/C4Region.cpp (100%) rename {engine/inc => src/game/landscape}/C4Region.h (100%) rename {engine/src => src/game/landscape}/C4Scenario.cpp (100%) rename {engine/inc => src/game/landscape}/C4Scenario.h (100%) rename {engine/src => src/game/landscape}/C4Sky.cpp (100%) rename {engine/inc => src/game/landscape}/C4Sky.h (100%) rename {engine/src => src/game/landscape}/C4SolidMask.cpp (100%) rename {engine/inc => src/game/landscape}/C4SolidMask.h (100%) rename {engine/src => src/game/landscape}/C4Texture.cpp (100%) rename {engine/inc => src/game/landscape}/C4Texture.h (100%) rename {engine/src => src/game/landscape}/C4Weather.cpp (100%) rename {engine/inc => src/game/landscape}/C4Weather.h (100%) rename {engine/src => src/game/object}/C4Action.cpp (100%) rename {engine/src => src/game/object}/C4Command.cpp (100%) rename {engine/inc => src/game/object}/C4Command.h (100%) rename {engine/src => src/game/object}/C4Def.cpp (100%) rename {engine/inc => src/game/object}/C4Def.h (100%) rename {engine/src => src/game/object}/C4DefGraphics.cpp (100%) rename {engine/inc => src/game/object}/C4DefGraphics.h (100%) rename {engine/src => src/game/object}/C4GameObjects.cpp (100%) rename {engine/inc => src/game/object}/C4GameObjects.h (100%) rename {engine/src => src/game/object}/C4IDList.cpp (100%) rename {engine/inc => src/game/object}/C4IDList.h (100%) rename {engine/src => src/game/object}/C4Id.cpp (100%) rename {engine/inc => src/game/object}/C4Id.h (100%) rename {engine/src => src/game/object}/C4InfoCore.cpp (100%) rename {engine/inc => src/game/object}/C4InfoCore.h (100%) rename {engine/src => src/game/object}/C4Movement.cpp (100%) rename {engine/src => src/game/object}/C4Object.cpp (100%) rename {engine/inc => src/game/object}/C4Object.h (100%) rename {engine/src => src/game/object}/C4ObjectCom.cpp (100%) rename {engine/inc => src/game/object}/C4ObjectCom.h (100%) rename {engine/src => src/game/object}/C4ObjectInfo.cpp (100%) rename {engine/inc => src/game/object}/C4ObjectInfo.h (100%) rename {engine/src => src/game/object}/C4ObjectInfoList.cpp (100%) rename {engine/inc => src/game/object}/C4ObjectInfoList.h (100%) rename {engine/src => src/game/object}/C4ObjectList.cpp (100%) rename {engine/inc => src/game/object}/C4ObjectList.h (100%) rename {engine/src => src/game/object}/C4ObjectMenu.cpp (100%) rename {engine/inc => src/game/object}/C4ObjectMenu.h (100%) rename {engine/src => src/game/object}/C4Sector.cpp (100%) rename {engine/inc => src/game/object}/C4Sector.h (100%) rename {engine/src => src/game/object}/C4Shape.cpp (100%) rename {engine/inc => src/game/object}/C4Shape.h (100%) rename {engine/src => src/game/player}/C4Player.cpp (100%) rename {engine/inc => src/game/player}/C4Player.h (100%) rename {engine/src => src/game/player}/C4PlayerList.cpp (100%) rename {engine/inc => src/game/player}/C4PlayerList.h (100%) rename {engine/src => src/game/player}/C4RankSystem.cpp (100%) rename {engine/inc => src/game/player}/C4RankSystem.h (100%) rename {engine/src => src/game/script}/C4Effect.cpp (100%) rename {engine/inc => src/game/script}/C4Effects.h (100%) rename {engine/src => src/game/script}/C4FindObject.cpp (100%) rename {engine/inc => src/game/script}/C4FindObject.h (100%) rename {engine/src => src/game/script}/C4Script.cpp (100%) rename {engine/inc => src/game/script}/C4Script.h (100%) rename {engine/src => src/game/script}/C4TransferZone.cpp (100%) rename {engine/inc => src/game/script}/C4TransferZone.h (100%) rename {engine/src => src/gui}/C4ChatDlg.cpp (100%) rename {engine/inc => src/gui}/C4ChatDlg.h (100%) rename {engine/src => src/gui}/C4DownloadDlg.cpp (100%) rename {engine/inc => src/gui}/C4DownloadDlg.h (100%) rename {engine/src => src/gui}/C4FileSelDlg.cpp (100%) rename {engine/inc => src/gui}/C4FileSelDlg.h (100%) rename {engine/src => src/gui}/C4Folder.cpp (100%) rename {engine/inc => src/gui}/C4Folder.h (100%) rename {engine/src => src/gui}/C4GameDialogs.cpp (100%) rename {engine/inc => src/gui}/C4GameDialogs.h (100%) rename {engine/src => src/gui}/C4GameLobby.cpp (100%) rename {engine/inc => src/gui}/C4GameLobby.h (100%) rename {engine/src => src/gui}/C4GameMessage.cpp (100%) rename {engine/inc => src/gui}/C4GameMessage.h (100%) rename {engine/src => src/gui}/C4GameOptions.cpp (100%) rename {engine/inc => src/gui}/C4GameOptions.h (100%) rename {engine/src => src/gui}/C4GameOverDlg.cpp (100%) rename {engine/inc => src/gui}/C4GameOverDlg.h (100%) rename {engine/src => src/gui}/C4Gui.cpp (100%) rename {engine/inc => src/gui}/C4Gui.h (100%) rename {engine/src => src/gui}/C4GuiButton.cpp (100%) rename {engine/src => src/gui}/C4GuiCheckBox.cpp (100%) rename {engine/src => src/gui}/C4GuiComboBox.cpp (100%) rename {engine/src => src/gui}/C4GuiContainers.cpp (100%) rename {engine/src => src/gui}/C4GuiDialogs.cpp (100%) rename {engine/src => src/gui}/C4GuiEdit.cpp (100%) rename {engine/src => src/gui}/C4GuiLabels.cpp (100%) rename {engine/src => src/gui}/C4GuiListBox.cpp (100%) rename {engine/src => src/gui}/C4GuiMenu.cpp (100%) rename {engine/src => src/gui}/C4GuiTabular.cpp (100%) rename {engine/src => src/gui}/C4KeyboardInput.cpp (100%) rename {engine/inc => src/gui}/C4KeyboardInput.h (100%) rename {engine/src => src/gui}/C4LoaderScreen.cpp (100%) rename {engine/inc => src/gui}/C4LoaderScreen.h (100%) rename {engine/src => src/gui}/C4MainMenu.cpp (100%) rename {engine/inc => src/gui}/C4MainMenu.h (100%) rename {engine/src => src/gui}/C4Menu.cpp (100%) rename {engine/inc => src/gui}/C4Menu.h (100%) rename {engine/src => src/gui}/C4MessageBoard.cpp (100%) rename {engine/inc => src/gui}/C4MessageBoard.h (100%) rename {engine/src => src/gui}/C4MessageInput.cpp (100%) rename {engine/inc => src/gui}/C4MessageInput.h (100%) rename {engine/src => src/gui}/C4MouseControl.cpp (100%) rename {engine/inc => src/gui}/C4MouseControl.h (100%) rename {engine/src => src/gui}/C4PlayerInfoListBox.cpp (100%) rename {engine/inc => src/gui}/C4PlayerInfoListBox.h (100%) rename {engine/src => src/gui}/C4Scoreboard.cpp (100%) rename {engine/inc => src/gui}/C4Scoreboard.h (100%) rename {engine/src => src/gui}/C4Startup.cpp (100%) rename {engine/inc => src/gui}/C4Startup.h (100%) rename {engine/src => src/gui}/C4StartupAboutDlg.cpp (100%) rename {engine/inc => src/gui}/C4StartupAboutDlg.h (100%) rename {engine/src => src/gui}/C4StartupMainDlg.cpp (100%) rename {engine/inc => src/gui}/C4StartupMainDlg.h (100%) rename {engine/src => src/gui}/C4StartupNetDlg.cpp (100%) rename {engine/inc => src/gui}/C4StartupNetDlg.h (100%) rename {engine/src => src/gui}/C4StartupOptionsDlg.cpp (100%) rename {engine/inc => src/gui}/C4StartupOptionsDlg.h (100%) rename {engine/src => src/gui}/C4StartupPlrSelDlg.cpp (100%) rename {engine/inc => src/gui}/C4StartupPlrSelDlg.h (100%) rename {engine/src => src/gui}/C4StartupScenSelDlg.cpp (100%) rename {engine/inc => src/gui}/C4StartupScenSelDlg.h (100%) rename {engine/src => src/gui}/C4UpdateDlg.cpp (100%) rename {engine/inc => src/gui}/C4UpdateDlg.h (100%) rename {engine/src => src/gui}/C4UpperBoard.cpp (100%) rename {engine/inc => src/gui}/C4UpperBoard.h (100%) rename {engine/inc => src/gui}/C4UserMessages.h (100%) rename {engine/src => src/gui}/C4Viewport.cpp (100%) rename {engine/inc => src/gui}/C4Viewport.h (100%) rename {engine/src => src/lib}/C4ComponentHost.cpp (100%) rename {engine/inc => src/lib}/C4ComponentHost.h (100%) rename {engine/src => src/lib}/C4InputValidation.cpp (100%) rename {engine/inc => src/lib}/C4InputValidation.h (100%) rename {engine/src => src/lib}/C4LangStringTable.cpp (100%) rename {engine/inc => src/lib}/C4LangStringTable.h (100%) rename {engine/src => src/lib}/C4Log.cpp (100%) rename {engine/inc => src/lib}/C4Log.h (100%) rename {engine/src => src/lib}/C4LogBuf.cpp (100%) rename {engine/inc => src/lib}/C4LogBuf.h (100%) rename {engine/src => src/lib}/C4NameList.cpp (100%) rename {engine/inc => src/lib}/C4NameList.h (100%) rename {engine/inc => src/lib}/C4RTF.H (100%) rename {engine/src => src/lib}/C4RTF.cpp (100%) rename {engine/src => src/lib}/C4Random.cpp (100%) rename {engine/inc => src/lib}/C4Random.h (100%) rename {engine/src => src/lib}/C4Stat.cpp (100%) rename {engine/inc => src/lib}/C4Stat.h (100%) rename {standard/src => src/lib}/Fixed.cpp (100%) rename {standard/inc => src/lib}/Fixed.h (100%) rename {standard/src => src/lib}/PathFinder.cpp (100%) rename {standard/inc => src/lib}/PathFinder.h (100%) rename {standard/src => src/lib}/Standard.cpp (100%) rename {standard/inc => src/lib}/Standard.h (100%) rename {standard/inc => src/lib}/StdAdaptors.h (100%) rename {standard/src => src/lib}/StdBase64.cpp (100%) rename {standard/inc => src/lib}/StdBase64.h (100%) rename {standard/src => src/lib}/StdBuf.cpp (100%) rename {standard/inc => src/lib}/StdBuf.h (100%) rename {standard/inc => src/lib}/StdColors.h (100%) rename {standard/src => src/lib}/StdCompiler.cpp (100%) rename {standard/inc => src/lib}/StdCompiler.h (100%) rename {standard/src => src/lib}/StdMarkup.cpp (100%) rename {standard/inc => src/lib}/StdMarkup.h (100%) rename {standard/inc => src/lib}/StdResStr.h (100%) rename {standard/src => src/lib}/StdResStr2.cpp (100%) rename {standard/inc => src/lib}/StdResStr2.h (100%) rename {engine/src => src/lib/texture}/C4Facet.cpp (100%) rename {engine/inc => src/lib/texture}/C4Facet.h (100%) rename {engine/src => src/lib/texture}/C4FacetEx.cpp (100%) rename {engine/inc => src/lib/texture}/C4FacetEx.h (100%) rename {engine/src => src/lib/texture}/C4GraphicsResource.cpp (100%) rename {engine/inc => src/lib/texture}/C4GraphicsResource.h (100%) rename {engine/src => src/lib/texture}/C4Surface.cpp (100%) rename {engine/inc => src/lib/texture}/C4Surface.h (100%) rename {engine/src => src/lib/texture}/C4SurfaceFile.cpp (100%) rename {engine/inc => src/lib/texture}/C4SurfaceFile.h (100%) rename {standard/src => src/lib/texture}/StdPNG.cpp (100%) rename {standard/inc => src/lib/texture}/StdPNG.h (100%) rename {engine => src}/netio/NetIO.dsp (100%) rename {engine => src}/netio/TstC4NetIO.cpp (100%) rename {netpuncher => src/netpuncher}/Puncher.dsp (100%) rename {netpuncher => src/netpuncher}/main.cpp (100%) rename {engine/src => src/network}/C4Client.cpp (100%) rename {engine/inc => src/network}/C4Client.h (100%) rename {engine/src => src/network}/C4GameControlNetwork.cpp (100%) rename {engine/inc => src/network}/C4GameControlNetwork.h (100%) rename {engine/src => src/network}/C4InteractiveThread.cpp (100%) rename {engine/inc => src/network}/C4InteractiveThread.h (100%) rename {engine/src => src/network}/C4League.cpp (100%) rename {engine/inc => src/network}/C4League.h (100%) rename {engine/src => src/network}/C4NetIO.cpp (100%) rename {engine/inc => src/network}/C4NetIO.h (100%) rename {engine/src => src/network}/C4Network2.cpp (100%) rename {engine/inc => src/network}/C4Network2.h (100%) rename {engine/src => src/network}/C4Network2Client.cpp (100%) rename {engine/inc => src/network}/C4Network2Client.h (100%) rename {engine/src => src/network}/C4Network2Dialogs.cpp (100%) rename {engine/inc => src/network}/C4Network2Dialogs.h (100%) rename {engine/src => src/network}/C4Network2Discover.cpp (100%) rename {engine/inc => src/network}/C4Network2Discover.h (100%) rename {engine/src => src/network}/C4Network2IO.cpp (100%) rename {engine/inc => src/network}/C4Network2IO.h (100%) rename {engine/src => src/network}/C4Network2IRC.cpp (100%) rename {engine/inc => src/network}/C4Network2IRC.h (100%) rename {engine/src => src/network}/C4Network2Players.cpp (100%) rename {engine/inc => src/network}/C4Network2Players.h (100%) rename {engine/src => src/network}/C4Network2Reference.cpp (100%) rename {engine/inc => src/network}/C4Network2Reference.h (100%) rename {engine/src => src/network}/C4Network2Res.cpp (100%) rename {engine/inc => src/network}/C4Network2Res.h (100%) rename {engine/src => src/network}/C4Network2ResDlg.cpp (100%) rename {engine/src => src/network}/C4Network2Stats.cpp (100%) rename {engine/inc => src/network}/C4Network2Stats.h (100%) rename {engine/src => src/network}/C4Packet2.cpp (100%) rename {engine/inc => src/network}/C4PacketBase.h (100%) rename {standard/src => src/platform}/Bitmap256.cpp (100%) rename {standard/inc => src/platform}/Bitmap256.h (100%) rename {engine/src => src/platform}/C4FileClasses.cpp (100%) rename {engine/inc => src/platform}/C4FileClasses.h (100%) rename {engine/src => src/platform}/C4FileMonitor.cpp (100%) rename {engine/inc => src/platform}/C4FileMonitor.h (100%) rename {engine/src => src/platform}/C4Fonts.cpp (100%) rename {engine/inc => src/platform}/C4Fonts.h (100%) rename {engine/src => src/platform}/C4GamePadCon.cpp (100%) rename {engine/inc => src/platform}/C4GamePadCon.h (100%) rename {engine/src => src/platform}/C4MusicFile.cpp (100%) rename {engine/inc => src/platform}/C4MusicFile.h (100%) rename {engine/src => src/platform}/C4MusicSystem.cpp (100%) rename {engine/inc => src/platform}/C4MusicSystem.h (100%) rename {engine/src => src/platform}/C4SoundSystem.cpp (100%) rename {engine/inc => src/platform}/C4SoundSystem.h (100%) rename {engine/src => src/platform}/C4Video.cpp (100%) rename {engine/inc => src/platform}/C4Video.h (100%) rename {engine/src => src/platform}/C4VideoPlayback.cpp (100%) rename {engine/inc => src/platform}/C4VideoPlayback.h (100%) rename {standard/src => src/platform}/DInputX.cpp (100%) rename {standard/inc => src/platform}/DInputX.h (100%) rename {standard/src => src/platform}/DSoundX.cpp (100%) rename {standard/inc => src/platform}/DSoundX.h (100%) rename {standard/src => src/platform}/MacUtility.mm (100%) rename {standard/src => src/platform}/Midi.cpp (100%) rename {standard/inc => src/platform}/Midi.h (100%) rename {standard/src => src/platform}/OpenURL.cpp (100%) rename {standard/src => src/platform}/StdConfig.cpp (100%) rename {standard/inc => src/platform}/StdConfig.h (100%) rename {standard/src => src/platform}/StdD3D.cpp (100%) rename {standard/inc => src/platform}/StdD3D.h (100%) rename {standard/src => src/platform}/StdD3DShader.cpp (100%) rename {standard/inc => src/platform}/StdD3DShader.h (100%) rename {standard/src => src/platform}/StdDDraw2.cpp (100%) rename {standard/inc => src/platform}/StdDDraw2.h (100%) rename {standard/inc => src/platform}/StdFacet.h (100%) rename {standard/src => src/platform}/StdFile.cpp (100%) rename {standard/inc => src/platform}/StdFile.h (100%) rename {standard/src => src/platform}/StdFont.cpp (100%) rename {standard/inc => src/platform}/StdFont.h (100%) rename {standard/src => src/platform}/StdGL.cpp (100%) rename {standard/inc => src/platform}/StdGL.h (100%) rename {standard/src => src/platform}/StdGLCtx.cpp (100%) rename {standard/src => src/platform}/StdGtkWindow.cpp (98%) rename {standard/inc => src/platform}/StdGtkWindow.h (100%) rename {standard/src => src/platform}/StdJoystick.cpp (100%) rename {standard/inc => src/platform}/StdJoystick.h (100%) rename {standard/src => src/platform}/StdNoGfx.cpp (100%) rename {standard/inc => src/platform}/StdNoGfx.h (100%) rename {standard/src => src/platform}/StdRegistry.cpp (100%) rename {standard/inc => src/platform}/StdRegistry.h (100%) rename {standard/src => src/platform}/StdSDLApp.cpp (100%) rename {standard/src => src/platform}/StdSDLWindow.cpp (98%) rename {standard/src => src/platform}/StdScheduler.cpp (100%) rename {standard/inc => src/platform}/StdScheduler.h (100%) rename {standard/src => src/platform}/StdSurface2.cpp (100%) rename {standard/inc => src/platform}/StdSurface2.h (100%) rename {standard/src => src/platform}/StdSurface8.cpp (100%) rename {standard/inc => src/platform}/StdSurface8.h (100%) rename {standard/inc => src/platform}/StdSync.h (100%) rename {standard/src => src/platform}/StdTApp.cpp (100%) rename {standard/src => src/platform}/StdVideo.cpp (100%) rename {standard/inc => src/platform}/StdVideo.h (100%) rename {standard/src => src/platform}/StdWindow.cpp (99%) rename {standard/inc => src/platform}/StdWindow.h (100%) rename {standard/src => src/platform}/StdXApp.cpp (100%) rename {standard/src => src/platform}/StdXPrivate.h (100%) rename {standard/src => src/platform}/StdXWindow.cpp (99%) rename {engine => src}/res/Brush.bmp (100%) rename {engine => src}/res/Brush.h (100%) rename {engine => src}/res/Brush2.bmp (100%) rename {engine => src}/res/Brush_Trans.png (100%) rename {engine => src}/res/Cursor.bmp (100%) rename {engine => src}/res/Cursor.h (100%) rename {engine => src}/res/Cursor2.bmp (100%) rename {engine => src}/res/Cursor_Trans.png (100%) rename {engine => src}/res/Dynamic.h (100%) rename {engine => src}/res/Dynamic_Trans.png (100%) rename {engine => src}/res/Exact.h (100%) rename {engine => src}/res/Exact_Trans.png (100%) rename {engine => src}/res/Fill.bmp (100%) rename {engine => src}/res/Fill.h (100%) rename {engine => src}/res/Fill_Trans.png (100%) rename {engine => src}/res/Game.pal (100%) rename {engine => src}/res/Grab.bmp (100%) rename {engine => src}/res/Halt.bmp (100%) rename {engine => src}/res/Halt.h (100%) rename {engine => src}/res/Halt2.bmp (100%) rename {engine => src}/res/Halt_Trans.png (100%) rename {engine => src}/res/IFT.bmp (100%) rename {engine => src}/res/Ift.h (100%) rename {engine => src}/res/Ift_Trans.png (100%) rename {engine => src}/res/Line.bmp (100%) rename {engine => src}/res/Line.h (100%) rename {engine => src}/res/Line_Trans.png (100%) rename {engine => src}/res/Mouse.h (100%) rename {engine => src}/res/Mouse_Trans.png (100%) rename {engine => src}/res/NoIFT.bmp (100%) rename {engine => src}/res/NoIft.h (100%) rename {engine => src}/res/NoIft_Trans.png (100%) rename {engine => src}/res/Picker.h (100%) rename {engine => src}/res/Picker_Trans.png (100%) rename {engine => src}/res/Play.bmp (100%) rename {engine => src}/res/Play.h (100%) rename {engine => src}/res/Play2.bmp (100%) rename {engine => src}/res/Play_Trans.png (100%) rename {engine => src}/res/Rect.h (100%) rename {engine => src}/res/Rect_Trans.png (100%) rename {engine => src}/res/Rectangle.bmp (100%) rename {engine => src}/res/Static.h (100%) rename {engine => src}/res/Static_Trans.png (100%) rename {engine => src}/res/brush1.bmp (100%) rename {engine => src}/res/c4b.ico (100%) rename {engine => src}/res/c4d.ico (100%) rename {engine => src}/res/c4f.ico (100%) rename {engine => src}/res/c4g.ico (100%) rename {engine => src}/res/c4i.ico (100%) rename {engine => src}/res/c4k.ico (100%) rename {engine => src}/res/c4l.ico (100%) rename {engine => src}/res/c4m.ico (100%) rename {engine => src}/res/c4p.ico (100%) rename {engine => src}/res/c4s.ico (100%) rename {engine => src}/res/c4u.ico (100%) rename {engine => src}/res/c4v.ico (100%) rename {engine => src}/res/c4x.ico (100%) rename {engine => src}/res/c4x.xpm (100%) rename {engine => src}/res/cz.ico (100%) rename {engine => src}/res/dynamic1.bmp (100%) rename {engine => src}/res/engine.rc (99%) rename {engine => src}/res/fill1.bmp (100%) rename {engine => src}/res/ift1.bmp (100%) rename {engine => src}/res/line1.bmp (100%) rename {engine => src}/res/mouse.bmp (100%) rename {engine => src}/res/mouse1.bmp (100%) rename {engine => src}/res/picker1.bmp (100%) rename {engine => src}/res/rect1.bmp (100%) rename {engine => src}/res/resource.h (100%) rename {engine => src}/res/static1.bmp (100%) rename {engine/src => src/script}/C4AList.cpp (100%) rename {engine/inc => src/script}/C4AList.h (100%) rename {engine/src => src/script}/C4Aul.cpp (100%) rename {engine/inc => src/script}/C4Aul.h (100%) rename {engine/src => src/script}/C4AulExec.cpp (100%) rename {engine/src => src/script}/C4AulLink.cpp (100%) rename {engine/src => src/script}/C4AulParse.cpp (100%) rename {engine/src => src/script}/C4PropList.cpp (100%) rename {engine/inc => src/script}/C4PropList.h (100%) rename {engine/src => src/script}/C4ScriptHost.cpp (100%) rename {engine/inc => src/script}/C4ScriptHost.h (100%) rename {engine/src => src/script}/C4StringTable.cpp (100%) rename {engine/inc => src/script}/C4StringTable.h (100%) rename {engine/src => src/script}/C4Value.cpp (100%) rename {engine/inc => src/script}/C4Value.h (100%) rename {engine/src => src/script}/C4ValueList.cpp (100%) rename {engine/inc => src/script}/C4ValueList.h (100%) rename {engine/src => src/script}/C4ValueMap.cpp (100%) rename {engine/inc => src/script}/C4ValueMap.h (100%) rename {standard => src}/zlib/gzio.c (100%) rename {standard => src}/zlib/zutil.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e01d1824..d36898310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,452 +8,470 @@ 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) + SET(additional_clonk_sources src/platform/C4FileClasses.cpp src/res/engine.rc src/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/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 -) - if(WIN32) SET(additional_system_sources - standard/src/StdWindow.cpp - standard/src/StdJoystick.cpp - standard/inc/StdJoystick.h + 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 + 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 + src/platform/StdXApp.cpp + src/platform/StdXWindow.cpp + src/platform/StdXPrivate.h + ) +endif() +if(APPLE) + SET(additional_system_sources + ${additional_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 + 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/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 +${additional_clonk_sources} +${additional_system_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/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 +) + +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 3cf7aa511..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,115 +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/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) \ @@ -527,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 @@ -551,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 @@ -570,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/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/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 100% rename from engine/src/C4Game.cpp rename to src/C4Game.cpp 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 100% rename from engine/src/C4GroupSet.cpp rename to src/c4group/C4GroupSet.cpp 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 100% rename from engine/src/C4Script.cpp rename to src/game/script/C4Script.cpp 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 100% rename from engine/src/C4Random.cpp rename to src/lib/C4Random.cpp 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 100% rename from engine/src/C4Stat.cpp rename to src/lib/C4Stat.cpp diff --git a/engine/inc/C4Stat.h b/src/lib/C4Stat.h similarity index 100% rename from engine/inc/C4Stat.h rename to src/lib/C4Stat.h 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 100% rename from standard/src/Standard.cpp rename to src/lib/Standard.cpp 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 100% rename from engine/src/C4Facet.cpp rename to src/lib/texture/C4Facet.cpp 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 100% rename from engine/src/C4GraphicsResource.cpp rename to src/lib/texture/C4GraphicsResource.cpp 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