mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Only shift ride locations if they are not null

Browse Source
This commit is contained in:
Gymnasiast
2024-04-23 19:34:20 +02:00
parent 308912b8ce
commit dde7a8270a
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2/world/Map.cpp
View File

@@ -2238,6 +2238,18 @@ MapRange ClampRangeWithinMap(const MapRange& range)
return validRange;
}
static inline void shiftIfNotNull(TileCoordsXY& coords, const TileCoordsXY& amount)
{
if (!coords.IsNull())
coords += amount;
}
static inline void shiftIfNotNull(CoordsXY& coords, const CoordsXY& amount)
{
if (!coords.IsNull())
coords += amount;
}
void ShiftMap(const TileCoordsXY& amount)
{
if (amount.x == 0 && amount.y == 0)
@@ -2392,17 +2404,17 @@ void ShiftMap(const TileCoordsXY& amount)
auto& stations = ride.GetStations();
for (auto& station : stations)
{
station.Start += amountToMove;
station.Entrance += amount;
station.Exit += amount;
shiftIfNotNull(station.Start, amountToMove);
shiftIfNotNull(station.Entrance, amount);
shiftIfNotNull(station.Exit, amount);
}
ride.overall_view += amountToMove;
ride.boat_hire_return_position += amount;
ride.CurTestTrackLocation += amount;
ride.ChairliftBullwheelLocation[0] += amount;
ride.ChairliftBullwheelLocation[1] += amount;
ride.CableLiftLoc += amountToMove;
shiftIfNotNull(ride.overall_view, amountToMove);
shiftIfNotNull(ride.boat_hire_return_position, amount);
shiftIfNotNull(ride.CurTestTrackLocation, amount);
shiftIfNotNull(ride.ChairliftBullwheelLocation[0], amount);
shiftIfNotNull(ride.ChairliftBullwheelLocation[1], amount);
shiftIfNotNull(ride.CableLiftLoc, amountToMove);
}
// Banners