diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 84f199918c..ee0dd98742 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -43,10 +43,9 @@ 4C6A66B61FE278C900694CB6 /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B01FE278C900694CB6 /* Painter.cpp */; }; 4C6A66B71FE278C900694CB6 /* PaintHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */; }; 4C6A66B81FE278C900694CB6 /* Supports.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B31FE278C900694CB6 /* Supports.cpp */; }; + 4C6A66BC1FED04EE00694CB6 /* SSE41Drawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */; settings = {COMPILER_FLAGS = "-msse4.1"; }; }; 4C6A66C11FF9322A00694CB6 /* music_list.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BD1FF9322A00694CB6 /* music_list.c */; }; 4C6A66C21FF9322A00694CB6 /* Ride.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BF1FF9322A00694CB6 /* Ride.cpp */; }; - 4C6A66BC1FED04EE00694CB6 /* SSE41Drawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */; }; - 4C6A66BC1FED04EE00694CB6 /* SSE41Drawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */; settings = {COMPILER_FLAGS = "-msse4.1"; }; }; 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 */; }; @@ -54,6 +53,7 @@ 4C729BC71FC2E6AB001DFF2F /* Particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BC61FC2E6AB001DFF2F /* Particle.cpp */; }; 4C729BC91FC2E6E9001DFF2F /* MoneyEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BC81FC2E6E9001DFF2F /* MoneyEffect.cpp */; }; 4C7B53A51FFC180400A52E21 /* ObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A31FFC180400A52E21 /* ObjectList.cpp */; }; + 4C7B53A81FFD15B200A52E21 /* Map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A61FFD15B200A52E21 /* Map.cpp */; }; 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */; }; 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */; }; 4C8B42721EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B42711EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp */; }; @@ -445,7 +445,6 @@ F76C879A1EC4E88400FA49E2 /* Entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85621EC4E7CD00FA49E2 /* Entrance.cpp */; }; F76C879C1EC4E88400FA49E2 /* footpath.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85641EC4E7CD00FA49E2 /* footpath.c */; }; F76C879E1EC4E88400FA49E2 /* Fountain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85661EC4E7CD00FA49E2 /* Fountain.cpp */; }; - F76C87A01EC4E88400FA49E2 /* map.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85681EC4E7CD00FA49E2 /* map.c */; }; F76C87A21EC4E88400FA49E2 /* map_animation.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C856A1EC4E7CD00FA49E2 /* map_animation.c */; }; F76C87A41EC4E88500FA49E2 /* map_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C856C1EC4E7CD00FA49E2 /* map_helpers.c */; }; F76C87AC1EC4E88500FA49E2 /* scenery.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85741EC4E7CD00FA49E2 /* scenery.c */; }; @@ -637,11 +636,11 @@ 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PaintHelpers.cpp; sourceTree = ""; }; 4C6A66B31FE278C900694CB6 /* Supports.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Supports.cpp; sourceTree = ""; }; 4C6A66B41FE278C900694CB6 /* Supports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Supports.h; sourceTree = ""; }; + 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSE41Drawing.cpp; sourceTree = ""; }; 4C6A66BD1FF9322A00694CB6 /* music_list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_list.c; sourceTree = ""; }; 4C6A66BE1FF9322A00694CB6 /* music_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_list.h; sourceTree = ""; }; 4C6A66BF1FF9322A00694CB6 /* Ride.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ride.cpp; sourceTree = ""; }; 4C6A66C01FF9322A00694CB6 /* Ride.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ride.h; sourceTree = ""; }; - 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSE41Drawing.cpp; 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 = ""; }; @@ -657,6 +656,9 @@ 4C7B53A21FFC15ED00A52E21 /* ObjectLimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectLimits.h; sourceTree = ""; }; 4C7B53A31FFC180400A52E21 /* ObjectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectList.cpp; sourceTree = ""; }; 4C7B53A41FFC180400A52E21 /* ObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectList.h; sourceTree = ""; }; + 4C7B53A61FFD15B200A52E21 /* Map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Map.cpp; sourceTree = ""; }; + 4C7B53A71FFD15B200A52E21 /* Map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Map.h; sourceTree = ""; }; + 4C7B53A91FFD15BB00A52E21 /* Park.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Park.h; sourceTree = ""; }; 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = ""; }; 4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = ""; }; 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = ""; }; @@ -1345,8 +1347,6 @@ F76C85651EC4E7CD00FA49E2 /* footpath.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = footpath.h; sourceTree = ""; }; F76C85661EC4E7CD00FA49E2 /* Fountain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Fountain.cpp; sourceTree = ""; }; F76C85671EC4E7CD00FA49E2 /* Fountain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fountain.h; sourceTree = ""; }; - F76C85681EC4E7CD00FA49E2 /* map.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map.c; sourceTree = ""; }; - F76C85691EC4E7CD00FA49E2 /* map.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = map.h; sourceTree = ""; }; F76C856A1EC4E7CD00FA49E2 /* map_animation.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map_animation.c; sourceTree = ""; }; F76C856B1EC4E7CD00FA49E2 /* map_animation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = map_animation.h; sourceTree = ""; }; F76C856C1EC4E7CD00FA49E2 /* map_helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map_helpers.c; sourceTree = ""; }; @@ -2515,8 +2515,8 @@ 4C729BBE1FC2E1BE001DFF2F /* LargeScenery.cpp */, 4C729BBF1FC2E1BE001DFF2F /* LargeScenery.h */, 4C31B2E51FB6116100F6A38A /* Location.h */, - F76C85681EC4E7CD00FA49E2 /* map.c */, - F76C85691EC4E7CD00FA49E2 /* map.h */, + 4C7B53A61FFD15B200A52E21 /* Map.cpp */, + 4C7B53A71FFD15B200A52E21 /* Map.h */, F76C856A1EC4E7CD00FA49E2 /* map_animation.c */, F76C856B1EC4E7CD00FA49E2 /* map_animation.h */, F76C856C1EC4E7CD00FA49E2 /* map_helpers.c */, @@ -2525,6 +2525,7 @@ 4C31B2E31FB6115600F6A38A /* MapGen.h */, 4C729BC81FC2E6E9001DFF2F /* MoneyEffect.cpp */, F79F42871F2E07E1009E42F8 /* Park.cpp */, + 4C7B53A91FFD15BB00A52E21 /* Park.h */, 4C729BC61FC2E6AB001DFF2F /* Particle.cpp */, F76C85741EC4E7CD00FA49E2 /* scenery.c */, F76C85751EC4E7CD00FA49E2 /* scenery.h */, @@ -3193,6 +3194,7 @@ 4C93F13E1F8B744400A9330D /* CorkscrewRollerCoaster.cpp in Sources */, C6D2BEE71F9BAACE008B557C /* MapTooltip.cpp in Sources */, 4C93F1401F8B744400A9330D /* GigaCoaster.cpp in Sources */, + 4C7B53A81FFD15B200A52E21 /* Map.cpp in Sources */, C6415B471FA3B3E400AC4926 /* FontFamilies.cpp in Sources */, 4C93F1541F8B744400A9330D /* TwisterRollerCoaster.cpp in Sources */, 4CC4B8E71FE00C4E00660D62 /* Diagnostic.cpp in Sources */, @@ -3502,7 +3504,6 @@ F76C879A1EC4E88400FA49E2 /* Entrance.cpp in Sources */, F76C879C1EC4E88400FA49E2 /* footpath.c in Sources */, F76C879E1EC4E88400FA49E2 /* Fountain.cpp in Sources */, - F76C87A01EC4E88400FA49E2 /* map.c in Sources */, F76C87A21EC4E88400FA49E2 /* map_animation.c in Sources */, F76C87A41EC4E88500FA49E2 /* map_helpers.c in Sources */, F76C87AC1EC4E88500FA49E2 /* scenery.c in Sources */, diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index e94917f2bc..004640f711 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index cd59edbcc7..1dffa4b019 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -15,7 +15,7 @@ #pragma endregion #include -#include +#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 44c5bcb48f..27afd7cdaa 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -26,7 +26,7 @@ #include "util/Util.h" #include "world/Climate.h" #include "world/footpath.h" -#include "world/map.h" +#include "world/Map.h" #include "world/Park.h" #include "world/scenery.h" #include "world/sprite.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 8f87d3dcf1..21b0aa694b 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -56,7 +56,7 @@ #include "world/Climate.h" #include "world/Entrance.h" #include "world/footpath.h" -#include "world/map.h" +#include "world/Map.h" #include "world/map_animation.h" #include "world/Park.h" #include "world/scenery.h" diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index c3866c16d3..1fc94513be 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -25,7 +25,7 @@ #include "../Game.h" #include "../localisation/string_ids.h" -#include "../world/map.h" +#include "../world/Map.h" /** * Common error codes for game actions. diff --git a/src/openrct2/drawing/lightfx.h b/src/openrct2/drawing/lightfx.h index d8810eb256..4ee1770fad 100644 --- a/src/openrct2/drawing/lightfx.h +++ b/src/openrct2/drawing/lightfx.h @@ -20,7 +20,7 @@ #ifdef __ENABLE_LIGHTFX__ #include "../common.h" -#include "../world/map.h" +#include "../world/Map.h" #include "drawing.h" enum LIGHTFX_LIGHT_TYPE { diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index f80e3bb63f..979c2f9cf1 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -30,7 +30,7 @@ #include "../world/Climate.h" #include "../world/Entrance.h" #include "../world/footpath.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/scenery.h" #include "../world/sprite.h" #include "colour.h" diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/viewport.h index 0a60d54561..ea76d03abc 100644 --- a/src/openrct2/interface/viewport.h +++ b/src/openrct2/interface/viewport.h @@ -17,7 +17,7 @@ #ifndef _VIEWPORT_H_ #define _VIEWPORT_H_ -#include "../world/map.h" +#include "../world/Map.h" #include "../world/sprite.h" #include "../paint/Paint.h" #include "window.h" diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index d5dcf9e6d6..8ce69941b6 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -27,7 +27,7 @@ #include "../windows/Intent.h" #include "../world/Banner.h" #include "../world/footpath.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/scenery.h" #include "../world/LargeScenery.h" #include "../world/sprite.h" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 7805c06ed0..2cccb467d3 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -28,7 +28,7 @@ #include "../localisation/string_ids.h" #include "../OpenRCT2.h" #include "../platform/platform.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/sprite.h" #include "viewport.h" #include "widget.h" diff --git a/src/openrct2/network/NetworkPlayer.h b/src/openrct2/network/NetworkPlayer.h index 2558eab9ff..473df2b0a3 100644 --- a/src/openrct2/network/NetworkPlayer.h +++ b/src/openrct2/network/NetworkPlayer.h @@ -22,7 +22,7 @@ #include "../common.h" #include "../peep/Peep.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/sprite.h" class NetworkPacket; diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index c7483966c5..92b06c60d4 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -29,7 +29,7 @@ #include "../peep/Peep.h" #include "../platform/platform.h" #include "../util/Util.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/Park.h" #include "http.h" diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index 13eda0e038..f08e6d7502 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../interface/colour.h" #include "../drawing/drawing.h" diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index 4cf0430c35..1d648579cb 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -22,7 +22,7 @@ #include "../../interface/colour.h" #include "../../interface/viewport.h" #include "../../ride/Track.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/scenery.h" #include "../../world/Wall.h" #include "../Paint.h" diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/LargeScenery.cpp index 9752c691e1..aa1966431f 100644 --- a/src/openrct2/paint/tile_element/LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -20,7 +20,7 @@ #include "../../interface/viewport.h" #include "../../localisation/localisation.h" #include "../../util/Util.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/LargeScenery.h" #include "../../world/scenery.h" #include "../Paint.h" diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index 16846266c0..4b71de3a41 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -28,7 +28,7 @@ #include "../Supports.h" #include "TileElement.h" #include "Surface.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../drawing/lightfx.h" const uint8 byte_98D800[] = { diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/SmallScenery.cpp index 364686baca..567506638c 100644 --- a/src/openrct2/paint/tile_element/SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -21,7 +21,7 @@ #include "../../localisation/date.h" #include "../Paint.h" #include "../Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/scenery.h" #include "../../world/SmallScenery.h" diff --git a/src/openrct2/paint/tile_element/Surface.h b/src/openrct2/paint/tile_element/Surface.h index 2e30a86b0f..7f9b56e9a3 100644 --- a/src/openrct2/paint/tile_element/Surface.h +++ b/src/openrct2/paint/tile_element/Surface.h @@ -19,7 +19,7 @@ #include "../../common.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" enum { diff --git a/src/openrct2/paint/tile_element/TileElement.h b/src/openrct2/paint/tile_element/TileElement.h index 3eeb1bb725..3c2da871ec 100644 --- a/src/openrct2/paint/tile_element/TileElement.h +++ b/src/openrct2/paint/tile_element/TileElement.h @@ -18,7 +18,7 @@ #define _PAINT_TILE_ELEMENT_H #include "../../common.h" -#include "../../world/map.h" +#include "../../world/Map.h" typedef struct paint_session paint_session; diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 8ebde9e8b2..d2c490c5f5 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -42,7 +42,7 @@ #include "../world/Climate.h" #include "../world/Entrance.h" #include "../world/footpath.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/LargeScenery.h" #include "../world/scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 63ea644cd2..dbee9dcccd 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -18,7 +18,7 @@ #define _PEEP_H_ #include "../common.h" -#include "../world/map.h" +#include "../world/Map.h" #define PEEP_MAX_THOUGHTS 5 diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index dc197dea50..489f9dcb50 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -23,7 +23,7 @@ #include "rct12.h" #include "ride/Ride.h" #include "world/Banner.h" -#include "world/map.h" +#include "world/Map.h" #include "world/sprite.h" #include "world/map_animation.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 92b605bce1..ad2c79d718 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -44,7 +44,7 @@ #include "../world/Banner.h" #include "../world/Climate.h" #include "../world/footpath.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/map_animation.h" #include "../world/scenery.h" #include "../world/sprite.h" diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 4c36f134b1..0ed5744f15 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -21,7 +21,7 @@ #include "../peep/Peep.h" #include "../rct12.h" #include "../rct2.h" -#include "../world/map.h" +#include "../world/Map.h" #include "ride_ratings.h" #include "Vehicle.h" diff --git a/src/openrct2/ride/Station.h b/src/openrct2/ride/Station.h index 13a28c0df3..9088d96d67 100644 --- a/src/openrct2/ride/Station.h +++ b/src/openrct2/ride/Station.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "../world/map.h" +#include "../world/Map.h" #include "Ride.h" #ifdef __cplusplus diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 6737d23cf1..1b1e8a2ee8 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -27,7 +27,7 @@ #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/footpath.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/map_animation.h" #include "../world/Park.h" #include "../world/scenery.h" diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index 0739f7c8f3..53b1ca6a50 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -21,7 +21,7 @@ #include "../object/Object.h" #include "../rct12.h" #include "../rct2.h" -#include "../world/map.h" +#include "../world/Map.h" #include "Vehicle.h" #define TRACK_PREVIEW_IMAGE_SIZE (370 * 217) diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index d76acc49f0..cbd1b43fd8 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -18,7 +18,7 @@ #define _VEHICLE_H_ #include "../common.h" -#include "../world/map.h" +#include "../world/Map.h" typedef struct rct_vehicle_colour { uint8 body_colour; diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index a371a0d805..b9c2c9b31e 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 8e399daaa6..3e59514ed0 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 08a9d36314..43ec6aa70e 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 858f5b77d3..a08152a144 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index e7adbe2308..3b904734c7 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 8f9726b35d..39388a147f 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index d20c4f5802..304d646e9b 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 5f326516a2..82cb820e72 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 34e03dd674..b820bfed0c 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 9865aed725..d880cc79a3 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 96a283acff..f95bb20ae7 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 7e86b2218b..6e9c1e0794 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -22,7 +22,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 0228d965fe..b365fff28b 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index f086c7e41b..a21c988bca 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index dc66d75744..3bc2569784 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index d3bac1916f..bce18dd564 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index c17a809197..a3f0a74c57 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 20408fc8a2..adbdb923ab 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 34a7fd686a..c3c3c14ff7 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 93559f438b..25dc9d64cb 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 1238444fdb..d956107f6b 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 3f541284d5..222e683230 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 171be6db77..c1e38a7d3d 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index c2200f0fd3..3d780c90ef 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index a8e2baa7cc..dbfd8eb23b 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 76bc7ec09c..a7862e1d28 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index e8f5e6e6e0..2a72931715 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index c165a1bb1e..2d2c12f952 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 450e2dcc39..77627366dd 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index 2edd7cd83a..6efa836931 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index d726fc95cc..3dc7c7694a 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -18,7 +18,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../ride_data.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index f9cb397e51..46114d848b 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -17,7 +17,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../ride_data.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 2cf23c7919..879fd6014b 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -19,7 +19,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 8b1b146a03..52f1d02895 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -19,7 +19,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../ride_data.h" #include "../TrackData.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index 7c6c9fce43..304db66cae 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -17,7 +17,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../ride_data.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index 612c0db05e..f1a4ee1dc8 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -18,7 +18,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Track.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 748ffd12e7..03bced5fbd 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -18,7 +18,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Track.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index ff03cef59f..d74a602646 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -19,7 +19,7 @@ #include "../localisation/date.h" #include "../OpenRCT2.h" #include "../world/footpath.h" -#include "../world/map.h" +#include "../world/Map.h" #include "Ride.h" #include "ride_data.h" #include "ride_ratings.h" diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index 7f6fdae426..e5dd825d9c 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index fc67bf4eb0..95b3167aee 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 648cc77b64..cc7e6f7e46 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -18,7 +18,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Track.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index b48de21f9a..a6bbb0cc5c 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index 0c934b36a1..f1906dc0ec 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -22,7 +22,7 @@ #include "../interface/window.h" #include "../localisation/localisation.h" #include "../sprites.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/sprite.h" #include "ride_data.h" #include "TrackData.h" diff --git a/src/openrct2/ride/track_paint.h b/src/openrct2/ride/track_paint.h index 401ddd84aa..1da4b474d8 100644 --- a/src/openrct2/ride/track_paint.h +++ b/src/openrct2/ride/track_paint.h @@ -21,7 +21,7 @@ #include "../common.h" #include "../paint/tile_element/TileElement.h" #include "../paint/Paint.h" -#include "../world/map.h" +#include "../world/Map.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index a81b95c7ef..d084593f24 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -17,7 +17,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../Ride.h" #include "../ride_data.h" #include "../Track.h" diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 19d647586d..cc6945faf2 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -19,7 +19,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../ride_data.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index ba711087d4..51d49d0908 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -18,7 +18,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../ride_data.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 313921fe73..eb2f3ea686 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index eb0cd7401a..fe7de42036 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -19,7 +19,7 @@ #include "../../interface/viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/map.h" +#include "../../world/Map.h" #include "../../world/sprite.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index c41cf7c37d..cf018f29d0 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -39,7 +39,7 @@ #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/Climate.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/scenery.h" #include "../world/sprite.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 075a2977e3..2671841ff5 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -26,7 +26,7 @@ #include "../ride/Ride.h" #include "../ride/ride_ratings.h" #include "../world/Banner.h" -#include "../world/map.h" +#include "../world/Map.h" #include "../world/map_animation.h" #include "../world/sprite.h" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index eb069099eb..da2f9e160d 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -23,7 +23,7 @@ #include "../network/network.h" #include "Banner.h" -#include "map.h" +#include "Map.h" #include "Park.h" #include "scenery.h" #include "../Game.h" diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h index be07b6951c..7978c3acc1 100644 --- a/src/openrct2/world/Banner.h +++ b/src/openrct2/world/Banner.h @@ -18,7 +18,7 @@ #define _BANNER_H_ #include "../common.h" -#include "../world/map.h" +#include "Map.h" #define BANNER_NULL 255 #define MAX_BANNERS 250 diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 448cf791c6..1499a6d996 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -19,7 +19,7 @@ #include "Entrance.h" #include "footpath.h" -#include "map.h" +#include "Map.h" #include "Park.h" #include "../Cheats.h" #include "../Game.h" diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp index 2005f059be..25264d9945 100644 --- a/src/openrct2/world/Fountain.cpp +++ b/src/openrct2/world/Fountain.cpp @@ -19,7 +19,7 @@ #include "../Game.h" #include "../scenario/Scenario.h" #include "footpath.h" -#include "map.h" +#include "Map.h" #include "scenery.h" #include "sprite.h" diff --git a/src/openrct2/world/Fountain.h b/src/openrct2/world/Fountain.h index 5458cc148f..6abbb6f078 100644 --- a/src/openrct2/world/Fountain.h +++ b/src/openrct2/world/Fountain.h @@ -18,7 +18,7 @@ #include "../common.h" -#include "map.h" +#include "Map.h" #include "sprite.h" enum diff --git a/src/openrct2/world/LargeScenery.cpp b/src/openrct2/world/LargeScenery.cpp index 84db3f467a..285d40b5f6 100644 --- a/src/openrct2/world/LargeScenery.cpp +++ b/src/openrct2/world/LargeScenery.cpp @@ -16,7 +16,7 @@ #include "../common.h" #include "LargeScenery.h" -#include "map.h" +#include "Map.h" extern "C" { diff --git a/src/openrct2/world/LargeScenery.h b/src/openrct2/world/LargeScenery.h index 54f8ea9409..65d9f65edd 100644 --- a/src/openrct2/world/LargeScenery.h +++ b/src/openrct2/world/LargeScenery.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "map.h" +#include "Map.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/world/map.c b/src/openrct2/world/Map.cpp similarity index 96% rename from src/openrct2/world/map.c rename to src/openrct2/world/Map.cpp index 21fe3ee240..28bde1da2c 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/Map.cpp @@ -18,6 +18,8 @@ #include "../Cheats.h" #include "../config/Config.h" #include "../Context.h" +#include "../core/Math.hpp" +#include "../core/Util.hpp" #include "../Game.h" #include "../interface/Cursors.h" #include "../interface/window.h" @@ -36,7 +38,7 @@ #include "Climate.h" #include "footpath.h" #include "LargeScenery.h" -#include "map.h" +#include "Map.h" #include "map_animation.h" #include "Park.h" #include "scenery.h" @@ -934,9 +936,9 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si rct_scenery_entry* scenery_entry = get_large_scenery_entry(scenery_large_get_type(tile_element)); LocationXYZ16 firstTile = { - .x = scenery_entry->large_scenery.tiles[tileIndex].x_offset, - .y = scenery_entry->large_scenery.tiles[tileIndex].y_offset, - .z = (base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset + scenery_entry->large_scenery.tiles[tileIndex].x_offset, + scenery_entry->large_scenery.tiles[tileIndex].y_offset, + static_cast((base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset) }; rotate_map_coordinates(&firstTile.x, &firstTile.y, tile_element_direction); @@ -948,9 +950,9 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si for (sint32 i = 0; scenery_entry->large_scenery.tiles[i].x_offset != -1; i++){ LocationXYZ16 currentTile = { - .x = scenery_entry->large_scenery.tiles[i].x_offset, - .y = scenery_entry->large_scenery.tiles[i].y_offset, - .z = scenery_entry->large_scenery.tiles[i].z_offset + scenery_entry->large_scenery.tiles[i].x_offset, + scenery_entry->large_scenery.tiles[i].y_offset, + scenery_entry->large_scenery.tiles[i].z_offset }; rotate_map_coordinates(¤tTile.x, ¤tTile.y, tile_element_direction); @@ -1058,9 +1060,9 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx // Work out the base tile coordinates (Tile with index 0) LocationXYZ16 baseTile = { - .x = scenery_entry->large_scenery.tiles[tileIndex].x_offset, - .y = scenery_entry->large_scenery.tiles[tileIndex].y_offset, - .z = (base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset + scenery_entry->large_scenery.tiles[tileIndex].x_offset, + scenery_entry->large_scenery.tiles[tileIndex].y_offset, + static_cast((base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset) }; rotate_map_coordinates(&baseTile.x, &baseTile.y, tile_element_direction); baseTile.x = x - baseTile.x; @@ -1071,9 +1073,9 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx // Work out the current tile coordinates LocationXYZ16 currentTile = { - .x = scenery_entry->large_scenery.tiles[i].x_offset, - .y = scenery_entry->large_scenery.tiles[i].y_offset, - .z = scenery_entry->large_scenery.tiles[i].z_offset + scenery_entry->large_scenery.tiles[i].x_offset, + scenery_entry->large_scenery.tiles[i].y_offset, + scenery_entry->large_scenery.tiles[i].z_offset }; rotate_map_coordinates(¤tTile.x, ¤tTile.y, tile_element_direction); currentTile.x += baseTile.x; @@ -1232,10 +1234,10 @@ money32 map_clear_scenery(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 cle gCommandPosition.y = y; gCommandPosition.z = z; - x0 = max(x0, 32); - y0 = max(y0, 32); - x1 = min(x1, gMapSizeMaxXY); - y1 = min(y1, gMapSizeMaxXY); + x0 = std::max(x0, 32); + y0 = std::max(y0, 32); + x1 = std::min(x1, (sint32)gMapSizeMaxXY); + y1 = std::min(y1, (sint32)gMapSizeMaxXY); noValidTiles = true; totalCost = 0; @@ -1292,10 +1294,10 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - x0 = max(x0, 32); - y0 = max(y0, 32); - x1 = min(x1, gMapSizeMaxXY); - y1 = min(y1, gMapSizeMaxXY); + x0 = std::max(x0, 32); + y0 = std::max(y0, 32); + x1 = std::min(x1, (sint32)gMapSizeMaxXY); + y1 = std::min(y1, (sint32)gMapSizeMaxXY); sint32 xMid, yMid; @@ -1343,7 +1345,7 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 // Prevent network-originated value of surfaceStyle from causing // invalid access. uint8 style = surfaceStyle & 0x1F; - if (style >= countof(TerrainPricing)) { + if (style >= Util::CountOf(TerrainPricing)) { return MONEY32_UNDEFINED; } surfaceCost += TerrainPricing[style]; @@ -1738,18 +1740,18 @@ static money32 map_set_land_ownership(uint8 flags, sint16 x1, sint16 y1, sint16 return 0; // Clamp to maximum addressable element to prevent long loop spamming the log - x1 = clamp(32, x1, gMapSizeUnits - 32); - y1 = clamp(32, y1, gMapSizeUnits - 32); - x2 = clamp(32, x2, gMapSizeUnits - 32); - y2 = clamp(32, y2, gMapSizeUnits - 32); + x1 = Math::Clamp(32, (sint32)x1, gMapSizeUnits - 32); + y1 = Math::Clamp(32, (sint32)y1, gMapSizeUnits - 32); + x2 = Math::Clamp(32, (sint32)x2, gMapSizeUnits - 32); + y2 = Math::Clamp(32, (sint32)y2, gMapSizeUnits - 32); gMapLandRightsUpdateSuccess = false; map_buy_land_rights(x1, y1, x2, y2, BUY_LAND_RIGHTS_FLAG_SET_OWNERSHIP_WITH_CHECKS, flags | (newOwnership << 8)); if (!gMapLandRightsUpdateSuccess) return 0; - sint16 x = clamp(32, x1, gMapSizeUnits - 32); - sint16 y = clamp(32, y1, gMapSizeUnits - 32); + sint16 x = Math::Clamp(32, (sint32)x1, gMapSizeUnits - 32); + sint16 y = Math::Clamp(32, (sint32)y1, gMapSizeUnits - 32); x += 16; y += 16; @@ -1783,10 +1785,10 @@ void game_command_set_land_ownership(sint32 *eax, sint32 *ebx, sint32 *ecx, sint static uint8 map_get_lowest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, sint32 yMax) { - xMin = max(xMin, 32); - yMin = max(yMin, 32); - xMax = min(xMax, gMapSizeMaxXY); - yMax = min(yMax, gMapSizeMaxXY); + xMin = std::max(xMin, 32); + yMin = std::max(yMin, 32); + xMax = std::min(xMax, (sint32)gMapSizeMaxXY); + yMax = std::min(yMax, (sint32)gMapSizeMaxXY); uint8 min_height = 0xFF; for (sint32 yi = yMin; yi <= yMax; yi += 32) { @@ -1802,10 +1804,10 @@ static uint8 map_get_lowest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, s static uint8 map_get_highest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, sint32 yMax) { - xMin = max(xMin, 32); - yMin = max(yMin, 32); - xMax = min(xMax, gMapSizeMaxXY); - yMax = min(yMax, gMapSizeMaxXY); + xMin = std::max(xMin, 32); + yMin = std::max(yMin, 32); + xMax = std::min(xMax, (sint32)gMapSizeMaxXY); + yMax = std::min(yMax, (sint32)gMapSizeMaxXY); uint8 max_height = 0; for (sint32 yi = yMin; yi <= yMax; yi += 32) { @@ -1829,7 +1831,7 @@ static money32 raise_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, { money32 cost = 0; - if (selectionType < 0 || selectionType >= countof(tile_element_raise_styles)) + if (selectionType < 0 || selectionType >= (sint32)Util::CountOf(tile_element_raise_styles)) { log_warning("Invalid selection type %d for raising land", selectionType); return MONEY32_UNDEFINED; @@ -1936,10 +1938,10 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) uint8 max_height = 0xFF; - x0 = max(x0, 32); - y0 = max(y0, 32); - x1 = min(x1, gMapSizeMaxXY); - y1 = min(y1, gMapSizeMaxXY); + x0 = std::max(x0, (sint16)32); + y0 = std::max(y0, (sint16)32); + x1 = std::min(x1, gMapSizeMaxXY); + y1 = std::min(y1, gMapSizeMaxXY); for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { @@ -2017,10 +2019,10 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) uint8 min_height = 0; - x0 = max(x0, 32); - y0 = max(y0, 32); - x1 = min(x1, gMapSizeMaxXY); - y1 = min(y1, gMapSizeMaxXY); + x0 = std::max(x0, (sint16)32); + y0 = std::max(y0, (sint16)32); + x1 = std::min(x1, gMapSizeMaxXY); + y1 = std::min(y1, gMapSizeMaxXY); for (sint32 yi = y0; yi <= y1; yi += 32){ for (sint32 xi = x0; xi <= x1; xi += 32){ @@ -2329,10 +2331,10 @@ static money32 smooth_land_row_by_corner(sint32 flags, sint32 x, sint32 y, sint3 static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 mapLeft, sint32 mapTop, sint32 mapRight, sint32 mapBottom, sint32 command) { // Cap bounds to map - mapLeft = max(mapLeft, 32); - mapTop = max(mapTop, 32); - mapRight = clamp(0, mapRight, (MAXIMUM_MAP_SIZE_TECHNICAL - 1) * 32); - mapBottom = clamp(0, mapBottom, (MAXIMUM_MAP_SIZE_TECHNICAL - 1) * 32); + mapLeft = std::max(mapLeft, 32); + mapTop = std::max(mapTop, 32); + mapRight = Math::Clamp(0, mapRight, (MAXIMUM_MAP_SIZE_TECHNICAL - 1) * 32); + mapBottom = Math::Clamp(0, mapBottom, (MAXIMUM_MAP_SIZE_TECHNICAL - 1) * 32); bool raiseLand = command < 0x7FFF; sint32 commandType = raiseLand ? GAME_COMMAND_RAISE_LAND : GAME_COMMAND_LOWER_LAND; @@ -2408,16 +2410,16 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 // Then do the smoothing if (fullTile) { // Smooth the corners - sint32 z = clamp(minHeight, tile_element_get_corner_height(tileElement, 2), maxHeight); + sint32 z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 2), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapLeft, mapTop, z, -32, -32, 0, 2, raiseLand); tileElement = map_get_surface_element_at(mapLeft >> 5, mapBottom >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 3), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 3), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapLeft, mapBottom, z, -32, 32, 1, 3, raiseLand); tileElement = map_get_surface_element_at(mapRight >> 5, mapBottom >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 0), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 0), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapRight, mapBottom, z, 32, 32, 2, 0, raiseLand); tileElement = map_get_surface_element_at(mapRight >> 5, mapTop >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 1), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 1), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapRight, mapTop, z, 32, -32, 3, 1, raiseLand); // Smooth the edges @@ -2426,32 +2428,32 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 for (y = mapTop; y <= mapBottom; y += 32) { tileElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 3), maxHeight); - z2 = clamp(minHeight, tile_element_get_corner_height(tileElement, 2), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 3), maxHeight); + z2 = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 2), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, -32, 0, 0, 1, 3, 2, raiseLand); } x = mapRight; for (y = mapTop; y <= mapBottom; y += 32) { tileElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 1), maxHeight); - z2 = clamp(minHeight, tile_element_get_corner_height(tileElement, 0), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 1), maxHeight); + z2 = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 0), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, 32, 0, 2, 3, 1, 0, raiseLand); } y = mapTop; for (x = mapLeft; x <= mapRight; x += 32) { tileElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 1), maxHeight); - z2 = clamp(minHeight, tile_element_get_corner_height(tileElement, 2), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 1), maxHeight); + z2 = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 2), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, 0, -32, 0, 3, 1, 2, raiseLand); } y = mapBottom; for (x = mapLeft; x <= mapRight; x += 32) { tileElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, tile_element_get_corner_height(tileElement, 0), maxHeight); - z2 = clamp(minHeight, tile_element_get_corner_height(tileElement, 3), maxHeight); + z = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 0), maxHeight); + z2 = Math::Clamp(minHeight, (uint8)tile_element_get_corner_height(tileElement, 3), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, 0, 32, 1, 2, 0, 3, raiseLand); } } @@ -2733,15 +2735,15 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin } uint32 num_elements = 0; - sint16 maxHeight = 0xFFFF; + sint16 maxHeight = -1; for (rct_large_scenery_tile* tile = scenery_entry->large_scenery.tiles; tile->x_offset != -1; tile++) { num_elements++; LocationXY16 curTile = { - .x = tile->x_offset, - .y = tile->y_offset + tile->x_offset, + tile->y_offset }; rotate_map_coordinates(&curTile.x, &curTile.y, rotation); @@ -2790,8 +2792,8 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin tile++, tile_num++) { LocationXY16 curTile = { - .x = tile->x_offset, - .y = tile->y_offset + tile->x_offset, + tile->y_offset }; rotate_map_coordinates(&curTile.x, &curTile.y, rotation); @@ -3044,7 +3046,7 @@ void map_reorganise_elements() { context_setcurrentcursor(CURSOR_ZZZ); - rct_tile_element* new_tile_elements = malloc(3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(rct_tile_element)); + rct_tile_element* new_tile_elements = (rct_tile_element *)malloc(3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(rct_tile_element)); rct_tile_element* new_elements_pointer = new_tile_elements; if (new_tile_elements == NULL) { @@ -3246,6 +3248,10 @@ void map_obstruction_set_error_text(rct_tile_element *tileElement) */ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, CLEAR_FUNC *clearFunc, uint8 bl, uint8 flags, money32 *price, uint8 crossingMode) { + sint32 al, ah, bh, cl, ch, water_height; + al = ah = bh = cl = ch = water_height = 0; + uint8 slope = 0; + gMapGroundFlags = ELEMENT_IS_ABOVE_GROUND; bool canBuildCrossing = false; if (x >= gMapSizeUnits || y >= gMapSizeUnits || x < 32 || y < 32) { @@ -3262,7 +3268,7 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z } continue; } - sint32 water_height = map_get_water_height(tile_element) * 2; + water_height = map_get_water_height(tile_element) * 2; if (water_height && water_height > zLow && tile_element->base_height < zHigh && !gCheatsDisableClearanceChecks) { gMapGroundFlags |= ELEMENT_IS_UNDERWATER; if (water_height < zHigh) { @@ -3271,7 +3277,7 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z } loc_68B9B7: if (gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION) { - sint32 al = zHigh - tile_element->base_height; + al = zHigh - tile_element->base_height; if (al >= 0) { if (al > 18) { gGameCommandErrorText = STR_LOCAL_AUTHORITY_WONT_ALLOW_CONSTRUCTION_ABOVE_TREE_HEIGHT; @@ -3294,11 +3300,11 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z gMapGroundFlags |= ELEMENT_IS_UNDERGROUND; gMapGroundFlags &= ~ELEMENT_IS_ABOVE_GROUND; } else { - sint32 al = tile_element->base_height; - sint32 ah = al; - sint32 cl = al; - sint32 ch = al; - uint8 slope = tile_element->properties.surface.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK; + al = tile_element->base_height; + ah = al; + cl = al; + ch = al; + slope = tile_element->properties.surface.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK; if (slope & TILE_ELEMENT_SLOPE_N_CORNER_UP) { al += 2; if (slope == (TILE_ELEMENT_SLOPE_S_CORNER_DN | TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)) @@ -3319,7 +3325,7 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z if (slope == (TILE_ELEMENT_SLOPE_E_CORNER_DN | TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)) ch += 2; } - sint32 bh = zLow + 4; + bh = zLow + 4; if ((!(bl & 1) || ((bl & 0x10 || zLow >= al) && bh >= al)) && (!(bl & 2) || ((bl & 0x20 || zLow >= ah) && bh >= ah)) && (!(bl & 4) || ((bl & 0x40 || zLow >= cl) && bh >= cl)) && @@ -3780,7 +3786,7 @@ sint32 map_get_highest_z(sint32 tileX, sint32 tileY) if ((tileElement->properties.surface.slope & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT) != 0) z += 16; - z = max(z, map_get_water_height(tileElement) * 16); + z = std::max(z, map_get_water_height(tileElement) * 16); return z; } @@ -4203,7 +4209,7 @@ void game_command_set_sign_name(sint32* eax, sint32* ebx, sint32* ecx, sint32* e if (nameChunkOffset < 0) nameChunkOffset = 2; nameChunkOffset *= 12; - nameChunkOffset = min(nameChunkOffset, countof(newName) - 12); + nameChunkOffset = std::min(nameChunkOffset, (sint32)Util::CountOf(newName) - 12); memcpy(newName + nameChunkOffset + 0, edx, 4); memcpy(newName + nameChunkOffset + 4, ebp, 4); memcpy(newName + nameChunkOffset + 8, edi, 4); @@ -4254,7 +4260,7 @@ void game_command_set_sign_name(sint32* eax, sint32* ebx, sint32* ecx, sint32* e void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { uint8 bannerId = *ecx & 0xFF; - if (bannerId > countof(gBanners)) { + if (bannerId > Util::CountOf(gBanners)) { log_warning("Invalid game command for setting sign style, banner id = %d", bannerId); *ebx = MONEY32_UNDEFINED; return; @@ -4336,7 +4342,7 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx const sint32 flags = *ebx; const sint32 x = *ecx & 0xFF; const sint32 y = (*ecx >> 8) & 0xFF; - const tile_inspector_instruction instruction = *eax; + const tile_inspector_instruction instruction = (const tile_inspector_instruction)*eax; switch (instruction) { diff --git a/src/openrct2/world/map.h b/src/openrct2/world/Map.h similarity index 100% rename from src/openrct2/world/map.h rename to src/openrct2/world/Map.h diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 648f021f9a..5a5a8eb829 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -29,7 +29,7 @@ #include "../object/Object.h" #include "../platform/platform.h" #include "../util/Util.h" -#include "map.h" +#include "Map.h" #include "map_helpers.h" #include "MapGen.h" #include "scenery.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index a13b3a4518..66917402d3 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -34,8 +34,8 @@ #include "../ride/Ride.h" #include "../ride/ride_data.h" #include "../scenario/Scenario.h" -#include "../world/map.h" #include "Entrance.h" +#include "Map.h" #include "Park.h" #include "sprite.h" diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h index 5c73a09d92..0af561472f 100644 --- a/src/openrct2/world/Park.h +++ b/src/openrct2/world/Park.h @@ -18,7 +18,7 @@ #define _PARK_H_ #include "../common.h" -#include "map.h" +#include "Map.h" #define DECRYPT_MONEY(money) ((money32)rol32((money) ^ 0xF4EC9621, 13)) #define ENCRYPT_MONEY(money) ((money32)(ror32((money), 13) ^ 0xF4EC9621)) diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 1fe630b0d2..54fc965dc4 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -19,7 +19,7 @@ #include "../OpenRCT2.h" #include "../ride/TrackDesign.h" #include "footpath.h" -#include "map.h" +#include "Map.h" #include "Park.h" #include "scenery.h" #include "SmallScenery.h" diff --git a/src/openrct2/world/SmallScenery.h b/src/openrct2/world/SmallScenery.h index 2a757a7abe..a58e58b926 100644 --- a/src/openrct2/world/SmallScenery.h +++ b/src/openrct2/world/SmallScenery.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "map.h" +#include "Map.h" #include "scenery.h" #ifdef __cplusplus diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 7b127c61fd..0d64380339 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -23,7 +23,7 @@ #include "../windows/Intent.h" #include "../windows/tile_inspector.h" #include "footpath.h" -#include "map.h" +#include "Map.h" #include "TileInspector.h" uint32 windowTileInspectorTileX; diff --git a/src/openrct2/world/TileInspector.h b/src/openrct2/world/TileInspector.h index bd79a6d077..bf5753b526 100644 --- a/src/openrct2/world/TileInspector.h +++ b/src/openrct2/world/TileInspector.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "map.h" +#include "Map.h" typedef enum { TILE_INSPECTOR_ELEMENT_ANY = 0, diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 31c66cb8c9..889554e3b5 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -24,7 +24,7 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "LargeScenery.h" -#include "map.h" +#include "Map.h" #include "Park.h" #include "scenery.h" #include "SmallScenery.h" diff --git a/src/openrct2/world/Wall.h b/src/openrct2/world/Wall.h index 7c931ff54e..49620320d5 100644 --- a/src/openrct2/world/Wall.h +++ b/src/openrct2/world/Wall.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "map.h" +#include "Map.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 6365c8eea8..cbae86377e 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -24,7 +24,7 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../util/Util.h" -#include "map.h" +#include "Map.h" void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z); void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_tile_element *tileElement); diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c index 2736ba8fa0..39be9e33ce 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/map_animation.c @@ -20,7 +20,7 @@ #include "../ride/Track.h" #include "../interface/viewport.h" #include "map_animation.h" -#include "map.h" +#include "Map.h" #include "scenery.h" #include "SmallScenery.h" #include "sprite.h" diff --git a/src/openrct2/world/map_helpers.c b/src/openrct2/world/map_helpers.c index 15632c666c..3daa99afec 100644 --- a/src/openrct2/world/map_helpers.c +++ b/src/openrct2/world/map_helpers.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "map.h" +#include "Map.h" #include "map_helpers.h" /** diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c index fddc4b7a99..40ab950267 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/scenery.c @@ -24,7 +24,7 @@ #include "Climate.h" #include "footpath.h" #include "Fountain.h" -#include "map.h" +#include "Map.h" #include "Park.h" #include "scenery.h" #include "SmallScenery.h" diff --git a/src/openrct2/world/scenery.h b/src/openrct2/world/scenery.h index 9d99288910..3f9d1bff49 100644 --- a/src/openrct2/world/scenery.h +++ b/src/openrct2/world/scenery.h @@ -19,7 +19,7 @@ #include "../common.h" #include "../object/Object.h" -#include "../world/map.h" +#include "Map.h" #define SCENERY_SMALL_SCENERY_ID_MIN 0x0 #define SCENERY_SMALL_SCENERY_ID_MAX 0xFC diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 1e53108b07..c991dbcbfa 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -110,7 +110,7 @@ private: "../../paint/tile_element/tile_element.h", "../../paint/paint.h", "../../sprites.h", - "../../world/map.h", + "../../world/Map.h", "../../world/sprite.h", "../ride_data.h", "../TrackData.h",