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

Change value of COORDS_NULL to a less likely to collide value. (#10423) 

It will also now match LOCATION_NULL. As this change should only affect in memory coords there should be no save, replay, network issues.
This commit is contained in:
Duncan 2019-12-22 13:03:32 +00:00 committed by Michael Steenbeek
parent e61401e48c
commit 96ff8fe7a1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/ride/Ride.cpp
View File

@ -4282,7 +4282,7 @@ static void ride_set_maze_entrance_exit_points(Ride* ride)
*position++ = exit;
}
}
(*position++).x = COORDS_NULL;
(*position++).setNull();
// Enumerate entrance and exit positions
for (position = positions; !(*position).isNull(); position++)

2
src/openrct2/ride/Station.cpp
View File

@ -373,7 +373,7 @@ int8_t ride_get_first_valid_station_exit(Ride* ride)
{
for (int32_t i = 0; i < MAX_STATIONS; i++)
{
if (ride->stations[i].Exit.x != COORDS_NULL)
if (!ride->stations[i].Exit.isNull())
{
return i;
}

2
src/openrct2/world/Location.hpp
View File

@ -59,7 +59,7 @@ struct LocationXYZ16
assert_struct_size(LocationXYZ16, 6);
#pragma pack(pop)
constexpr int32_t COORDS_NULL = -1;
constexpr int32_t COORDS_NULL = 0xFFFF8000;
struct ScreenCoordsXY
{