diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 9ed7c05ee4..3a55b452fb 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -24,6 +24,9 @@ 4C31B2E41FB6115600F6A38A /* MapGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C31B2E21FB6115600F6A38A /* MapGen.cpp */; }; 4C4C1E981F58226500560300 /* TrackDesign.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4C1E971F58226500560300 /* TrackDesign.cpp */; }; 4C5DFF421FAC69D200CB093A /* Date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C5DFF401FAC69D200CB093A /* Date.cpp */; }; + 4C6A668E1FE14C3A00694CB6 /* SawyerCoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A668A1FE14C3A00694CB6 /* SawyerCoding.cpp */; }; + 4C6A668F1FE14C3A00694CB6 /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A668C1FE14C3A00694CB6 /* Util.cpp */; }; + 4C6A66921FE14C9500694CB6 /* Cheats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66901FE14C9500694CB6 /* Cheats.cpp */; }; 4C6AC20F1F9E1693004324AA /* Station.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6AC20D1F9E1693004324AA /* Station.cpp */; }; 4C6AC2121F9E1CB3004324AA /* CableLift.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6AC2101F9E1CB3004324AA /* CableLift.cpp */; }; 4C729BC01FC2E1BE001DFF2F /* LargeScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BBE1FC2E1BE001DFF2F /* LargeScenery.cpp */; }; @@ -272,7 +275,6 @@ F76C85B01EC4E88300FA49E2 /* Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83571EC4E7CC00FA49E2 /* Audio.cpp */; }; F76C85B41EC4E88300FA49E2 /* AudioMixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C835B1EC4E7CC00FA49E2 /* AudioMixer.cpp */; }; F76C85B71EC4E88300FA49E2 /* NullAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C835E1EC4E7CC00FA49E2 /* NullAudioSource.cpp */; }; - F76C85B81EC4E88300FA49E2 /* cheats.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C835F1EC4E7CC00FA49E2 /* cheats.c */; }; F76C85BA1EC4E88300FA49E2 /* CommandLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83631EC4E7CC00FA49E2 /* CommandLine.cpp */; }; F76C85BC1EC4E88300FA49E2 /* ConvertCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83651EC4E7CC00FA49E2 /* ConvertCommand.cpp */; }; F76C85BD1EC4E88300FA49E2 /* RootCommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83661EC4E7CC00FA49E2 /* RootCommands.cpp */; }; @@ -407,8 +409,6 @@ F76C873A1EC4E88400FA49E2 /* TitleSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84FE1EC4E7CD00FA49E2 /* TitleSequence.cpp */; }; F76C873C1EC4E88400FA49E2 /* TitleSequenceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85001EC4E7CD00FA49E2 /* TitleSequenceManager.cpp */; }; F76C873E1EC4E88400FA49E2 /* TitleSequencePlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85021EC4E7CD00FA49E2 /* TitleSequencePlayer.cpp */; }; - F76C87411EC4E88400FA49E2 /* sawyercoding.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85071EC4E7CD00FA49E2 /* sawyercoding.c */; }; - F76C87431EC4E88400FA49E2 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85091EC4E7CD00FA49E2 /* util.c */; }; F76C87451EC4E88400FA49E2 /* Version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C850B1EC4E7CD00FA49E2 /* Version.cpp */; }; F76C87511EC4E88400FA49E2 /* (null) in Sources */ = {isa = PBXBuildFile; }; F76C87521EC4E88400FA49E2 /* (null) in Sources */ = {isa = PBXBuildFile; }; @@ -602,6 +602,12 @@ 4C4C1E991F5832AA00560300 /* TrackDesign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackDesign.h; sourceTree = ""; }; 4C5DFF401FAC69D200CB093A /* Date.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Date.cpp; sourceTree = ""; }; 4C5DFF411FAC69D200CB093A /* Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Date.h; sourceTree = ""; }; + 4C6A668A1FE14C3A00694CB6 /* SawyerCoding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SawyerCoding.cpp; sourceTree = ""; }; + 4C6A668B1FE14C3A00694CB6 /* SawyerCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SawyerCoding.h; sourceTree = ""; }; + 4C6A668C1FE14C3A00694CB6 /* Util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Util.cpp; sourceTree = ""; }; + 4C6A668D1FE14C3A00694CB6 /* Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Util.h; sourceTree = ""; }; + 4C6A66901FE14C9500694CB6 /* Cheats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cheats.cpp; sourceTree = ""; }; + 4C6A66911FE14C9500694CB6 /* Cheats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cheats.h; sourceTree = ""; }; 4C6AC20D1F9E1693004324AA /* Station.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Station.cpp; sourceTree = ""; }; 4C6AC20E1F9E1693004324AA /* Station.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Station.h; sourceTree = ""; }; 4C6AC2101F9E1CB3004324AA /* CableLift.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CableLift.cpp; sourceTree = ""; }; @@ -1049,8 +1055,6 @@ F76C835C1EC4E7CC00FA49E2 /* AudioMixer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioMixer.h; sourceTree = ""; }; F76C835D1EC4E7CC00FA49E2 /* AudioSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSource.h; sourceTree = ""; }; F76C835E1EC4E7CC00FA49E2 /* NullAudioSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NullAudioSource.cpp; sourceTree = ""; }; - F76C835F1EC4E7CC00FA49E2 /* cheats.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cheats.c; sourceTree = ""; }; - F76C83601EC4E7CC00FA49E2 /* cheats.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cheats.h; sourceTree = ""; }; F76C83631EC4E7CC00FA49E2 /* CommandLine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLine.cpp; sourceTree = ""; }; F76C83641EC4E7CC00FA49E2 /* CommandLine.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CommandLine.hpp; sourceTree = ""; }; F76C83651EC4E7CC00FA49E2 /* ConvertCommand.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ConvertCommand.cpp; sourceTree = ""; }; @@ -1312,10 +1316,6 @@ F76C85021EC4E7CD00FA49E2 /* TitleSequencePlayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TitleSequencePlayer.cpp; sourceTree = ""; }; F76C85031EC4E7CD00FA49E2 /* TitleSequencePlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TitleSequencePlayer.h; sourceTree = ""; }; F76C85051EC4E7CD00FA49E2 /* UiContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UiContext.h; sourceTree = ""; }; - F76C85071EC4E7CD00FA49E2 /* sawyercoding.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sawyercoding.c; sourceTree = ""; }; - F76C85081EC4E7CD00FA49E2 /* sawyercoding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sawyercoding.h; sourceTree = ""; }; - F76C85091EC4E7CD00FA49E2 /* util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = ""; }; - F76C850A1EC4E7CD00FA49E2 /* util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; F76C850B1EC4E7CD00FA49E2 /* Version.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Version.cpp; sourceTree = ""; }; F76C850C1EC4E7CD00FA49E2 /* Version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Version.h; sourceTree = ""; }; F76C85171EC4E7CD00FA49E2 /* dropdown.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dropdown.h; sourceTree = ""; }; @@ -1820,8 +1820,8 @@ F76C85061EC4E7CD00FA49E2 /* util */, F76C850D1EC4E7CD00FA49E2 /* windows */, F76C855B1EC4E7CD00FA49E2 /* world */, - F76C835F1EC4E7CC00FA49E2 /* cheats.c */, - F76C83601EC4E7CC00FA49E2 /* cheats.h */, + 4C6A66901FE14C9500694CB6 /* Cheats.cpp */, + 4C6A66911FE14C9500694CB6 /* Cheats.h */, 4CC4B8E21FE00C4100660D62 /* CmdlineSprite.cpp */, 4CC4B8E31FE00C4200660D62 /* CmdlineSprite.h */, F76C836C1EC4E7CC00FA49E2 /* common.h */, @@ -2453,10 +2453,10 @@ F76C85061EC4E7CD00FA49E2 /* util */ = { isa = PBXGroup; children = ( - F76C85071EC4E7CD00FA49E2 /* sawyercoding.c */, - F76C85081EC4E7CD00FA49E2 /* sawyercoding.h */, - F76C85091EC4E7CD00FA49E2 /* util.c */, - F76C850A1EC4E7CD00FA49E2 /* util.h */, + 4C6A668A1FE14C3A00694CB6 /* SawyerCoding.cpp */, + 4C6A668B1FE14C3A00694CB6 /* SawyerCoding.h */, + 4C6A668C1FE14C3A00694CB6 /* Util.cpp */, + 4C6A668D1FE14C3A00694CB6 /* Util.h */, ); path = util; sourceTree = ""; @@ -3120,6 +3120,7 @@ C666EE6B1F37ACB10061AA04 /* About.cpp in Sources */, C666ED771F33DBB20061AA04 /* ShortcutKeys.cpp in Sources */, 4C93F1AA1F8B748900A9330D /* SubmarineRide.cpp in Sources */, + 4C6A668F1FE14C3A00694CB6 /* Util.cpp in Sources */, 4CE462451FD161360001CD98 /* Platform.Android.cpp in Sources */, C666EE6C1F37ACB10061AA04 /* Changelog.cpp in Sources */, 4C93F1441F8B744400A9330D /* InvertedRollerCoaster.cpp in Sources */, @@ -3230,6 +3231,7 @@ 4C93F14F1F8B744400A9330D /* ReverserRollerCoaster.cpp in Sources */, 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */, C654DF301F69C0430040F43D /* Finances.cpp in Sources */, + 4C6A668E1FE14C3A00694CB6 /* SawyerCoding.cpp in Sources */, 4C6AC2121F9E1CB3004324AA /* CableLift.cpp in Sources */, 4C93F19D1F8B748200A9330D /* SuspendedMonorail.cpp in Sources */, C666EE751F37ACB10061AA04 /* NewsOptions.cpp in Sources */, @@ -3237,6 +3239,7 @@ 4C93F1AD1F8CD9F000A9330D /* Input.cpp in Sources */, 4C93F1BE1F8E185600A9330D /* Research.cpp in Sources */, C666EE761F37ACB10061AA04 /* Options.cpp in Sources */, + 4C6A66921FE14C9500694CB6 /* Cheats.cpp in Sources */, C666EE6E1F37ACB10061AA04 /* CustomCurrency.cpp in Sources */, 4C93F1711F8B745700A9330D /* HauntedHouse.cpp in Sources */, F76C88841EC5324E00FA49E2 /* OpenGLDrawingEngine.cpp in Sources */, @@ -3296,7 +3299,6 @@ F76C85B01EC4E88300FA49E2 /* Audio.cpp in Sources */, F76C85B41EC4E88300FA49E2 /* AudioMixer.cpp in Sources */, F76C85B71EC4E88300FA49E2 /* NullAudioSource.cpp in Sources */, - F76C85B81EC4E88300FA49E2 /* cheats.c in Sources */, F76C85BA1EC4E88300FA49E2 /* CommandLine.cpp in Sources */, F76C85BC1EC4E88300FA49E2 /* ConvertCommand.cpp in Sources */, F76C85BD1EC4E88300FA49E2 /* RootCommands.cpp in Sources */, @@ -3439,8 +3441,6 @@ F76C873A1EC4E88400FA49E2 /* TitleSequence.cpp in Sources */, F76C873C1EC4E88400FA49E2 /* TitleSequenceManager.cpp in Sources */, F76C873E1EC4E88400FA49E2 /* TitleSequencePlayer.cpp in Sources */, - F76C87411EC4E88400FA49E2 /* sawyercoding.c in Sources */, - F76C87431EC4E88400FA49E2 /* util.c in Sources */, F76C87451EC4E88400FA49E2 /* Version.cpp in Sources */, F76C87511EC4E88400FA49E2 /* (null) in Sources */, F76C87521EC4E88400FA49E2 /* (null) in Sources */, diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index bde9416ac8..d0de23af73 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "KeyboardShortcuts.h" diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index d03673b673..46fca28ef5 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include enum { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 1021f06145..2b2f3b7f06 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index e714409738..6c9a35fe8b 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index a67120c389..00795ae743 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -27,7 +27,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 9a0541f191..6fa6bbbeb2 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 957ecc9a89..8f798e527c 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #pragma region Widgets diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 8815961348..c92a79978c 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 3645c59ebf..f6f5c49710 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index fa42ebdfce..c222470eba 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include enum { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index c46899582e..4053ae11bb 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index a9a4e11364..eede1ef248 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -20,7 +20,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 e56d55ab0d..f64de281e4 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 0b553d2761..c5c4b1085c 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 4fb1ed55cd..5a674aba66 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include static char _password[33]; diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 29884ea9d9..e02ede71d8 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #define AVAILABILITY_STRING_SIZE 256 diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 5bdbdfb177..5363ab7d0f 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include enum WINDOW_OPTIONS_PAGE { diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 6c3d4e4f58..ccc80973fe 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -28,7 +28,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 085afc0e60..ead246a1ff 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include enum WINDOW_PLAYER_PAGE { diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 9002c50ba9..dc9cee6d62 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index c9ad7052a9..76c2d795d9 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 7d99e047f0..938e964f91 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index f22c185355..2482334d70 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include static char _port[7]; static char _name[65]; diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 48bfc367a5..9565911968 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 9ddc8ae9be..f6df561f71 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #define WW 250 #define WH 90 diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index d8ec5b5661..3874913a71 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include enum { WINDOW_THEMES_TAB_SETTINGS, diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 61fe3bff36..dcaa568592 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include typedef struct TITLE_COMMAND_ORDER { diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 8975dc490e..ff1eafefe8 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include enum WINDOW_TITLE_EDITOR_TAB { diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index 49a02b2355..2f2aaa8985 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define INITIAL_NUM_UNLOCKED_SCENARIOS 5 diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 850f5dc7d5..d27b5f4e33 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 71eb763bc8..2a22bc9d44 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index f2343578d9..72dab83bda 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2/cheats.c b/src/openrct2/Cheats.cpp similarity index 99% rename from src/openrct2/cheats.c rename to src/openrct2/Cheats.cpp index 416b380d74..2bf42f67f1 100644 --- a/src/openrct2/cheats.c +++ b/src/openrct2/Cheats.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "cheats.h" +#include "Cheats.h" #include "config/Config.h" #include "Editor.h" #include "Game.h" @@ -23,7 +23,7 @@ #include "management/Finance.h" #include "network/network.h" #include "ride/Station.h" -#include "util/util.h" +#include "util/Util.h" #include "world/Climate.h" #include "world/footpath.h" #include "world/map.h" diff --git a/src/openrct2/cheats.h b/src/openrct2/Cheats.h similarity index 100% rename from src/openrct2/cheats.h rename to src/openrct2/Cheats.h diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp index 0ffba4f236..b616964f88 100644 --- a/src/openrct2/CmdlineSprite.cpp +++ b/src/openrct2/CmdlineSprite.cpp @@ -23,7 +23,7 @@ #include "localisation/localisation.h" #include "OpenRCT2.h" #include "platform/platform.h" -#include "util/util.h" +#include "util/Util.h" #include "png.h" #define MODE_DEFAULT 0 diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index d20f1b8403..5ea2ad2bd8 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -66,7 +66,7 @@ #include "ObjectList.h" #include "platform/platform.h" #include "rct1.h" -#include "util/util.h" +#include "util/Util.h" using namespace OpenRCT2; using namespace OpenRCT2::Audio; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index a52708b488..83fbfbac62 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -31,7 +31,7 @@ #include "ObjectList.h" #include "peep/Staff.h" #include "rct1.h" -#include "util/util.h" +#include "util/Util.h" #include "windows/Intent.h" #include "world/Climate.h" diff --git a/src/openrct2/FileClassifier.cpp b/src/openrct2/FileClassifier.cpp index 39a6f74658..982d774084 100644 --- a/src/openrct2/FileClassifier.cpp +++ b/src/openrct2/FileClassifier.cpp @@ -20,7 +20,7 @@ #include "rct12/SawyerChunkReader.h" #include "scenario/scenario.h" -#include "util/sawyercoding.h" +#include "util/SawyerCoding.h" static bool TryClassifyAsS6(IStream * stream, ClassifiedFileInfo * result); static bool TryClassifyAsS4(IStream * stream, ClassifiedFileInfo * result); diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index d38b026f87..d6680433fd 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "audio/audio.h" -#include "cheats.h" +#include "Cheats.h" #include "config/Config.h" #include "Context.h" #include "core/Math.hpp" @@ -49,8 +49,8 @@ #include "scenario/scenario.h" #include "title/TitleScreen.h" #include "title/TitleSequencePlayer.h" -#include "util/sawyercoding.h" -#include "util/util.h" +#include "util/SawyerCoding.h" +#include "util/Util.h" #include "windows/Intent.h" #include "windows/tooltip.h" #include "world/banner.h" diff --git a/src/openrct2/ObjectList.cpp b/src/openrct2/ObjectList.cpp index 4146ab891c..1f047a03fc 100644 --- a/src/openrct2/ObjectList.cpp +++ b/src/openrct2/ObjectList.cpp @@ -20,8 +20,8 @@ #include "object.h" #include "ObjectList.h" #include "object/ObjectRepository.h" -#include "util/sawyercoding.h" -#include "util/util.h" +#include "util/SawyerCoding.h" +#include "util/Util.h" // 98DA00 sint32 object_entry_group_counts[] = { diff --git a/src/openrct2/actions/GuestSetNameAction.hpp b/src/openrct2/actions/GuestSetNameAction.hpp index e56bfc3850..127697c2ee 100644 --- a/src/openrct2/actions/GuestSetNameAction.hpp +++ b/src/openrct2/actions/GuestSetNameAction.hpp @@ -20,7 +20,7 @@ #include "../localisation/string_ids.h" #include "GameAction.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../interface/window.h" #include "../localisation/localisation.h" #include "../world/park.h" diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index 530e487b99..ce13a0e979 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -21,7 +21,7 @@ #include "../OpenRCT2.h" #include "GameAction.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../world/entrance.h" #include "../world/park.h" #include "../world/footpath.h" diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index b7e9308932..718e60a07f 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -22,7 +22,7 @@ #include "GameAction.h" #include "../localisation/date.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../interface/window.h" #include "../world/park.h" #include "../rct1.h" diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index 2d5295c63e..f536d4dcfa 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../cheats.h" +#include "../Cheats.h" #include "../Context.h" #include "../core/MemoryStream.h" #include "../interface/window.h" diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp index 4736caf219..62eed09807 100644 --- a/src/openrct2/actions/RideSetName.hpp +++ b/src/openrct2/actions/RideSetName.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../cheats.h" +#include "../Cheats.h" #include "../Context.h" #include "../core/MemoryStream.h" #include "../interface/window.h" diff --git a/src/openrct2/actions/RideSetStatus.hpp b/src/openrct2/actions/RideSetStatus.hpp index 29933af5c3..babd8fbb27 100644 --- a/src/openrct2/actions/RideSetStatus.hpp +++ b/src/openrct2/actions/RideSetStatus.hpp @@ -20,7 +20,7 @@ #include "../localisation/string_ids.h" #include "GameAction.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../interface/window.h" #include "../world/park.h" #include "../ride/ride.h" diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.hpp b/src/openrct2/actions/SetParkEntranceFeeAction.hpp index 223048b40b..7d6b32bedb 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.hpp +++ b/src/openrct2/actions/SetParkEntranceFeeAction.hpp @@ -20,7 +20,7 @@ #include "../localisation/string_ids.h" #include "GameAction.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../interface/window.h" #include "../world/park.h" diff --git a/src/openrct2/actions/StaffSetNameAction.hpp b/src/openrct2/actions/StaffSetNameAction.hpp index 6ac3b17a2b..3f9bc70d70 100644 --- a/src/openrct2/actions/StaffSetNameAction.hpp +++ b/src/openrct2/actions/StaffSetNameAction.hpp @@ -20,7 +20,7 @@ #include "../localisation/string_ids.h" #include "GameAction.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../peep/Staff.h" #include "../interface/window.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 56a73b391a..71ff2b1d62 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -32,7 +32,7 @@ #include "../Intro.h" #include "../localisation/language.h" #include "../ride/ride.h" -#include "../util/util.h" +#include "../util/Util.h" using namespace OpenRCT2::Audio; diff --git a/src/openrct2/core/File.cpp b/src/openrct2/core/File.cpp index 7d9dd44fec..03bde506ca 100644 --- a/src/openrct2/core/File.cpp +++ b/src/openrct2/core/File.cpp @@ -26,7 +26,7 @@ #include "String.hpp" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" namespace File { diff --git a/src/openrct2/core/Path.cpp b/src/openrct2/core/Path.cpp index a5849fc64d..ceb756bc66 100644 --- a/src/openrct2/core/Path.cpp +++ b/src/openrct2/core/Path.cpp @@ -20,7 +20,7 @@ #include "../platform/platform.h" #include "../localisation/localisation.h" -#include "../util/util.h" +#include "../util/Util.h" #include "File.h" #include "Math.hpp" diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 36378f96cb..9dcd88ca38 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -19,7 +19,7 @@ #include #include "../localisation/localisation.h" -#include "../util/util.h" +#include "../util/Util.h" #include "Math.hpp" #include "Memory.hpp" diff --git a/src/openrct2/core/StringReader.hpp b/src/openrct2/core/StringReader.hpp index 25db684067..ebf4786a5e 100644 --- a/src/openrct2/core/StringReader.hpp +++ b/src/openrct2/core/StringReader.hpp @@ -18,7 +18,7 @@ #include "../common.h" #include "../localisation/localisation.h" -#include "../util/util.h" +#include "../util/Util.h" #include "String.hpp" interface IStringReader diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Sprite.cpp index b14cf0ba0b..31bc07c53f 100644 --- a/src/openrct2/drawing/Sprite.cpp +++ b/src/openrct2/drawing/Sprite.cpp @@ -27,7 +27,7 @@ #include "../ui/UiContext.h" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "drawing.h" using namespace OpenRCT2; diff --git a/src/openrct2/drawing/string.c b/src/openrct2/drawing/string.c index 2559506bc1..e3ff803f91 100644 --- a/src/openrct2/drawing/string.c +++ b/src/openrct2/drawing/string.c @@ -20,7 +20,7 @@ #include "../localisation/localisation.h" #include "../platform/platform.h" #include "../sprites.h" -#include "../util/util.h" +#include "../util/Util.h" #include "ttf.h" enum { diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 77dd6d9984..c4b69a1577 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -28,7 +28,7 @@ #include "../Intro.h" #include "../localisation/localisation.h" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/Climate.h" #include "viewport.h" diff --git a/src/openrct2/interface/chat.c b/src/openrct2/interface/chat.c index 846ce3dde9..b2b1bbce19 100644 --- a/src/openrct2/interface/chat.c +++ b/src/openrct2/interface/chat.c @@ -21,7 +21,7 @@ #include "../localisation/localisation.h" #include "../network/network.h" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "chat.h" bool gChatOpen = false; diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index a4de8260d0..a6d13dedcb 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -38,8 +38,8 @@ #include "../platform/platform.h" #include "../ride/ride.h" #include "../ride/ride_data.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../Version.h" #include "../windows/Intent.h" #include "../world/Climate.h" diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 3b32c46b46..7bad199627 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../cheats.h" +#include "../Cheats.h" #include "../Editor.h" #include "../Game.h" #include "../Input.h" diff --git a/src/openrct2/interface/widget.c b/src/openrct2/interface/widget.c index de067d7520..40512bc2e3 100644 --- a/src/openrct2/interface/widget.c +++ b/src/openrct2/interface/widget.c @@ -21,7 +21,7 @@ #include "window.h" #include "../platform/platform.h" #include "../localisation/localisation.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../Context.h" #include diff --git a/src/openrct2/localisation/currency.c b/src/openrct2/localisation/currency.c index 0a8c2f6af3..2e07a0b5df 100644 --- a/src/openrct2/localisation/currency.c +++ b/src/openrct2/localisation/currency.c @@ -15,7 +15,7 @@ #pragma endregion #include "../config/Config.h" -#include "../util/util.h" +#include "../util/Util.h" #include "currency.h" #include "string_ids.h" diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/localisation.c index 9dd2fb1190..1898d3ff23 100644 --- a/src/openrct2/localisation/localisation.c +++ b/src/openrct2/localisation/localisation.c @@ -32,7 +32,7 @@ #include "../config/Config.h" #include "../Game.h" -#include "../util/util.h" +#include "../util/Util.h" #include "date.h" #include "localisation.h" #include "../management/Marketing.h" diff --git a/src/openrct2/localisation/user.c b/src/openrct2/localisation/user.c index 881579daba..a13cf2fa7c 100644 --- a/src/openrct2/localisation/user.c +++ b/src/openrct2/localisation/user.c @@ -16,7 +16,7 @@ #include "../Game.h" #include "../ride/ride.h" -#include "../util/util.h" +#include "../util/Util.h" #include "localisation.h" #include "user.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 04613fc298..e13768d18b 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -21,7 +21,7 @@ #include "../peep/Peep.h" #include "../peep/Staff.h" #include "../ride/ride.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/park.h" #include "../world/sprite.h" #include "Finance.h" diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index b2c20742b7..01e8abcda7 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -21,7 +21,7 @@ #include "../localisation/localisation.h" #include "../ride/ride.h" #include "../ride/ride_data.h" -#include "../cheats.h" +#include "../Cheats.h" #include "Finance.h" #include "Marketing.h" #include "NewsItem.h" diff --git a/src/openrct2/management/Marketing.h b/src/openrct2/management/Marketing.h index 551b0e08bc..5c79de9c7c 100644 --- a/src/openrct2/management/Marketing.h +++ b/src/openrct2/management/Marketing.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../peep/Peep.h" enum { diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index b6fcc16a47..c3f39db4a1 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -23,7 +23,7 @@ #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../ride/ride.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/sprite.h" #include "NewsItem.h" diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 077b3f54f4..cad83c919b 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -22,7 +22,7 @@ #include "../ui/WindowManager.h" #include "../platform/platform.h" -#include "../util/sawyercoding.h" +#include "../util/SawyerCoding.h" #include "network.h" @@ -61,8 +61,8 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL; #include "../localisation/date.h" #include "../localisation/localisation.h" #include "../scenario/scenario.h" -#include "../util/util.h" -#include "../cheats.h" +#include "../util/Util.h" +#include "../Cheats.h" #include "NetworkAction.h" diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 9f345a03cd..c6021b69b4 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -28,7 +28,7 @@ #include "../management/Finance.h" #include "../peep/Peep.h" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/map.h" #include "../world/park.h" #include "http.h" diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp index a355788179..b80e0cd0d2 100644 --- a/src/openrct2/network/Twitch.cpp +++ b/src/openrct2/network/Twitch.cpp @@ -39,7 +39,7 @@ #include "../management/NewsItem.h" #include "../peep/Peep.h" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/sprite.h" #include "http.h" #include "twitch.h" diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index e33fd8c9bc..170683a7ac 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -45,8 +45,8 @@ #include "../object.h" #include "../ObjectList.h" #include "../platform/platform.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" using namespace OpenRCT2; diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index 37d85c3ed1..79f19135c5 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../OpenRCT2.h" -#include "../../cheats.h" +#include "../../Cheats.h" #include "../../config/Config.h" #include "../../core/Math.hpp" #include "../../core/Util.hpp" diff --git a/src/openrct2/paint/tile_element/large_scenery.c b/src/openrct2/paint/tile_element/large_scenery.c index 29c95aa6ec..6a6ca3c88f 100644 --- a/src/openrct2/paint/tile_element/large_scenery.c +++ b/src/openrct2/paint/tile_element/large_scenery.c @@ -21,7 +21,7 @@ #include "../../Game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" -#include "../../util/util.h" +#include "../../util/Util.h" #include "../../world/map.h" #include "../../world/LargeScenery.h" #include "../../world/scenery.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 5a3a935f72..807da9fee4 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -20,7 +20,7 @@ #include "../OpenRCT2.h" #include "../audio/AudioMixer.h" #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../config/Config.h" #include "../core/Math.hpp" #include "../core/Util.hpp" @@ -38,7 +38,7 @@ #include "../ride/ride_data.h" #include "../scenario/scenario.h" #include "../sprites.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/Climate.h" #include "../world/entrance.h" #include "../world/footpath.h" diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 6f5a7f7226..8bbdf83b1f 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -29,7 +29,7 @@ #include "../ObjectList.h" #include "../paint/tile_element/tile_element.h" #include "../scenario/scenario.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/entrance.h" #include "../world/footpath.h" #include "../world/scenery.h" diff --git a/src/openrct2/platform/android.c b/src/openrct2/platform/android.c index 84de7d0cc4..f457b02d98 100644 --- a/src/openrct2/platform/android.c +++ b/src/openrct2/platform/android.c @@ -19,7 +19,7 @@ #include "platform.h" #include "../config/Config.h" #include "../localisation/language.h" -#include "../util/util.h" +#include "../util/Util.h" #include #include #include diff --git a/src/openrct2/platform/linux.c b/src/openrct2/platform/linux.c index 90d951809f..f7bd5bcb56 100644 --- a/src/openrct2/platform/linux.c +++ b/src/openrct2/platform/linux.c @@ -39,7 +39,7 @@ #include "../config/Config.h" #include "../localisation/language.h" #include "../localisation/string_ids.h" -#include "../util/util.h" +#include "../util/Util.h" #include "platform.h" void platform_get_exe_path(utf8 *outPath, size_t outSize) diff --git a/src/openrct2/platform/macos.m b/src/openrct2/platform/macos.m index d5fa987273..e66dd3d78d 100644 --- a/src/openrct2/platform/macos.m +++ b/src/openrct2/platform/macos.m @@ -21,7 +21,7 @@ #include #include #include "platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../localisation/language.h" #include "../config/Config.h" diff --git a/src/openrct2/platform/posix.c b/src/openrct2/platform/posix.c index cbf852a886..5e99414438 100644 --- a/src/openrct2/platform/posix.c +++ b/src/openrct2/platform/posix.c @@ -37,7 +37,7 @@ #include "../localisation/date.h" #include "../localisation/language.h" #include "../OpenRCT2.h" -#include "../util/util.h" +#include "../util/Util.h" #include "platform.h" // The name of the mutex used to prevent multiple instances of the game from running #define SINGLE_INSTANCE_MUTEX_NAME "openrct2.lock" diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c index e1ae6501ba..30fc494d7b 100644 --- a/src/openrct2/platform/shared.c +++ b/src/openrct2/platform/shared.c @@ -33,7 +33,7 @@ #include "../Game.h" #include "../localisation/currency.h" #include "../localisation/localisation.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/Climate.h" #include "platform.h" diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c index 24c549aa38..2644ac4c2b 100644 --- a/src/openrct2/platform/windows.c +++ b/src/openrct2/platform/windows.c @@ -35,7 +35,7 @@ #include "../localisation/language.h" #include "../OpenRCT2.h" #include "../rct2.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../Version.h" #include "platform.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 85c13fb1c5..79a28bcb8f 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -36,7 +36,7 @@ #include "../ObjectList.h" #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../Editor.h" #include "../Game.h" #include "../interface/window.h" @@ -51,8 +51,8 @@ #include "../rct1.h" #include "../ride/ride_data.h" #include "../ride/Track.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../world/Climate.h" #include "../world/footpath.h" #include "../world/map_animation.h" diff --git a/src/openrct2/rct12/SawyerChunkReader.h b/src/openrct2/rct12/SawyerChunkReader.h index 79933ba13c..6c4c05c1e7 100644 --- a/src/openrct2/rct12/SawyerChunkReader.h +++ b/src/openrct2/rct12/SawyerChunkReader.h @@ -20,7 +20,7 @@ #include #include "../common.h" -#include "../util/sawyercoding.h" +#include "../util/SawyerCoding.h" #include "SawyerChunk.h" interface IStream; diff --git a/src/openrct2/rct12/SawyerChunkWriter.cpp b/src/openrct2/rct12/SawyerChunkWriter.cpp index d02d335dfd..4853b1b49f 100644 --- a/src/openrct2/rct12/SawyerChunkWriter.cpp +++ b/src/openrct2/rct12/SawyerChunkWriter.cpp @@ -19,7 +19,7 @@ #include "../core/Math.hpp" #include "SawyerChunkWriter.h" -#include "../util/sawyercoding.h" +#include "../util/SawyerCoding.h" // Maximum buffer size to store compressed data, maximum of 16 MiB constexpr size_t MAX_COMPRESSED_CHUNK_SIZE = 16 * 1024 * 1024; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index f0f071ddd8..eb35595d3e 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -44,8 +44,8 @@ #include "../ride/ride_ratings.h" #include "../ride/TrackData.h" #include "../scenario/scenario.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../world/Climate.h" #include "../world/map_animation.h" #include "../world/park.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 8af31a7a13..30b6a890f7 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -44,7 +44,7 @@ #include "../ride/ride.h" #include "../ride/ride_ratings.h" #include "../scenario/scenario.h" -#include "../util/sawyercoding.h" +#include "../util/SawyerCoding.h" #include "../world/Climate.h" #include "../world/entrance.h" #include "../world/map_animation.h" diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index e3d389090b..48e3b1944c 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -16,7 +16,7 @@ #include "../core/Math.hpp" #include "../rct12.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/sprite.h" #include "CableLift.h" #include "ride.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index d382baea1a..69ae6e6540 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../config/Config.h" #include "../Game.h" #include "../interface/viewport.h" @@ -24,8 +24,8 @@ #include "../network/network.h" #include "../platform/platform.h" #include "../rct1.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../world/footpath.h" #include "../world/map.h" #include "../world/map_animation.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 054e3be15e..da84339373 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -24,14 +24,14 @@ #include "TrackDesignRepository.h" #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../Game.h" #include "../localisation/localisation.h" #include "../localisation/string_ids.h" #include "../management/Finance.h" #include "../rct1.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../world/footpath.h" #include "../world/scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 2dfc2ee75e..aab5e07943 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -29,7 +29,7 @@ #include "../platform/platform.h" #include "../rct12.h" #include "../scenario/scenario.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../world/map_animation.h" #include "../world/scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 9bcfde4a42..dd827919ea 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -18,7 +18,7 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../common.h" #include "../config/Config.h" #include "../Context.h" @@ -38,7 +38,7 @@ #include "../peep/Staff.h" #include "../rct1.h" #include "../scenario/scenario.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/banner.h" #include "../world/Climate.h" diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index c244bd7f7c..5e3eaa803b 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../cheats.h" +#include "../Cheats.h" #include "../interface/window.h" #include "../localisation/date.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index ce7880209f..aa503ea45a 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -21,8 +21,8 @@ #include "../localisation/localisation.h" #include "../localisation/string_ids.h" #include "../interface/viewport.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/LargeScenery.h" #include "../world/scenery.h" diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c index 5afb009f2f..bca6a17129 100644 --- a/src/openrct2/scenario/scenario.c +++ b/src/openrct2/scenario/scenario.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../config/Config.h" #include "../FileClassifier.h" #include "../Game.h" @@ -36,8 +36,8 @@ #include "../platform/platform.h" #include "../rct1.h" #include "../ride/ride.h" -#include "../util/sawyercoding.h" -#include "../util/util.h" +#include "../util/SawyerCoding.h" +#include "../util/Util.h" #include "../world/Climate.h" #include "../world/map.h" #include "../world/park.h" diff --git a/src/openrct2/util/sawyercoding.c b/src/openrct2/util/SawyerCoding.cpp similarity index 95% rename from src/openrct2/util/sawyercoding.c rename to src/openrct2/util/SawyerCoding.cpp index e44c09ea8c..4f81e743f8 100644 --- a/src/openrct2/util/sawyercoding.c +++ b/src/openrct2/util/SawyerCoding.cpp @@ -14,10 +14,11 @@ *****************************************************************************/ #pragma endregion +#include "../core/Math.hpp" #include "../platform/platform.h" -#include "sawyercoding.h" #include "../scenario/scenario.h" -#include "util.h" +#include "SawyerCoding.h" +#include "Util.h" static size_t decode_chunk_rle(const uint8* src_buffer, uint8* dst_buffer, size_t length); static size_t decode_chunk_rle_with_size(const uint8* src_buffer, uint8* dst_buffer, size_t length, size_t dstSize); @@ -60,7 +61,7 @@ size_t sawyercoding_write_chunk_buffer(uint8 *dst_file, const uint8* buffer, saw //fwrite(buffer, 1, chunkHeader.length, file); break; case CHUNK_ENCODING_RLE: - encode_buffer = malloc(0x600000); + encode_buffer = (uint8 *)malloc(0x600000); chunkHeader.length = (uint32)encode_chunk_rle(buffer, encode_buffer, chunkHeader.length); memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); dst_file += sizeof(sawyercoding_chunk_header); @@ -69,8 +70,8 @@ size_t sawyercoding_write_chunk_buffer(uint8 *dst_file, const uint8* buffer, saw free(encode_buffer); break; case CHUNK_ENCODING_RLECOMPRESSED: - encode_buffer = malloc(chunkHeader.length * 2); - encode_buffer2 = malloc(0x600000); + encode_buffer = (uint8 *)malloc(chunkHeader.length * 2); + encode_buffer2 = (uint8 *)malloc(0x600000); chunkHeader.length = (uint32)encode_chunk_repeat(buffer, encode_buffer, chunkHeader.length); chunkHeader.length = (uint32)encode_chunk_rle(encode_buffer, encode_buffer2, chunkHeader.length); memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); @@ -81,7 +82,7 @@ size_t sawyercoding_write_chunk_buffer(uint8 *dst_file, const uint8* buffer, saw free(encode_buffer); break; case CHUNK_ENCODING_ROTATE: - encode_buffer = malloc(chunkHeader.length); + encode_buffer = (uint8 *)malloc(chunkHeader.length); memcpy(encode_buffer, buffer, chunkHeader.length); encode_chunk_rotate(encode_buffer, chunkHeader.length); memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); @@ -108,10 +109,10 @@ size_t sawyercoding_decode_sc4(const uint8 *src, uint8 *dst, size_t length, size size_t decodedLength = decode_chunk_rle_with_size(src, dst, length - 4, bufferLength); // Decode - for (size_t i = 0x60018; i <= min(decodedLength - 1, 0x1F8353); i++) + for (size_t i = 0x60018; i <= Math::Min(decodedLength - 1, 0x1F8353ul); i++) dst[i] = dst[i] ^ 0x9C; - for (size_t i = 0x60018; i <= min(decodedLength - 1, 0x1F8350); i += 4) { + for (size_t i = 0x60018; i <= Math::Min(decodedLength - 1, 0x1F8350ul); i += 4) { dst[i + 1] = ror8(dst[i + 1], 3); uint32 *code = (uint32*)&dst[i]; @@ -314,7 +315,7 @@ static size_t encode_chunk_repeat(const uint8 *src_buffer, uint8 *dst_buffer, si size_t bestRepeatCount = 0; for (size_t repeatIndex = searchIndex; repeatIndex <= searchEnd; repeatIndex++) { size_t repeatCount = 0; - size_t maxRepeatCount = min(min(7, searchEnd - repeatIndex), length - i - 1); + size_t maxRepeatCount = Math::Min(Math::Min(7ul, searchEnd - repeatIndex), length - i - 1); // maxRepeatCount should not exceed length assert(repeatIndex + maxRepeatCount < length); assert(i + maxRepeatCount < length); diff --git a/src/openrct2/util/sawyercoding.h b/src/openrct2/util/SawyerCoding.h similarity index 100% rename from src/openrct2/util/sawyercoding.h rename to src/openrct2/util/SawyerCoding.h diff --git a/src/openrct2/util/util.c b/src/openrct2/util/Util.cpp similarity index 97% rename from src/openrct2/util/util.c rename to src/openrct2/util/Util.cpp index 78ce4f8f30..aef6d72944 100644 --- a/src/openrct2/util/util.c +++ b/src/openrct2/util/Util.cpp @@ -18,11 +18,12 @@ #include #include "../common.h" #include "../core/Guard.hpp" +#include "../core/Math.hpp" #include "../interface/window.h" #include "../localisation/localisation.h" #include "../platform/platform.h" #include "../title/TitleScreen.h" -#include "util.h" +#include "Util.h" #include "zlib.h" sint32 squaredmetres_to_squaredfeet(sint32 squaredMetres) @@ -452,16 +453,16 @@ uint8 *util_zlib_inflate(uint8 *data, size_t data_in_size, size_t *data_out_size // Try to guesstimate the size needed for output data by applying the // same ratio it would take to compress data_in_size. out_size = (uLong)data_in_size * (uLong)data_in_size / compressBound((uLong)data_in_size); - out_size = min(MAX_ZLIB_REALLOC, out_size); + out_size = Math::Min((uLongf)MAX_ZLIB_REALLOC, out_size); } uLongf buffer_size = out_size; - uint8 *buffer = malloc(buffer_size); + uint8 *buffer = (uint8 *)malloc(buffer_size); do { if (ret == Z_BUF_ERROR) { buffer_size *= 2; out_size = buffer_size; - buffer = realloc(buffer, buffer_size); + buffer = (uint8 *)realloc(buffer, buffer_size); } else if (ret == Z_STREAM_ERROR) { log_error("Your build is shipped with broken zlib. Please use the official build."); free(buffer); @@ -473,7 +474,7 @@ uint8 *util_zlib_inflate(uint8 *data, size_t data_in_size, size_t *data_out_size } ret = uncompress(buffer, &out_size, data, (uLong)data_in_size); } while (ret != Z_OK); - buffer = realloc(buffer, out_size); + buffer = (uint8 *)realloc(buffer, out_size); *data_out_size = out_size; return buffer; } @@ -491,13 +492,13 @@ uint8 *util_zlib_deflate(const uint8 *data, size_t data_in_size, size_t *data_ou sint32 ret = Z_OK; uLongf out_size = (uLongf)*data_out_size; uLong buffer_size = compressBound((uLong)data_in_size); - uint8 *buffer = malloc(buffer_size); + uint8 *buffer = (uint8 *)malloc(buffer_size); do { if (ret == Z_BUF_ERROR) { buffer_size *= 2; out_size = buffer_size; - buffer = realloc(buffer, buffer_size); + buffer = (uint8 *)realloc(buffer, buffer_size); } else if (ret == Z_STREAM_ERROR) { log_error("Your build is shipped with broken zlib. Please use the official build."); free(buffer); @@ -506,7 +507,7 @@ uint8 *util_zlib_deflate(const uint8 *data, size_t data_in_size, size_t *data_ou ret = compress(buffer, &out_size, data, (uLong)data_in_size); } while (ret != Z_OK); *data_out_size = out_size; - buffer = realloc(buffer, *data_out_size); + buffer = (uint8 *)realloc(buffer, *data_out_size); return buffer; } diff --git a/src/openrct2/util/util.h b/src/openrct2/util/Util.h similarity index 100% rename from src/openrct2/util/util.h rename to src/openrct2/util/Util.h diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c index b89d661c45..04fb4d69cf 100644 --- a/src/openrct2/windows/_legacy.c +++ b/src/openrct2/windows/_legacy.c @@ -25,7 +25,7 @@ #include "../interface/viewport.h" #include "../ride/Track.h" #include "../ride/TrackData.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../network/network.h" #include "../world/scenery.h" diff --git a/src/openrct2/world/Balloon.cpp b/src/openrct2/world/Balloon.cpp index 755861143f..a27911d8ed 100644 --- a/src/openrct2/world/Balloon.cpp +++ b/src/openrct2/world/Balloon.cpp @@ -18,7 +18,7 @@ #include "../audio/audio.h" #include "../scenario/scenario.h" -#include "../util/util.h" +#include "../util/Util.h" #include "sprite.h" bool rct_sprite::IsBalloon() diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index ce9b910d0d..39ac2aa2be 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -21,14 +21,14 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../drawing/drawing.h" #include "../Game.h" #include "../interface/window.h" #include "../localisation/date.h" #include "../scenario/scenario.h" #include "../sprites.h" -#include "../util/util.h" +#include "../util/Util.h" constexpr sint32 MAX_THUNDER_INSTANCES = 2; diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index a078f0c073..fe8fefc3ad 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -21,7 +21,7 @@ #include "footpath.h" #include "map.h" #include "park.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../Game.h" #include "../localisation/string_ids.h" #include "../management/Finance.h" diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 9f31d48b3e..c1f9119a2e 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -28,7 +28,7 @@ #include "../localisation/string_ids.h" #include "../object.h" #include "../platform/platform.h" -#include "../util/util.h" +#include "../util/Util.h" #include "map.h" #include "map_helpers.h" #include "MapGen.h" diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index dcfc908d66..488dc58bb6 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../cheats.h" +#include "../Cheats.h" #include "../network/network.h" #include "../OpenRCT2.h" #include "../ride/TrackDesign.h" diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index a29a6ba677..f1e6a031cd 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -18,7 +18,7 @@ #include "../network/network.h" #include "../OpenRCT2.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../Game.h" #include "../localisation/string_ids.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 27b1c0415a..fc0ff6bede 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../cheats.h" +#include "../Cheats.h" #include "../Game.h" #include "../localisation/localisation.h" #include "../network/network.h" @@ -23,7 +23,7 @@ #include "../ride/Station.h" #include "../ride/Track.h" #include "../ride/TrackData.h" -#include "../util/util.h" +#include "../util/Util.h" #include "map.h" void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z); diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index 58e7d9efa1..3a4dee2d94 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../config/Config.h" #include "../Context.h" #include "../Game.h" @@ -30,7 +30,7 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../scenario/scenario.h" -#include "../util/util.h" +#include "../util/Util.h" #include "../windows/Intent.h" #include "banner.h" #include "Climate.h" diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c index 237c095996..9283f1df60 100644 --- a/src/openrct2/world/park.c +++ b/src/openrct2/world/park.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../cheats.h" +#include "../Cheats.h" #include "../config/Config.h" #include "../Game.h" #include "../interface/colour.h" diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c index 9b58f53a07..42ddca178f 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/scenery.c @@ -15,7 +15,7 @@ #pragma endregion #include "../common.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../Game.h" #include "../localisation/localisation.h" #include "../network/network.h" diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c index d3b45a0b13..6f035ff6de 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/sprite.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../cheats.h" +#include "../Cheats.h" #include "../Game.h" #include "../interface/viewport.h" #include "../localisation/date.h" diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt index 75cbdd183e..b876f12131 100644 --- a/test/tests/CMakeLists.txt +++ b/test/tests/CMakeLists.txt @@ -79,7 +79,7 @@ set(COMMON_TEST_SOURCES "${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" + "${ROOT_DIR}/src/openrct2/util/Util.cpp" "${ROOT_DIR}/src/openrct2/Version.cpp" ) @@ -106,7 +106,7 @@ set(SAWYERCODING_TEST_SOURCES "${ROOT_DIR}/src/openrct2/core/MemoryStream.cpp" "${ROOT_DIR}/src/openrct2/rct12/SawyerChunk.cpp" "${ROOT_DIR}/src/openrct2/rct12/SawyerChunkReader.cpp" - "${ROOT_DIR}/src/openrct2/util/sawyercoding.c" + "${ROOT_DIR}/src/openrct2/util/SawyerCoding.cpp" ) add_executable(test_sawyercoding ${SAWYERCODING_TEST_SOURCES}) target_link_libraries(test_sawyercoding ${GTEST_LIBRARIES} test-common ${LDL} z) diff --git a/test/tests/sawyercoding_test.cpp b/test/tests/sawyercoding_test.cpp index 3530035c77..60e7d9b92b 100644 --- a/test/tests/sawyercoding_test.cpp +++ b/test/tests/sawyercoding_test.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include constexpr size_t BUFFER_SIZE = 0x600000;