From 90a04e2758998caeb7779c997f051dcb4c7baf3c Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 21 Apr 2019 19:56:18 +0100 Subject: [PATCH] Undo mistake. Remove pointless parameter --- src/openrct2/actions/LargeSceneryPlaceAction.hpp | 10 ++++------ src/openrct2/peep/Guest.cpp | 6 ++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.hpp b/src/openrct2/actions/LargeSceneryPlaceAction.hpp index bcd8ee892c..8dce64eed9 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.hpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.hpp @@ -94,7 +94,6 @@ public: res->Position.z = surfaceHeight; res->GroundFlags = 0; - BannerIndex bannerId = BANNER_INDEX_NULL; money32 supportsCost = 0; if (_primaryColour > TILE_ELEMENT_COLOUR_MASK || _secondaryColour > TILE_ELEMENT_COLOUR_MASK) @@ -219,7 +218,6 @@ public: res->Position.z = surfaceHeight; res->GroundFlags = 0; - BannerIndex bannerId = BANNER_INDEX_NULL; money32 supportsCost = 0; rct_scenery_entry* sceneryEntry = get_large_scenery_entry(_sceneryType); @@ -324,7 +322,7 @@ public: newTileElement->clearance_height = zHigh; auto newSceneryElement = newTileElement->AsLargeScenery(); - SetNewLargeSceneryElement(*newSceneryElement, tileNum, _bannerId); + SetNewLargeSceneryElement(*newSceneryElement, tileNum); if (tileNum == 0) { @@ -394,7 +392,7 @@ private: return maxHeight; } - void SetNewLargeSceneryElement(LargeSceneryElement & sceneryElement, uint8_t tileNum, BannerIndex bannerId) const + void SetNewLargeSceneryElement(LargeSceneryElement & sceneryElement, uint8_t tileNum) const { sceneryElement.SetDirection(_loc.direction); sceneryElement.SetEntryIndex(_sceneryType); @@ -402,9 +400,9 @@ private: sceneryElement.SetPrimaryColour(_primaryColour); sceneryElement.SetSecondaryColour(_secondaryColour); - if (bannerId != BANNER_INDEX_NULL) + if (_bannerId != BANNER_INDEX_NULL) { - sceneryElement.SetBannerIndex(bannerId); + sceneryElement.SetBannerIndex(_bannerId); } if (GetFlags() & GAME_COMMAND_FLAG_GHOST) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 6d19e463a0..6de0a9e2ab 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -4028,6 +4028,12 @@ void Guest::UpdateRideLeaveVehicle() platformLocation.x = vehicle->x + word_981D6C[platformLocation.direction].x * 12; platformLocation.y = vehicle->y + word_981D6C[platformLocation.direction].y * 12; + if (vehicle_entry->peep_loading_positions.empty()) + { + + log_error("Failed seating. %s", language_get_string(rideEntry->naming.name)); + } + int8_t loadPosition = vehicle_entry->peep_loading_positions[current_seat]; switch (vehicle->sprite_direction / 8)