From 6dc49d643afe98a7a898c8041f09f9f7468df108 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 12 Dec 2017 14:52:57 +0100 Subject: [PATCH] Compile files in base dir as C++ --- OpenRCT2.xcodeproj/project.pbxproj | 68 +++++++++---------- src/openrct2-ui/UiContext.cpp | 2 +- .../engines/opengl/OpenGLDrawingEngine.cpp | 2 +- src/openrct2-ui/input/Input.cpp | 2 +- src/openrct2-ui/input/KeyboardShortcut.cpp | 2 +- .../windows/EditorBottomToolbar.cpp | 2 +- .../windows/EditorInventionsList.cpp | 2 +- .../windows/EditorObjectSelection.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 4 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/LandRights.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/MapGen.cpp | 2 +- src/openrct2-ui/windows/MapTooltip.cpp | 2 +- src/openrct2-ui/windows/MazeConstruction.cpp | 2 +- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/Player.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 4 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/Themes.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- .../windows/TitleCommandEditor.cpp | 2 +- src/openrct2-ui/windows/TitleEditor.cpp | 2 +- src/openrct2-ui/windows/TitleExit.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 2 +- src/openrct2-ui/windows/TitleOptions.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- .../{cmdline_sprite.c => CmdlineSprite.cpp} | 35 ++++++---- .../{cmdline_sprite.h => CmdlineSprite.h} | 0 src/openrct2/Context.cpp | 6 +- src/openrct2/{diagnostic.c => Diagnostic.cpp} | 2 +- src/openrct2/{diagnostic.h => Diagnostic.h} | 0 src/openrct2/Editor.cpp | 2 +- src/openrct2/Game.cpp | 2 +- src/openrct2/{input.c => Input.cpp} | 47 +++++++------ src/openrct2/{input.h => Input.h} | 0 src/openrct2/{intro.c => Intro.cpp} | 2 +- src/openrct2/{intro.h => Intro.h} | 0 .../{object_list.c => ObjectList.cpp} | 8 ++- src/openrct2/{object_list.h => ObjectList.h} | 0 src/openrct2/audio/Audio.cpp | 2 +- src/openrct2/cmdline/SpriteCommands.cpp | 2 +- src/openrct2/common.h | 2 +- src/openrct2/drawing/X8DrawingEngine.cpp | 2 +- src/openrct2/interface/Screenshot.cpp | 2 +- src/openrct2/interface/console.c | 2 +- src/openrct2/interface/viewport.c | 2 +- src/openrct2/interface/viewport_interaction.c | 2 +- src/openrct2/interface/widget.c | 2 +- src/openrct2/interface/window.c | 2 +- src/openrct2/management/NewsItem.cpp | 2 +- src/openrct2/management/Research.cpp | 2 +- src/openrct2/network/NetworkKey.cpp | 2 +- src/openrct2/object/BannerObject.cpp | 2 +- src/openrct2/object/FootpathItemObject.cpp | 2 +- src/openrct2/object/ObjectManager.cpp | 2 +- src/openrct2/object/ObjectRepository.cpp | 2 +- src/openrct2/paint/Painter.cpp | 2 +- src/openrct2/paint/tile_element/path.c | 2 +- src/openrct2/peep/Peep.cpp | 2 +- src/openrct2/peep/Staff.cpp | 4 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Exporter.h | 2 +- src/openrct2/ride/ride.c | 4 +- src/openrct2/scenario/scenario.c | 2 +- src/openrct2/title/TitleScreen.cpp | 2 +- src/openrct2/windows/Dropdown.cpp | 2 +- src/openrct2/windows/Tooltip.cpp | 2 +- src/openrct2/windows/_legacy.c | 2 +- src/openrct2/world/footpath.c | 2 +- src/openrct2/world/scenery.c | 2 +- test/testpaint/CMakeLists.txt | 2 +- test/tests/CMakeLists.txt | 2 +- 78 files changed, 158 insertions(+), 150 deletions(-) rename src/openrct2/{cmdline_sprite.c => CmdlineSprite.cpp} (96%) rename src/openrct2/{cmdline_sprite.h => CmdlineSprite.h} (100%) rename src/openrct2/{diagnostic.c => Diagnostic.cpp} (99%) rename src/openrct2/{diagnostic.h => Diagnostic.h} (100%) rename src/openrct2/{input.c => Input.cpp} (97%) rename src/openrct2/{input.h => Input.h} (100%) rename src/openrct2/{intro.c => Intro.cpp} (99%) rename src/openrct2/{intro.h => Intro.h} (100%) rename src/openrct2/{object_list.c => ObjectList.cpp} (97%) rename src/openrct2/{object_list.h => ObjectList.h} (100%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 4f2a2ce04c..a31333c4d3 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -117,13 +117,18 @@ 4CB832A71EFBDCCE00B88761 /* land_tool.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB832A51EFBDCCE00B88761 /* land_tool.c */; }; 4CB832AB1EFFB8D100B88761 /* ttf_sdlport.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB832A81EFFB8D100B88761 /* ttf_sdlport.c */; }; 4CB832AC1EFFB8D100B88761 /* ttf.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB832A91EFFB8D100B88761 /* ttf.c */; }; + 4CC4B8E11FE00B4100660D62 /* ObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC4B8DF1FE00B4100660D62 /* ObjectList.cpp */; }; + 4CC4B8E41FE00C4200660D62 /* CmdlineSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC4B8E21FE00C4100660D62 /* CmdlineSprite.cpp */; }; + 4CC4B8E71FE00C4E00660D62 /* Diagnostic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC4B8E51FE00C4E00660D62 /* Diagnostic.cpp */; }; + 4CC4B8EC1FE00C5D00660D62 /* Input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC4B8E81FE00C5D00660D62 /* Input.cpp */; }; + 4CC4B8ED1FE00C5D00660D62 /* Intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC4B8EA1FE00C5D00660D62 /* Intro.cpp */; }; + 4CE462411FD0710E0001CD98 /* Game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4623F1FD0710E0001CD98 /* Game.cpp */; }; 4CE462431FD1612C0001CD98 /* android.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462421FD1612B0001CD98 /* android.c */; }; 4CE462451FD161360001CD98 /* Platform.Android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462441FD161360001CD98 /* Platform.Android.cpp */; }; 4CE4624A1FD1613D0001CD98 /* Platform.Linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462461FD1613D0001CD98 /* Platform.Linux.cpp */; }; 4CE4624B1FD1613D0001CD98 /* Platform.macOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */; }; 4CE4624C1FD1613D0001CD98 /* Platform.Posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */; }; 4CE4624D1FD1613D0001CD98 /* Platform.Win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */; }; - 4CE462411FD0710E0001CD98 /* Game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4623F1FD0710E0001CD98 /* Game.cpp */; }; 4CF788C01F1B787700C611BF /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CF788BE1F1B787700C611BF /* Painter.cpp */; }; 4CFBCD5E1F27CD8000D74FB6 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */; }; 4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7B1F90A3F1005243C2 /* Peep.cpp */; }; @@ -153,7 +158,6 @@ C61ADB231FBBCB8B0024F2EF /* GameBottomToolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61ADB221FBBCB8A0024F2EF /* GameBottomToolbar.cpp */; }; C61FB2721FA3E25D0095FB9D /* ObjectLoadError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61FB2701FA3E25C0095FB9D /* ObjectLoadError.cpp */; }; C61FB2731FA3E25D0095FB9D /* TextInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61FB2711FA3E25C0095FB9D /* TextInput.cpp */; }; - C61FB7241CF86356004CE991 /* NetworkUser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61FB7221CF86356004CE991 /* NetworkUser.cpp */; }; C62D83871FCC7D1A008C04F1 /* EditorObjectSelection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62D83861FCC7D19008C04F1 /* EditorObjectSelection.cpp */; }; C62D838A1FD36D6F008C04F1 /* EditorObjectSelectionSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62D83881FD36D6E008C04F1 /* EditorObjectSelectionSession.cpp */; }; C62D838B1FD36D6F008C04F1 /* EditorObjectSelectionSession.h in Headers */ = {isa = PBXBuildFile; fileRef = C62D83891FD36D6F008C04F1 /* EditorObjectSelectionSession.h */; }; @@ -275,7 +279,6 @@ F76C85BE1EC4E88300FA49E2 /* ScreenshotCommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83671EC4E7CC00FA49E2 /* ScreenshotCommands.cpp */; }; F76C85BF1EC4E88300FA49E2 /* SpriteCommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83681EC4E7CC00FA49E2 /* SpriteCommands.cpp */; }; F76C85C01EC4E88300FA49E2 /* UriHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83691EC4E7CC00FA49E2 /* UriHandler.cpp */; }; - F76C85C11EC4E88300FA49E2 /* cmdline_sprite.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C836A1EC4E7CC00FA49E2 /* cmdline_sprite.c */; }; F76C85C41EC4E88300FA49E2 /* Config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C836E1EC4E7CC00FA49E2 /* Config.cpp */; }; F76C85C71EC4E88300FA49E2 /* IniReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83711EC4E7CC00FA49E2 /* IniReader.cpp */; }; F76C85C91EC4E88300FA49E2 /* IniWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83731EC4E7CC00FA49E2 /* IniWriter.cpp */; }; @@ -292,7 +295,6 @@ F76C85E71EC4E88300FA49E2 /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83921EC4E7CC00FA49E2 /* String.cpp */; }; F76C85EB1EC4E88300FA49E2 /* textinputbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83961EC4E7CC00FA49E2 /* textinputbuffer.c */; }; F76C85EE1EC4E88300FA49E2 /* Zip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83991EC4E7CC00FA49E2 /* Zip.cpp */; }; - F76C85F01EC4E88300FA49E2 /* diagnostic.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C839B1EC4E7CC00FA49E2 /* diagnostic.c */; }; F76C85F21EC4E88300FA49E2 /* drawing.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C839E1EC4E7CC00FA49E2 /* drawing.c */; }; F76C85F41EC4E88300FA49E2 /* DrawingFast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83A01EC4E7CC00FA49E2 /* DrawingFast.cpp */; }; F76C85F51EC4E88300FA49E2 /* font.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83A11EC4E7CC00FA49E2 /* font.c */; }; @@ -308,7 +310,6 @@ F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */; }; F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */; }; F76C860B1EC4E88300FA49E2 /* Imaging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */; }; - F76C860D1EC4E88300FA49E2 /* input.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B91EC4E7CC00FA49E2 /* input.c */; }; F76C860F1EC4E88300FA49E2 /* chat.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83BC1EC4E7CC00FA49E2 /* chat.c */; }; F76C86111EC4E88300FA49E2 /* colour.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83BE1EC4E7CC00FA49E2 /* colour.c */; }; F76C86131EC4E88300FA49E2 /* console.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83C01EC4E7CC00FA49E2 /* console.c */; }; @@ -319,7 +320,6 @@ F76C86221EC4E88300FA49E2 /* viewport_interaction.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83CF1EC4E7CC00FA49E2 /* viewport_interaction.c */; }; F76C86231EC4E88300FA49E2 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D01EC4E7CC00FA49E2 /* widget.c */; }; F76C86251EC4E88300FA49E2 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D21EC4E7CC00FA49E2 /* window.c */; }; - F76C86271EC4E88300FA49E2 /* intro.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D41EC4E7CC00FA49E2 /* intro.c */; }; F76C86291EC4E88300FA49E2 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D81EC4E7CC00FA49E2 /* convert.c */; }; F76C862A1EC4E88300FA49E2 /* currency.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83D91EC4E7CC00FA49E2 /* currency.c */; }; F76C862C1EC4E88300FA49E2 /* date.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83DB1EC4E7CC00FA49E2 /* date.c */; }; @@ -360,7 +360,6 @@ F76C867D1EC4E88400FA49E2 /* StringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C842F1EC4E7CC00FA49E2 /* StringTable.cpp */; }; F76C867F1EC4E88400FA49E2 /* WallObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84311EC4E7CC00FA49E2 /* WallObject.cpp */; }; F76C86811EC4E88400FA49E2 /* WaterObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84331EC4E7CC00FA49E2 /* WaterObject.cpp */; }; - F76C86841EC4E88400FA49E2 /* object_list.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84361EC4E7CC00FA49E2 /* object_list.c */; }; F76C86861EC4E88400FA49E2 /* OpenRCT2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84381EC4E7CC00FA49E2 /* OpenRCT2.cpp */; }; F76C86881EC4E88400FA49E2 /* banner.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843C1EC4E7CC00FA49E2 /* banner.c */; }; F76C86891EC4E88400FA49E2 /* entrance.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843D1EC4E7CC00FA49E2 /* entrance.c */; }; @@ -713,14 +712,24 @@ 4CB832A81EFFB8D100B88761 /* ttf_sdlport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ttf_sdlport.c; sourceTree = ""; }; 4CB832A91EFFB8D100B88761 /* ttf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ttf.c; sourceTree = ""; }; 4CB832AA1EFFB8D100B88761 /* ttf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ttf.h; sourceTree = ""; }; + 4CC4B8DF1FE00B4100660D62 /* ObjectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectList.cpp; sourceTree = ""; }; + 4CC4B8E01FE00B4100660D62 /* ObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectList.h; sourceTree = ""; }; + 4CC4B8E21FE00C4100660D62 /* CmdlineSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CmdlineSprite.cpp; sourceTree = ""; }; + 4CC4B8E31FE00C4200660D62 /* CmdlineSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CmdlineSprite.h; sourceTree = ""; }; + 4CC4B8E51FE00C4E00660D62 /* Diagnostic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Diagnostic.cpp; sourceTree = ""; }; + 4CC4B8E61FE00C4E00660D62 /* Diagnostic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Diagnostic.h; sourceTree = ""; }; + 4CC4B8E81FE00C5D00660D62 /* Input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Input.cpp; sourceTree = ""; }; + 4CC4B8E91FE00C5D00660D62 /* Input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Input.h; sourceTree = ""; }; + 4CC4B8EA1FE00C5D00660D62 /* Intro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Intro.cpp; sourceTree = ""; }; + 4CC4B8EB1FE00C5D00660D62 /* Intro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Intro.h; sourceTree = ""; }; + 4CE4623F1FD0710E0001CD98 /* Game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Game.cpp; sourceTree = ""; }; + 4CE462401FD0710E0001CD98 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = ""; }; 4CE462421FD1612B0001CD98 /* android.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = android.c; sourceTree = ""; }; 4CE462441FD161360001CD98 /* Platform.Android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Android.cpp; sourceTree = ""; }; 4CE462461FD1613D0001CD98 /* Platform.Linux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Linux.cpp; sourceTree = ""; }; 4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.macOS.cpp; sourceTree = ""; }; 4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Posix.cpp; sourceTree = ""; }; 4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Win32.cpp; sourceTree = ""; }; - 4CE4623F1FD0710E0001CD98 /* Game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Game.cpp; sourceTree = ""; }; - 4CE462401FD0710E0001CD98 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = ""; }; 4CF788BE1F1B787700C611BF /* Painter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Painter.cpp; sourceTree = ""; }; 4CF788BF1F1B787700C611BF /* Painter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Painter.h; sourceTree = ""; }; 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = ""; }; @@ -768,7 +777,6 @@ C61ADB221FBBCB8A0024F2EF /* GameBottomToolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameBottomToolbar.cpp; sourceTree = ""; }; C61FB2701FA3E25C0095FB9D /* ObjectLoadError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectLoadError.cpp; sourceTree = ""; }; C61FB2711FA3E25C0095FB9D /* TextInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextInput.cpp; sourceTree = ""; }; - C61FB7221CF86356004CE991 /* NetworkUser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkUser.cpp; sourceTree = ""; usesTabs = 0; }; C62D83861FCC7D19008C04F1 /* EditorObjectSelection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorObjectSelection.cpp; sourceTree = ""; }; C62D83881FD36D6E008C04F1 /* EditorObjectSelectionSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorObjectSelectionSession.cpp; sourceTree = ""; }; C62D83891FD36D6F008C04F1 /* EditorObjectSelectionSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorObjectSelectionSession.h; sourceTree = ""; }; @@ -1050,8 +1058,6 @@ F76C83671EC4E7CC00FA49E2 /* ScreenshotCommands.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ScreenshotCommands.cpp; sourceTree = ""; }; F76C83681EC4E7CC00FA49E2 /* SpriteCommands.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteCommands.cpp; sourceTree = ""; }; F76C83691EC4E7CC00FA49E2 /* UriHandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UriHandler.cpp; sourceTree = ""; }; - F76C836A1EC4E7CC00FA49E2 /* cmdline_sprite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cmdline_sprite.c; sourceTree = ""; }; - F76C836B1EC4E7CC00FA49E2 /* cmdline_sprite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cmdline_sprite.h; sourceTree = ""; }; F76C836C1EC4E7CC00FA49E2 /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; F76C836E1EC4E7CC00FA49E2 /* Config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Config.cpp; sourceTree = ""; }; F76C836F1EC4E7CC00FA49E2 /* Config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = ""; }; @@ -1096,8 +1102,6 @@ F76C83981EC4E7CC00FA49E2 /* Util.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Util.hpp; sourceTree = ""; }; F76C83991EC4E7CC00FA49E2 /* Zip.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Zip.cpp; sourceTree = ""; }; F76C839A1EC4E7CC00FA49E2 /* Zip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Zip.h; sourceTree = ""; }; - F76C839B1EC4E7CC00FA49E2 /* diagnostic.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = diagnostic.c; sourceTree = ""; }; - F76C839C1EC4E7CC00FA49E2 /* diagnostic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = diagnostic.h; sourceTree = ""; }; F76C839E1EC4E7CC00FA49E2 /* drawing.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = drawing.c; sourceTree = ""; }; F76C839F1EC4E7CC00FA49E2 /* drawing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = drawing.h; sourceTree = ""; }; F76C83A01EC4E7CC00FA49E2 /* DrawingFast.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingFast.cpp; sourceTree = ""; }; @@ -1123,8 +1127,6 @@ F76C83B41EC4E7CC00FA49E2 /* FileClassifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileClassifier.h; sourceTree = ""; }; F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Imaging.cpp; sourceTree = ""; }; F76C83B81EC4E7CC00FA49E2 /* Imaging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Imaging.h; sourceTree = ""; }; - F76C83B91EC4E7CC00FA49E2 /* input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = input.c; sourceTree = ""; }; - F76C83BA1EC4E7CC00FA49E2 /* input.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = input.h; sourceTree = ""; }; F76C83BC1EC4E7CC00FA49E2 /* chat.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = chat.c; sourceTree = ""; }; F76C83BD1EC4E7CC00FA49E2 /* chat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = chat.h; sourceTree = ""; }; F76C83BE1EC4E7CC00FA49E2 /* colour.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = colour.c; sourceTree = ""; }; @@ -1146,8 +1148,6 @@ F76C83D11EC4E7CC00FA49E2 /* widget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = ""; }; F76C83D21EC4E7CC00FA49E2 /* window.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = window.c; sourceTree = ""; }; F76C83D31EC4E7CC00FA49E2 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = ""; }; - F76C83D41EC4E7CC00FA49E2 /* intro.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = intro.c; sourceTree = ""; }; - F76C83D51EC4E7CC00FA49E2 /* intro.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = intro.h; sourceTree = ""; }; F76C83D81EC4E7CC00FA49E2 /* convert.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = convert.c; sourceTree = ""; }; F76C83D91EC4E7CC00FA49E2 /* currency.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = currency.c; sourceTree = ""; }; F76C83DA1EC4E7CC00FA49E2 /* currency.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = currency.h; sourceTree = ""; }; @@ -1229,8 +1229,6 @@ F76C84331EC4E7CC00FA49E2 /* WaterObject.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WaterObject.cpp; sourceTree = ""; }; F76C84341EC4E7CC00FA49E2 /* WaterObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WaterObject.h; sourceTree = ""; }; F76C84351EC4E7CC00FA49E2 /* object.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = ""; }; - F76C84361EC4E7CC00FA49E2 /* object_list.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = object_list.c; sourceTree = ""; }; - F76C84371EC4E7CC00FA49E2 /* object_list.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = object_list.h; sourceTree = ""; }; F76C84381EC4E7CC00FA49E2 /* OpenRCT2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OpenRCT2.cpp; sourceTree = ""; }; F76C84391EC4E7CC00FA49E2 /* OpenRCT2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenRCT2.h; sourceTree = ""; }; F76C843C1EC4E7CC00FA49E2 /* banner.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = banner.c; sourceTree = ""; }; @@ -1824,15 +1822,15 @@ F76C855B1EC4E7CD00FA49E2 /* world */, F76C835F1EC4E7CC00FA49E2 /* cheats.c */, F76C83601EC4E7CC00FA49E2 /* cheats.h */, - F76C836A1EC4E7CC00FA49E2 /* cmdline_sprite.c */, - F76C836B1EC4E7CC00FA49E2 /* cmdline_sprite.h */, + 4CC4B8E21FE00C4100660D62 /* CmdlineSprite.cpp */, + 4CC4B8E31FE00C4200660D62 /* CmdlineSprite.h */, F76C836C1EC4E7CC00FA49E2 /* common.h */, F76C83761EC4E7CC00FA49E2 /* Context.cpp */, F76C83771EC4E7CC00FA49E2 /* Context.h */, 4C5DFF401FAC69D200CB093A /* Date.cpp */, 4C5DFF411FAC69D200CB093A /* Date.h */, - F76C839B1EC4E7CC00FA49E2 /* diagnostic.c */, - F76C839C1EC4E7CC00FA49E2 /* diagnostic.h */, + 4CC4B8E51FE00C4E00660D62 /* Diagnostic.cpp */, + 4CC4B8E61FE00C4E00660D62 /* Diagnostic.h */, F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */, F76C83B21EC4E7CC00FA49E2 /* Editor.h */, C62D83881FD36D6E008C04F1 /* EditorObjectSelectionSession.cpp */, @@ -1843,13 +1841,13 @@ 4CE462401FD0710E0001CD98 /* Game.h */, F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */, F76C83B81EC4E7CC00FA49E2 /* Imaging.h */, - F76C83B91EC4E7CC00FA49E2 /* input.c */, - F76C83BA1EC4E7CC00FA49E2 /* input.h */, - F76C83D41EC4E7CC00FA49E2 /* intro.c */, - F76C83D51EC4E7CC00FA49E2 /* intro.h */, + 4CC4B8E81FE00C5D00660D62 /* Input.cpp */, + 4CC4B8E91FE00C5D00660D62 /* Input.h */, + 4CC4B8EA1FE00C5D00660D62 /* Intro.cpp */, + 4CC4B8EB1FE00C5D00660D62 /* Intro.h */, F76C84351EC4E7CC00FA49E2 /* object.h */, - F76C84361EC4E7CC00FA49E2 /* object_list.c */, - F76C84371EC4E7CC00FA49E2 /* object_list.h */, + 4CC4B8DF1FE00B4100660D62 /* ObjectList.cpp */, + 4CC4B8E01FE00B4100660D62 /* ObjectList.h */, F76C84381EC4E7CC00FA49E2 /* OpenRCT2.cpp */, F76C84391EC4E7CC00FA49E2 /* OpenRCT2.h */, F76C84511EC4E7CC00FA49E2 /* ParkImporter.cpp */, @@ -3076,11 +3074,13 @@ 4C8B42741EEB1B6F00F015CA /* Screenshot.cpp in Sources */, 4C93F1491F8B744400A9330D /* MineRide.cpp in Sources */, F76C88781EC5324E00FA49E2 /* AudioChannel.cpp in Sources */, + 4CC4B8EC1FE00C5D00660D62 /* Input.cpp in Sources */, C666EE6D1F37ACB10061AA04 /* Cheats.cpp in Sources */, C685E5191F8907850090598F /* NewRide.cpp in Sources */, 4C93F1561F8B744400A9330D /* VirginiaReel.cpp in Sources */, C654DF361F69C0430040F43D /* Player.cpp in Sources */, 4C93F1A51F8B748900A9330D /* BoatHire.cpp in Sources */, + 4CC4B8E11FE00B4100660D62 /* ObjectList.cpp in Sources */, 4CFE4E821F90A3F1005243C2 /* Staff.cpp in Sources */, F76C88791EC5324E00FA49E2 /* AudioContext.cpp in Sources */, 4C93F1571F8B744400A9330D /* WildMouse.cpp in Sources */, @@ -3090,6 +3090,7 @@ 4CFE4E8A1F950164005243C2 /* TrackDataOld.cpp in Sources */, C666EE7F1F37ACB10061AA04 /* Viewport.cpp in Sources */, C632C81F1F8A445700781F6D /* RideList.cpp in Sources */, + 4CC4B8E41FE00C4200660D62 /* CmdlineSprite.cpp in Sources */, 4C93F1A71F8B748900A9330D /* LogFlume.cpp in Sources */, 4C93F1731F8B745700A9330D /* MerryGoRound.cpp in Sources */, C654DF3C1F69C0430040F43D /* TrackDesignManage.cpp in Sources */, @@ -3161,6 +3162,7 @@ 4CB832A71EFBDCCE00B88761 /* land_tool.c in Sources */, C6415B471FA3B3E400AC4926 /* FontFamilies.cpp in Sources */, 4C93F1541F8B744400A9330D /* TwisterRollerCoaster.cpp in Sources */, + 4CC4B8E71FE00C4E00660D62 /* Diagnostic.cpp in Sources */, C666EE7B1F37ACB10061AA04 /* TitleExit.cpp in Sources */, F7D7747F1EC61E5100BE6EBC /* UiContext.macOS.mm in Sources */, F76C887E1EC5324E00FA49E2 /* CursorRepository.cpp in Sources */, @@ -3221,6 +3223,7 @@ F76C88831EC5324E00FA49E2 /* OpenGLAPI.cpp in Sources */, 4C729BC91FC2E6E9001DFF2F /* MoneyEffect.cpp in Sources */, 4C93F1521F8B744400A9330D /* Steeplechase.cpp in Sources */, + 4CC4B8ED1FE00C5D00660D62 /* Intro.cpp in Sources */, 4C93F1BD1F8E185600A9330D /* NewsItem.cpp in Sources */, F7CB863F1EEDA0B50030C877 /* WindowManager.cpp in Sources */, 4C93F13F1F8B744400A9330D /* FlyingRollerCoaster.cpp in Sources */, @@ -3300,7 +3303,6 @@ F76C85BE1EC4E88300FA49E2 /* ScreenshotCommands.cpp in Sources */, F76C85BF1EC4E88300FA49E2 /* SpriteCommands.cpp in Sources */, F76C85C01EC4E88300FA49E2 /* UriHandler.cpp in Sources */, - F76C85C11EC4E88300FA49E2 /* cmdline_sprite.c in Sources */, F76C85C41EC4E88300FA49E2 /* Config.cpp in Sources */, F76C85C71EC4E88300FA49E2 /* IniReader.cpp in Sources */, F76C85C91EC4E88300FA49E2 /* IniWriter.cpp in Sources */, @@ -3319,7 +3321,6 @@ F76C85E71EC4E88300FA49E2 /* String.cpp in Sources */, F76C85EB1EC4E88300FA49E2 /* textinputbuffer.c in Sources */, F76C85EE1EC4E88300FA49E2 /* Zip.cpp in Sources */, - F76C85F01EC4E88300FA49E2 /* diagnostic.c in Sources */, F76C85F21EC4E88300FA49E2 /* drawing.c in Sources */, F76C85F41EC4E88300FA49E2 /* DrawingFast.cpp in Sources */, F76C85F51EC4E88300FA49E2 /* font.c in Sources */, @@ -3336,7 +3337,6 @@ F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */, F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */, F76C860B1EC4E88300FA49E2 /* Imaging.cpp in Sources */, - F76C860D1EC4E88300FA49E2 /* input.c in Sources */, F76C860F1EC4E88300FA49E2 /* chat.c in Sources */, F76C86111EC4E88300FA49E2 /* colour.c in Sources */, F76C86131EC4E88300FA49E2 /* console.c in Sources */, @@ -3347,7 +3347,6 @@ F76C86221EC4E88300FA49E2 /* viewport_interaction.c in Sources */, F76C86231EC4E88300FA49E2 /* widget.c in Sources */, F76C86251EC4E88300FA49E2 /* window.c in Sources */, - F76C86271EC4E88300FA49E2 /* intro.c in Sources */, F76C86291EC4E88300FA49E2 /* convert.c in Sources */, F76C862A1EC4E88300FA49E2 /* currency.c in Sources */, F76C862C1EC4E88300FA49E2 /* date.c in Sources */, @@ -3390,7 +3389,6 @@ F76C867D1EC4E88400FA49E2 /* StringTable.cpp in Sources */, F76C867F1EC4E88400FA49E2 /* WallObject.cpp in Sources */, F76C86811EC4E88400FA49E2 /* WaterObject.cpp in Sources */, - F76C86841EC4E88400FA49E2 /* object_list.c in Sources */, F76C86861EC4E88400FA49E2 /* OpenRCT2.cpp in Sources */, F76C86881EC4E88400FA49E2 /* banner.c in Sources */, F76C86891EC4E88400FA49E2 /* entrance.c in Sources */, diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index a400b867d9..fb7a5fc07f 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -40,7 +40,7 @@ #include "UiContext.h" #include "WindowManager.h" -#include +#include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 1b73f8ecef..4c48482c27 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/input/Input.cpp b/src/openrct2-ui/input/Input.cpp index 30f0d16345..ecafaff622 100644 --- a/src/openrct2-ui/input/Input.cpp +++ b/src/openrct2-ui/input/Input.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index 15e9f6f145..bde9416ac8 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 1c7b979139..7738866745 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index c1fffda96a..a67120c389 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index a9bedddad0..9a0541f191 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 7ab84276ad..8815961348 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -20,11 +20,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index a631695207..1beacbb74d 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index ae2863070f..3645c59ebf 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index d634a2e9ff..d3737ede02 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index d0cfac1881..a9a4e11364 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 30f69e2b67..e56d55ab0d 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index ac85a69585..bcdd9e9d11 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index d1acb9ca89..4f7c9fb152 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 3db0d271a5..6c3d4e4f58 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index d83dd6ef8b..085afc0e60 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index c8b4be9464..9002c50ba9 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index f7efc21593..c9ad7052a9 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index f553fb0a0e..c52e88cb99 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -19,12 +19,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 14400699fb..c5614d7d0f 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 077d2db83a..48bfc367a5 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 1e7bf2533f..d8ec5b5661 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index cdaea3c882..80445db7e1 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 797373f7b3..61fe3bff36 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 3b23056d4a..8975dc490e 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 536c5d9c07..7ab170a100 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include enum WINDOW_TITLE_EXIT_WIDGET_IDX { WIDX_EXIT, diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index 7dec51c521..9b370820fb 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index f03d63c8da..51b48049db 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 629952634a..850f5dc7d5 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 8269bc9da2..f2343578d9 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/cmdline_sprite.c b/src/openrct2/CmdlineSprite.cpp similarity index 96% rename from src/openrct2/cmdline_sprite.c rename to src/openrct2/CmdlineSprite.cpp index fb3578f9ff..afd9b65b70 100644 --- a/src/openrct2/cmdline_sprite.c +++ b/src/openrct2/CmdlineSprite.cpp @@ -17,7 +17,7 @@ #pragma warning(disable : 4706) // assignment within conditional expression #include -#include "cmdline_sprite.h" +#include "CmdlineSprite.h" #include "drawing/drawing.h" #include "Imaging.h" #include "localisation/localisation.h" @@ -54,8 +54,13 @@ assert_struct_size(rle_code, 2); assert_struct_size(rct_sprite_file_palette_entry, 4); +class CmdlineSprite +{ +public: + static const rct_sprite_file_palette_entry _standardPalette[256]; +}; + static rct_sprite_file_palette_entry spriteFilePalette[256]; -static rct_sprite_file_palette_entry _standardPalette[256]; static rct_sprite_file_header spriteFileHeader; static rct_g1_element *spriteFileEntries; @@ -129,7 +134,7 @@ static bool sprite_file_open(const utf8 *path) return false; } - spriteFileData = malloc(spriteFileHeader.total_size); + spriteFileData = (uint8 *)malloc(spriteFileHeader.total_size); if (fread(spriteFileData, spriteFileHeader.total_size, 1, file) != 1) { free(spriteFileData); free(openElements); @@ -138,7 +143,7 @@ static bool sprite_file_open(const utf8 *path) } sint32 entryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element); - spriteFileEntries = malloc(entryTableSize); + spriteFileEntries = (rct_g1_element *)malloc(entryTableSize); for (uint32 i = 0; i < spriteFileHeader.num_entries; i++) { rct_g1_element_32bit * inElement = &openElements[i]; rct_g1_element * outElement = &spriteFileEntries[i]; @@ -223,7 +228,7 @@ static bool sprite_file_export(sint32 spriteIndex, const char *outPath) spriteHeader = &spriteFileEntries[spriteIndex]; pixelBufferSize = spriteHeader->width * spriteHeader->height; - pixels = malloc(pixelBufferSize); + pixels = (uint8 *)malloc(pixelBufferSize); memset(pixels, 0, pixelBufferSize); dpi.bits = pixels; @@ -234,7 +239,7 @@ static bool sprite_file_export(sint32 spriteIndex, const char *outPath) dpi.pitch = 0; dpi.zoom_level = 0; - memcpy(spriteFilePalette, _standardPalette, 256 * 4); + memcpy(spriteFilePalette, CmdlineSprite::_standardPalette, 256 * 4); if (spriteHeader->flags & G1_FLAG_RLE_COMPRESSION) { gfx_rle_sprite_to_buffer(spriteHeader->offset, pixels, (uint8*)spriteFilePalette, &dpi, IMAGE_TYPE_DEFAULT, 0, spriteHeader->height, 0, spriteHeader->width); @@ -332,15 +337,15 @@ static bool sprite_file_import(const char *path, sint16 x_offset, sint16 y_offse return false; } - memcpy(spriteFilePalette, _standardPalette, 256 * 4); + memcpy(spriteFilePalette, CmdlineSprite::_standardPalette, 256 * 4); - uint8 *buffer = malloc((height * 2) + (width * height * 16)); + uint8 *buffer = (uint8 *)malloc((height * 2) + (width * height * 16)); memset(buffer, 0, (height * 2) + (width * height * 16)); uint16 *yOffsets = (uint16*)buffer; // A larger range is needed for proper dithering uint8 *palettedSrc = pixels; - sint16 *rgbaSrc = keep_palette? 0 : malloc(height * width * 4 * 2); + sint16 *rgbaSrc = keep_palette? 0 : (sint16 *)malloc(height * width * 4 * 2); sint16 *rgbaSrc_orig = rgbaSrc; if (!keep_palette) { @@ -510,7 +515,7 @@ static bool sprite_file_import(const char *path, sint16 x_offset, sint16 y_offse free(rgbaSrc_orig); sint32 bufferLength = (sint32)(dst - buffer); - buffer = realloc(buffer, bufferLength); + buffer = (uint8 *)realloc(buffer, bufferLength); outElement->offset = buffer; outElement->width = width; @@ -725,10 +730,10 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc) spriteFileHeader.num_entries++; spriteFileHeader.total_size += bufferLength; - spriteFileEntries = realloc(spriteFileEntries, spriteFileHeader.num_entries * sizeof(rct_g1_element)); + spriteFileEntries = (rct_g1_element *)realloc(spriteFileEntries, spriteFileHeader.num_entries * sizeof(rct_g1_element)); sprite_entries_make_relative(); - spriteFileData = realloc(spriteFileData, spriteFileHeader.total_size); + spriteFileData = (uint8 *)realloc(spriteFileData, spriteFileHeader.total_size); sprite_entries_make_absolute(); spriteFileEntries[spriteFileHeader.num_entries - 1] = spriteElement; @@ -837,10 +842,10 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc) spriteFileHeader.num_entries++; spriteFileHeader.total_size += bufferLength; - spriteFileEntries = realloc(spriteFileEntries, spriteFileHeader.num_entries * sizeof(rct_g1_element)); + spriteFileEntries = (rct_g1_element *)realloc(spriteFileEntries, spriteFileHeader.num_entries * sizeof(rct_g1_element)); sprite_entries_make_relative(); - spriteFileData = realloc(spriteFileData, spriteFileHeader.total_size); + spriteFileData = (uint8 *)realloc(spriteFileData, spriteFileHeader.total_size); sprite_entries_make_absolute(); spriteFileEntries[spriteFileHeader.num_entries - 1] = spriteElement; @@ -876,7 +881,7 @@ sint32 cmdline_for_sprite(const char **argv, sint32 argc) } } -static rct_sprite_file_palette_entry _standardPalette[256] = { +const rct_sprite_file_palette_entry CmdlineSprite::_standardPalette[256] = { // 0 (unused) { 0, 0, 0, 255 }, diff --git a/src/openrct2/cmdline_sprite.h b/src/openrct2/CmdlineSprite.h similarity index 100% rename from src/openrct2/cmdline_sprite.h rename to src/openrct2/CmdlineSprite.h diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 1b740de3d5..d20f1b8403 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -52,18 +52,18 @@ #include "drawing/lightfx.h" #include "Editor.h" #include "Game.h" -#include "input.h" +#include "Input.h" #include "interface/chat.h" #include "interface/console.h" #include "interface/themes.h" -#include "intro.h" +#include "Intro.h" #include "localisation/date.h" #include "localisation/language.h" #include "network/DiscordService.h" #include "network/http.h" #include "network/network.h" #include "network/twitch.h" -#include "object_list.h" +#include "ObjectList.h" #include "platform/platform.h" #include "rct1.h" #include "util/util.h" diff --git a/src/openrct2/diagnostic.c b/src/openrct2/Diagnostic.cpp similarity index 99% rename from src/openrct2/diagnostic.c rename to src/openrct2/Diagnostic.cpp index 96e3176a22..4ceef4ac20 100644 --- a/src/openrct2/diagnostic.c +++ b/src/openrct2/Diagnostic.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "diagnostic.h" +#include "Diagnostic.h" #ifdef __ANDROID__ #include diff --git a/src/openrct2/diagnostic.h b/src/openrct2/Diagnostic.h similarity index 100% rename from src/openrct2/diagnostic.h rename to src/openrct2/Diagnostic.h diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 2d7ca6cec8..a52708b488 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -28,7 +28,7 @@ #include "management/NewsItem.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" -#include "object_list.h" +#include "ObjectList.h" #include "peep/Staff.h" #include "rct1.h" #include "util/util.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index d6a79f1ba0..d38b026f87 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -23,7 +23,7 @@ #include "Editor.h" #include "FileClassifier.h" #include "Game.h" -#include "input.h" +#include "Input.h" #include "interface/Screenshot.h" #include "interface/viewport.h" #include "interface/widget.h" diff --git a/src/openrct2/input.c b/src/openrct2/Input.cpp similarity index 97% rename from src/openrct2/input.c rename to src/openrct2/Input.cpp index 93c2b03c4c..255cebcb44 100644 --- a/src/openrct2/input.c +++ b/src/openrct2/Input.cpp @@ -17,8 +17,10 @@ #include "audio/audio.h" #include "config/Config.h" #include "Context.h" +#include "core/Math.hpp" +#include "core/Util.hpp" #include "Game.h" -#include "input.h" +#include "Input.h" #include "interface/chat.h" #include "interface/console.h" #include "interface/Cursors.h" @@ -37,6 +39,7 @@ #include "world/scenery.h" #include "OpenRCT2.h" + typedef struct rct_mouse_data { uint32 x; uint32 y; @@ -56,7 +59,7 @@ static sint32 _originalWindowHeight; static uint8 _currentScrollIndex; static uint8 _currentScrollArea; -static uint8 _inputState; +static INPUT_STATE _inputState; static uint8 _inputFlags; uint8 gInputPlaceObjectModifier; @@ -133,8 +136,8 @@ void game_handle_input() } else if (x != 0x80000000) { sint32 screenWidth = context_get_width(); sint32 screenHeight = context_get_height(); - x = clamp(0, x, screenWidth - 1); - y = clamp(0, y, screenHeight - 1); + x = Math::Clamp(0, x, screenWidth - 1); + y = Math::Clamp(0, y, screenHeight - 1); game_handle_input_mouse(x, y, state); process_mouse_over(x, y); @@ -176,7 +179,7 @@ static rct_mouse_data *get_mouse_input() return NULL; } else { rct_mouse_data *result = &_mouseInputQueue[_mouseInputQueueReadIndex]; - _mouseInputQueueReadIndex = (_mouseInputQueueReadIndex + 1) % countof(_mouseInputQueue); + _mouseInputQueueReadIndex = (_mouseInputQueueReadIndex + 1) % Util::CountOf(_mouseInputQueue); return result; } } @@ -216,19 +219,19 @@ static void input_scroll_drag_continue(sint32 x, sint32 y, rct_window* w) dy = y - gInputDragLastY; if (scroll->flags & HSCROLLBAR_VISIBLE) { - sint16 size = widget->right - widget->left - 1; + sint32 size = widget->right - widget->left - 1; if (scroll->flags & VSCROLLBAR_VISIBLE) size -= 11; - size = max(0, scroll->h_right - size); - scroll->h_left = min(max(0, scroll->h_left + dx), size); + size = Math::Max(0, scroll->h_right - size); + scroll->h_left = Math::Min(Math::Max(0, scroll->h_left + dx), size); } if (scroll->flags & VSCROLLBAR_VISIBLE) { - sint16 size = widget->bottom - widget->top - 1; + sint32 size = widget->bottom - widget->top - 1; if (scroll->flags & HSCROLLBAR_VISIBLE) size -= 11; - size = max(0, scroll->v_bottom - size); - scroll->v_top = min(max(0, scroll->v_top + dy), size); + size = Math::Max(0, scroll->v_bottom - size); + scroll->v_top = Math::Min(Math::Max(0, scroll->v_top + dy), size); } widget_scroll_update_thumbs(w, widgetIndex); @@ -592,37 +595,37 @@ static void input_scroll_begin(rct_window *w, rct_widgetindex widgetIndex, sint3 sint32 widget_width = widg->right - widg->left - 1; if (scroll->flags & VSCROLLBAR_VISIBLE) widget_width -= 11; - sint32 widget_content_width = max(scroll->h_right - widget_width, 0); + sint32 widget_content_width = Math::Max(scroll->h_right - widget_width, 0); sint32 widget_height = widg->bottom - widg->top - 1; if (scroll->flags & HSCROLLBAR_VISIBLE) widget_height -= 11; - sint32 widget_content_height = max(scroll->v_bottom - widget_height, 0); + sint32 widget_content_height = Math::Max(scroll->v_bottom - widget_height, 0); switch (scroll_area) { case SCROLL_PART_HSCROLLBAR_LEFT: - scroll->h_left = max(scroll->h_left - 3, 0); + scroll->h_left = Math::Max(scroll->h_left - 3, 0); break; case SCROLL_PART_HSCROLLBAR_RIGHT: - scroll->h_left = min(scroll->h_left + 3, widget_content_width); + scroll->h_left = Math::Min(scroll->h_left + 3, widget_content_width); break; case SCROLL_PART_HSCROLLBAR_LEFT_TROUGH: - scroll->h_left = max(scroll->h_left - widget_width, 0); + scroll->h_left = Math::Max(scroll->h_left - widget_width, 0); break; case SCROLL_PART_HSCROLLBAR_RIGHT_TROUGH: - scroll->h_left = min(scroll->h_left + widget_width, widget_content_width); + scroll->h_left = Math::Min(scroll->h_left + widget_width, widget_content_width); break; case SCROLL_PART_VSCROLLBAR_TOP: - scroll->v_top = max(scroll->v_top - 3, 0); + scroll->v_top = Math::Max(scroll->v_top - 3, 0); break; case SCROLL_PART_VSCROLLBAR_BOTTOM: - scroll->v_top = min(scroll->v_top + 3, widget_content_height); + scroll->v_top = Math::Min(scroll->v_top + 3, widget_content_height); break; case SCROLL_PART_VSCROLLBAR_TOP_TROUGH: - scroll->v_top = max(scroll->v_top - widget_height, 0); + scroll->v_top = Math::Max(scroll->v_top - widget_height, 0); break; case SCROLL_PART_VSCROLLBAR_BOTTOM_TROUGH: - scroll->v_top = min(scroll->v_top + widget_height, widget_content_height); + scroll->v_top = Math::Min(scroll->v_top + widget_height, widget_content_height); break; default: break; @@ -1466,7 +1469,7 @@ void invalidate_scroll() void store_mouse_input(sint32 state, sint32 x, sint32 y) { uint32 writeIndex = _mouseInputQueueWriteIndex; - uint32 nextWriteIndex = (writeIndex + 1) % countof(_mouseInputQueue); + uint32 nextWriteIndex = (writeIndex + 1) % Util::CountOf(_mouseInputQueue); // Check if the queue is full if (nextWriteIndex != _mouseInputQueueReadIndex) { diff --git a/src/openrct2/input.h b/src/openrct2/Input.h similarity index 100% rename from src/openrct2/input.h rename to src/openrct2/Input.h diff --git a/src/openrct2/intro.c b/src/openrct2/Intro.cpp similarity index 99% rename from src/openrct2/intro.c rename to src/openrct2/Intro.cpp index f4e41f5347..3452a6377d 100644 --- a/src/openrct2/intro.c +++ b/src/openrct2/Intro.cpp @@ -18,7 +18,7 @@ #include "audio/AudioMixer.h" #include "Context.h" #include "drawing/drawing.h" -#include "intro.h" +#include "Intro.h" #include "sprites.h" #define BACKROUND_COLOUR_DARK PALETTE_INDEX_10 diff --git a/src/openrct2/intro.h b/src/openrct2/Intro.h similarity index 100% rename from src/openrct2/intro.h rename to src/openrct2/Intro.h diff --git a/src/openrct2/object_list.c b/src/openrct2/ObjectList.cpp similarity index 97% rename from src/openrct2/object_list.c rename to src/openrct2/ObjectList.cpp index d46432d696..4146ab891c 100644 --- a/src/openrct2/object_list.c +++ b/src/openrct2/ObjectList.cpp @@ -14,9 +14,11 @@ *****************************************************************************/ #pragma endregion +#include "core/Math.hpp" +#include "core/Util.hpp" #include "Game.h" #include "object.h" -#include "object_list.h" +#include "ObjectList.h" #include "object/ObjectRepository.h" #include "util/sawyercoding.h" #include "util/util.h" @@ -123,7 +125,7 @@ void object_create_identifier_name(char* string_buffer, size_t size, const rct_o * ecx = entry_type */ sint32 find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index){ - if ((entry->flags & 0xF) >= countof(object_entry_groups)) { + if ((entry->flags & 0xF) >= Util::CountOf(object_entry_groups)) { return 0; } *entry_type = entry->flags & 0xF; @@ -180,7 +182,7 @@ void * get_loaded_object_chunk(size_t index) void object_entry_get_name_fixed(utf8 * buffer, size_t bufferSize, const rct_object_entry * entry) { - bufferSize = min(9, bufferSize); + bufferSize = Math::Min((size_t)9, bufferSize); memcpy(buffer, entry->name, bufferSize - 1); buffer[bufferSize - 1] = 0; } diff --git a/src/openrct2/object_list.h b/src/openrct2/ObjectList.h similarity index 100% rename from src/openrct2/object_list.h rename to src/openrct2/ObjectList.h diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 4530a5c9e7..56a73b391a 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -29,7 +29,7 @@ #include "AudioMixer.h" #include "../interface/viewport.h" -#include "../intro.h" +#include "../Intro.h" #include "../localisation/language.h" #include "../ride/ride.h" #include "../util/util.h" diff --git a/src/openrct2/cmdline/SpriteCommands.cpp b/src/openrct2/cmdline/SpriteCommands.cpp index 5c782c337a..3da662916d 100644 --- a/src/openrct2/cmdline/SpriteCommands.cpp +++ b/src/openrct2/cmdline/SpriteCommands.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../cmdline_sprite.h" +#include "../CmdlineSprite.h" #include "../core/Memory.hpp" #include "../core/String.hpp" #include "CommandLine.hpp" diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 8b2209ae15..27419d959b 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -44,7 +44,7 @@ typedef uint16_t uint16; typedef uint32_t uint32; typedef uint64_t uint64; -#include "diagnostic.h" +#include "Diagnostic.h" typedef char utf8; typedef utf8* utf8string; diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index ac110ba2bb..ae084cb68e 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -29,7 +29,7 @@ #include "../Game.h" #include "../interface/viewport.h" #include "../interface/window.h" -#include "../intro.h" +#include "../Intro.h" #include "drawing.h" #include "lightfx.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 93d90df283..77dd6d9984 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -25,7 +25,7 @@ #include "../drawing/drawing.h" #include "../Game.h" -#include "../intro.h" +#include "../Intro.h" #include "../localisation/localisation.h" #include "../platform/platform.h" #include "../util/util.h" diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index 28d4a19976..a4de8260d0 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -22,7 +22,7 @@ #include "../Editor.h" #include "../EditorObjectSelectionSession.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../interface/themes.h" #include "../localisation/localisation.h" #include "../localisation/user.h" diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index 54b080e42d..5e3bf904da 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -18,7 +18,7 @@ #include "../Context.h" #include "../drawing/drawing.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../paint/paint.h" diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 1013a3516b..0d2f37476f 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -17,7 +17,7 @@ #include "../cheats.h" #include "../Editor.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../ride/ride.h" diff --git a/src/openrct2/interface/widget.c b/src/openrct2/interface/widget.c index ed752aaf93..de067d7520 100644 --- a/src/openrct2/interface/widget.c +++ b/src/openrct2/interface/widget.c @@ -15,7 +15,7 @@ #pragma endregion #include "../drawing/drawing.h" -#include "../input.h" +#include "../Input.h" #include "../sprites.h" #include "widget.h" #include "window.h" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 0c5581bdcb..c1ea361da6 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -21,7 +21,7 @@ #include "../drawing/drawing.h" #include "../Editor.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../interface/Cursors.h" #include "../interface/themes.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 118525ec5a..b6fcc16a47 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -17,7 +17,7 @@ #include "../audio/audio.h" #include "../Context.h" #include "../core/Util.hpp" -#include "../input.h" +#include "../Input.h" #include "../interface/window.h" #include "../localisation/date.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 1ca7784d41..c60bfa2f92 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -22,7 +22,7 @@ #include "../localisation/date.h" #include "../localisation/localisation.h" #include "../localisation/string_ids.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../OpenRCT2.h" #include "../scenario/scenario.h" #include "../rct1.h" diff --git a/src/openrct2/network/NetworkKey.cpp b/src/openrct2/network/NetworkKey.cpp index 50a46146eb..5aace055a1 100644 --- a/src/openrct2/network/NetworkKey.cpp +++ b/src/openrct2/network/NetworkKey.cpp @@ -22,7 +22,7 @@ #include #include "../core/IStream.hpp" -#include "../diagnostic.h" +#include "../Diagnostic.h" #include "NetworkKey.h" #define KEY_TYPE EVP_PKEY_RSA diff --git a/src/openrct2/object/BannerObject.cpp b/src/openrct2/object/BannerObject.cpp index 1c64f9d78c..d4904f9d7b 100644 --- a/src/openrct2/object/BannerObject.cpp +++ b/src/openrct2/object/BannerObject.cpp @@ -20,7 +20,7 @@ #include "../drawing/drawing.h" #include "../localisation/language.h" #include "../object.h" -#include "../object_list.h" +#include "../ObjectList.h" void BannerObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/FootpathItemObject.cpp b/src/openrct2/object/FootpathItemObject.cpp index b92b6f217b..f2bc79678e 100644 --- a/src/openrct2/object/FootpathItemObject.cpp +++ b/src/openrct2/object/FootpathItemObject.cpp @@ -20,7 +20,7 @@ #include "../drawing/drawing.h" #include "../localisation/localisation.h" #include "../object.h" -#include "../object_list.h" +#include "../ObjectList.h" void FootpathItemObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index ca1bfd6887..0375de26f1 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -29,7 +29,7 @@ #include "SmallSceneryObject.h" #include "WallObject.h" -#include "../object_list.h" +#include "../ObjectList.h" class ObjectManager final : public IObjectManager { diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 069a31a8a5..e33fd8c9bc 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -43,7 +43,7 @@ #include "../config/Config.h" #include "../localisation/localisation.h" #include "../object.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../platform/platform.h" #include "../util/sawyercoding.h" #include "../util/util.h" diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 0261663555..13fa5e7fd9 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -25,7 +25,7 @@ #include "../Game.h" #include "../interface/chat.h" #include "../interface/console.h" -#include "../intro.h" +#include "../Intro.h" #include "../localisation/language.h" #include "../localisation/format_codes.h" diff --git a/src/openrct2/paint/tile_element/path.c b/src/openrct2/paint/tile_element/path.c index 43d0b3a526..a85c374ada 100644 --- a/src/openrct2/paint/tile_element/path.c +++ b/src/openrct2/paint/tile_element/path.c @@ -18,7 +18,7 @@ #include "../../Game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" -#include "../../object_list.h" +#include "../../ObjectList.h" #include "../../peep/Staff.h" #include "../../ride/Track.h" #include "../../ride/track_paint.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index ea3775be8d..77b67a6c48 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -25,7 +25,7 @@ #include "../core/Math.hpp" #include "../core/Util.hpp" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../interface/window.h" #include "../localisation/localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 71b9f9b512..6f5a7f7226 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -19,14 +19,14 @@ #include "../Context.h" #include "../config/Config.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../interface/viewport.h" #include "../localisation/date.h" #include "../localisation/localisation.h" #include "../localisation/string_ids.h" #include "../management/Finance.h" #include "../network/network.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../paint/tile_element/tile_element.h" #include "../scenario/scenario.h" #include "../util/util.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 2ebc049653..85c13fb1c5 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -33,7 +33,7 @@ #include "../ride/Station.h" #include "../scenario/ScenarioSources.h" #include "Tables.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../audio/audio.h" #include "../cheats.h" diff --git a/src/openrct2/rct2/S6Exporter.h b/src/openrct2/rct2/S6Exporter.h index 457726f815..3767f5f5d9 100644 --- a/src/openrct2/rct2/S6Exporter.h +++ b/src/openrct2/rct2/S6Exporter.h @@ -24,7 +24,7 @@ #include "../common.h" #include "../scenario/scenario.h" -#include "../object_list.h" +#include "../ObjectList.h" interface IStream; struct ObjectRepositoryItem; diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 36463790a7..9bcfde4a42 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -24,7 +24,7 @@ #include "../Context.h" #include "../Editor.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../interface/window.h" #include "../localisation/date.h" #include "../localisation/localisation.h" @@ -32,7 +32,7 @@ #include "../management/Marketing.h" #include "../management/NewsItem.h" #include "../network/network.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../OpenRCT2.h" #include "../peep/Peep.h" #include "../peep/Staff.h" diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c index 9456f17523..5afb009f2f 100644 --- a/src/openrct2/scenario/scenario.c +++ b/src/openrct2/scenario/scenario.c @@ -29,7 +29,7 @@ #include "../management/Research.h" #include "../network/network.h" #include "../object.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../peep/Staff.h" diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index c7d5b90497..6532d6af50 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -29,7 +29,7 @@ #include "../audio/audio.h" #include "../drawing/drawing.h" #include "../Game.h" -#include "../input.h" +#include "../Input.h" #include "../interface/viewport.h" #include "../interface/window.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/Dropdown.cpp b/src/openrct2/windows/Dropdown.cpp index ba7ff39832..c8558ea019 100644 --- a/src/openrct2/windows/Dropdown.cpp +++ b/src/openrct2/windows/Dropdown.cpp @@ -18,7 +18,7 @@ #include "../core/Util.hpp" #include "../core/Math.hpp" -#include "../input.h" +#include "../Input.h" #include "../interface/widget.h" #include "../localisation/localisation.h" #include "../sprites.h" diff --git a/src/openrct2/windows/Tooltip.cpp b/src/openrct2/windows/Tooltip.cpp index 786ac343b6..1ca22b2100 100644 --- a/src/openrct2/windows/Tooltip.cpp +++ b/src/openrct2/windows/Tooltip.cpp @@ -18,7 +18,7 @@ #include "../core/Math.hpp" #include "../localisation/localisation.h" -#include "../input.h" +#include "../Input.h" #include "../interface/widget.h" #include "tooltip.h" diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c index a3d1afdf1c..b89d661c45 100644 --- a/src/openrct2/windows/_legacy.c +++ b/src/openrct2/windows/_legacy.c @@ -20,7 +20,7 @@ #include "Intent.h" #include "../Context.h" #include "../audio/audio.h" -#include "../input.h" +#include "../Input.h" #include "../Game.h" #include "../interface/viewport.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 4cd1f122bc..a483156cf2 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -18,7 +18,7 @@ #include "../Game.h" #include "../localisation/localisation.h" #include "../network/network.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../OpenRCT2.h" #include "../ride/Station.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c index 4136da5db6..9b58f53a07 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/scenery.c @@ -19,7 +19,7 @@ #include "../Game.h" #include "../localisation/localisation.h" #include "../network/network.h" -#include "../object_list.h" +#include "../ObjectList.h" #include "../scenario/scenario.h" #include "Climate.h" #include "footpath.h" diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index e4ee9d4bfa..319be66bb2 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -59,7 +59,7 @@ file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c" "${OPENRCT2_SRCPATH}/ride/TrackDataOld.cpp" "${OPENRCT2_SRCPATH}/ride/track_paint.c" "${OPENRCT2_SRCPATH}/rct2/addresses.c" - "${OPENRCT2_SRCPATH}/diagnostic.c" + "${OPENRCT2_SRCPATH}/Diagnostic.cpp" "${OPENRCT2_SRCPATH}/rct2/hook.c" "${OPENRCT2_SRCPATH}/paint/tile_element/tile_element.c" "${OPENRCT2_SRCPATH}/paint/paint_helpers.c") diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt index 2a52ef91e5..75cbdd183e 100644 --- a/test/tests/CMakeLists.txt +++ b/test/tests/CMakeLists.txt @@ -76,7 +76,7 @@ set(COMMON_TEST_SOURCES "${ROOT_DIR}/src/openrct2/core/Diagnostics.cpp" "${ROOT_DIR}/src/openrct2/core/Guard.cpp" "${ROOT_DIR}/src/openrct2/core/String.cpp" - "${ROOT_DIR}/src/openrct2/diagnostic.c" + "${ROOT_DIR}/src/openrct2/Diagnostic.cpp" "${ROOT_DIR}/src/openrct2/localisation/format_codes.c" "${ROOT_DIR}/src/openrct2/localisation/utf8.c" "${ROOT_DIR}/src/openrct2/util/util.c"