mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Undo mistake. Remove pointless parameter

This commit is contained in:
duncanspumpkin 2019-04-21 19:56:18 +01:00
parent 46844e2218
commit 90a04e2758
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/actions/LargeSceneryPlaceAction.hpp
View File

@ -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)

6
src/openrct2/peep/Guest.cpp
View File

@ -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)