diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp index 2ce641e1b0..2829df7d94 100644 --- a/src/openrct2/object/ImageTable.cpp +++ b/src/openrct2/object/ImageTable.cpp @@ -237,7 +237,7 @@ std::vector> ImageTable::LoadObjectIm // Log place holder information if (placeHoldersAdded > 0) { - std::string msg = "PAdding " + std::to_string(placeHoldersAdded) + " placeholders"; + std::string msg = "Adding " + std::to_string(placeHoldersAdded) + " placeholders"; context->LogWarning(ObjectError::InvalidProperty, msg.c_str()); } } diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 53f25d8b83..7b0ab9c16d 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -14,8 +14,6 @@ #include "../../drawing/LightFX.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" -#include "../../object/FootpathObject.h" -#include "../../object/FootpathSurfaceObject.h" #include "../../object/StationObject.h" #include "../../ride/RideData.h" #include "../../ride/TrackDesign.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index d2d8d06374..7c8851fb4a 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -44,7 +44,7 @@ static int8_t TopSpinSeatPositionOffset[] = { */ static void top_spin_paint_vehicle( paint_session* session, int32_t al, int32_t cl, const Ride* ride, uint8_t direction, int32_t height, - const TrackElement& trackElement) + const TrackElement& tileElement) { if (ride == nullptr) return; diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index e2e2541a74..ab6c1e9d4f 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -460,6 +460,7 @@ static void paint_monorail_station( { uint32_t imageId; const StationObject* stationObject = nullptr; + if (ride != nullptr) stationObject = ride_get_station_object(ride);