mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Guard more moves with null check

Browse Source
This commit is contained in:
Gymnasiast
2024-05-17 23:30:07 +02:00
parent dde7a8270a
commit 3bb1f8e18a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2308,10 +2308,10 @@ void ShiftMap(const TileCoordsXY& amount)
MapRemoveOutOfRangeElements();
for (auto& spawn : gameState.PeepSpawns)
spawn += amountToMove;
shiftIfNotNull(spawn, amountToMove);
for (auto& entrance : gameState.Park.Entrances)
entrance += amountToMove;
shiftIfNotNull(entrance, amountToMove);
// Entities
auto& entityTweener = EntityTweener::Get();
@@ -2327,7 +2327,7 @@ void ShiftMap(const TileCoordsXY& amount)
entityTweener.RemoveEntity(entity);
auto location = entity->GetLocation();
location += amountToMove;
shiftIfNotNull(location, amountToMove);
entity->MoveTo(location);
switch (entityType)
@@ -2338,12 +2338,12 @@ void ShiftMap(const TileCoordsXY& amount)
auto peep = entity->As<Peep>();
if (peep != nullptr)
{
peep->NextLoc += amountToMove;
shiftIfNotNull(peep->NextLoc, amountToMove);
peep->DestinationX += amountToMove.x;
peep->DestinationY += amountToMove.y;
peep->PathfindGoal += amount;
shiftIfNotNull(peep->PathfindGoal, amount);
for (auto& h : peep->PathfindHistory)
h += amount;
shiftIfNotNull(h, amount);
}
break;
}
@@ -2352,8 +2352,8 @@ void ShiftMap(const TileCoordsXY& amount)
auto vehicle = entity->As<Vehicle>();
if (vehicle != nullptr)
{
vehicle->TrackLocation += amountToMove;
vehicle->BoatLocation += amountToMove;
shiftIfNotNull(vehicle->TrackLocation, amountToMove);
shiftIfNotNull(vehicle->BoatLocation, amountToMove);
}
break;
}
@@ -2389,7 +2389,7 @@ void ShiftMap(const TileCoordsXY& amount)
{
auto positions = patrol->ToVector();
for (auto& p : positions)
p += amount;
shiftIfNotNull(p, amount);
patrol->Clear();
patrol->Union(positions);
}
@@ -2426,7 +2426,7 @@ void ShiftMap(const TileCoordsXY& amount)
auto* banner = GetBanner(id);
if (banner != nullptr)
{
banner->position += amount;
shiftIfNotNull(banner->position, amount);
count++;
}
id = BannerIndex::FromUnderlying(id.ToUnderlying() + 1);