mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

More CoordsXYZ(D) conversion

Browse Source
This commit is contained in:
Gymnasiast
2020-03-07 22:14:29 +01:00
parent ad91654a3d
commit 27af60f062
3 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/actions/TrackPlaceAction.hpp
View File

@@ -348,7 +348,7 @@ public:
} }
if ((entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN) && trackBlock->index == 0) if ((entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN) && trackBlock->index == 0)
{ {
if (!track_add_station_element(mapLoc.x, mapLoc.y, baseZ / COORDS_Z_STEP, _origin.direction, _rideIndex, 0)) if (!track_add_station_element({ mapLoc, baseZ / COORDS_Z_STEP, _origin.direction }, _rideIndex, 0))
{ {
return std::make_unique<TrackPlaceActionResult>(GA_ERROR::UNKNOWN, gGameCommandErrorText); return std::make_unique<TrackPlaceActionResult>(GA_ERROR::UNKNOWN, gGameCommandErrorText);
} }
@@ -665,8 +665,7 @@ public:
{ {
if (trackBlock->index == 0) if (trackBlock->index == 0)
{ {
track_add_station_element( track_add_station_element({ mapLoc, _origin.direction }, _rideIndex, GAME_COMMAND_FLAG_APPLY);
mapLoc.x, mapLoc.y, mapLoc.z / COORDS_Z_STEP, _origin.direction, _rideIndex, GAME_COMMAND_FLAG_APPLY);
} }
sub_6CB945(ride); sub_6CB945(ride);
ride->UpdateMaxVehicles(); ride->UpdateMaxVehicles();

88
src/openrct2/ride/Track.cpp
View File

@@ -596,7 +596,7 @@ const rct_preview_track* get_track_def_from_ride_index(ride_id_t rideIndex, int3
return get_track_def_from_ride(get_ride(rideIndex), trackType); return get_track_def_from_ride(get_ride(rideIndex), trackType);
} }
static TileElement* find_station_element(const CoordsXYZ& loc, int32_t direction, ride_id_t rideIndex) static TileElement* find_station_element(const CoordsXYZD& loc, ride_id_t rideIndex)
{ {
TileElement* tileElement = map_get_first_element_at(loc); TileElement* tileElement = map_get_first_element_at(loc);
if (tileElement == nullptr) if (tileElement == nullptr)
@@ -607,7 +607,7 @@ static TileElement* find_station_element(const CoordsXYZ& loc, int32_t direction
continue; continue;
if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK)
continue; continue;
if (tileElement->GetDirection() != direction) if (tileElement->GetDirection() != loc.direction)
continue; continue;
if (tileElement->AsTrack()->GetRideIndex() != rideIndex) if (tileElement->AsTrack()->GetRideIndex() != rideIndex)
continue; continue;
@@ -619,12 +619,12 @@ static TileElement* find_station_element(const CoordsXYZ& loc, int32_t direction
return nullptr; return nullptr;
} }
static void ride_remove_station(Ride* ride, int32_t x, int32_t y, int32_t z) static void ride_remove_station(Ride* ride, CoordsXYZ location)
{ {
for (int32_t i = 0; i < MAX_STATIONS; i++) for (int32_t i = 0; i < MAX_STATIONS; i++)
{ {
auto stationStart = ride->stations[i].GetStart(); auto stationStart = ride->stations[i].GetStart();
if (stationStart.x == x && stationStart.y == y && ride->stations[i].Height == z) if (stationStart == location)
{ {
ride->stations[i].Start.setNull(); ride->stations[i].Start.setNull();
ride->num_stations--; ride->num_stations--;
@@ -637,16 +637,14 @@ static void ride_remove_station(Ride* ride, int32_t x, int32_t y, int32_t z)
* *
* rct2: 0x006C4D89 * rct2: 0x006C4D89
*/ */
bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags) bool track_add_station_element(CoordsXYZD loc, ride_id_t rideIndex, int32_t flags)
{ {
auto ride = get_ride(rideIndex); auto ride = get_ride(rideIndex);
if (ride == nullptr) if (ride == nullptr)
return false; return false;
int32_t stationX0 = x; CoordsXY stationLoc0 = loc;
int32_t stationY0 = y; CoordsXY stationLoc1 = loc;
int32_t stationX1 = x;
int32_t stationY1 = y;
int32_t stationLength = 1; int32_t stationLength = 1;
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3))
@@ -661,9 +659,9 @@ bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t directio
int8_t stationIndex = ride_get_first_empty_station_start(ride); int8_t stationIndex = ride_get_first_empty_station_start(ride);
assert(stationIndex != -1); assert(stationIndex != -1);
ride->stations[stationIndex].Start.x = x; ride->stations[stationIndex].Start.x = loc.x;
ride->stations[stationIndex].Start.y = y; ride->stations[stationIndex].Start.y = loc.y;
ride->stations[stationIndex].Height = z; ride->stations[stationIndex].Height = loc.z / COORDS_Z_STEP;
ride->stations[stationIndex].Depart = 1; ride->stations[stationIndex].Depart = 1;
ride->stations[stationIndex].Length = 0; ride->stations[stationIndex].Length = 0;
ride->num_stations++; ride->num_stations++;
@@ -674,56 +672,50 @@ bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t directio
TileElement* stationElement; TileElement* stationElement;
// Search backwards for more station // Search backwards for more station
x = stationX0; loc = { stationLoc0, loc.z, loc.direction };
y = stationY0;
do do
{ {
x -= CoordsDirectionDelta[direction].x; loc -= CoordsDirectionDelta[loc.direction];
y -= CoordsDirectionDelta[direction].y;
stationElement = find_station_element({ x, y, z * COORDS_Z_STEP }, direction, rideIndex); stationElement = find_station_element(loc, rideIndex);
if (stationElement != nullptr) if (stationElement != nullptr)
{ {
if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION) if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION)
{ {
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
{ {
ride_remove_station(ride, x, y, z); ride_remove_station(ride, loc);
} }
} }
stationX0 = x; stationLoc0 = loc;
stationY0 = y;
stationLength++; stationLength++;
} }
} while (stationElement != nullptr); } while (stationElement != nullptr);
// Search forwards for more station // Search forwards for more station
x = stationX1; loc = { stationLoc1, loc.z, loc.direction };
y = stationY1;
do do
{ {
x += CoordsDirectionDelta[direction].x; loc += CoordsDirectionDelta[loc.direction];
y += CoordsDirectionDelta[direction].y;
stationElement = find_station_element({ x, y, z * COORDS_Z_STEP }, direction, rideIndex); stationElement = find_station_element(loc, rideIndex);
if (stationElement != nullptr) if (stationElement != nullptr)
{ {
if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION) if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION)
{ {
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
{ {
ride_remove_station(ride, x, y, z); ride_remove_station(ride, loc);
} }
} }
stationX1 = x; stationLoc1 = loc;
stationY1 = y;
stationLength++; stationLength++;
} }
} while (stationElement != nullptr); } while (stationElement != nullptr);
if (stationX0 == stationX1 && stationY0 == stationY1 && ride->num_stations >= MAX_STATIONS) if (stationLoc0 == stationLoc1 && ride->num_stations >= MAX_STATIONS)
{ {
gGameCommandErrorText = STR_NO_MORE_STATIONS_ALLOWED_ON_THIS_RIDE; gGameCommandErrorText = STR_NO_MORE_STATIONS_ALLOWED_ON_THIS_RIDE;
return false; return false;
@@ -737,33 +729,31 @@ bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t directio
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
{ {
x = stationX1; loc = { stationLoc1, loc.z, loc.direction };
y = stationY1;
bool finaliseStationDone; bool finaliseStationDone;
do do
{ {
finaliseStationDone = true; finaliseStationDone = true;
stationElement = find_station_element({ x, y, z * COORDS_Z_STEP }, direction, rideIndex); stationElement = find_station_element(loc, rideIndex);
if (stationElement != nullptr) if (stationElement != nullptr)
{ {
int32_t targetTrackType; int32_t targetTrackType;
if (x == stationX1 && y == stationY1) if (stationLoc1 == loc)
{ {
int8_t stationIndex = ride_get_first_empty_station_start(ride); int8_t stationIndex = ride_get_first_empty_station_start(ride);
assert(stationIndex != -1); assert(stationIndex != -1);
ride->stations[stationIndex].Start.x = x; ride->stations[stationIndex].Start = loc;
ride->stations[stationIndex].Start.y = y; ride->stations[stationIndex].Height = loc.z / COORDS_Z_STEP;
ride->stations[stationIndex].Height = z;
ride->stations[stationIndex].Depart = 1; ride->stations[stationIndex].Depart = 1;
ride->stations[stationIndex].Length = stationLength; ride->stations[stationIndex].Length = stationLength;
ride->num_stations++; ride->num_stations++;
targetTrackType = TRACK_ELEM_END_STATION; targetTrackType = TRACK_ELEM_END_STATION;
} }
else if (x == stationX0 && y == stationY0) else if (stationLoc0 == loc)
{ {
targetTrackType = TRACK_ELEM_BEGIN_STATION; targetTrackType = TRACK_ELEM_BEGIN_STATION;
} }
@@ -773,12 +763,11 @@ bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t directio
} }
stationElement->AsTrack()->SetTrackType(targetTrackType); stationElement->AsTrack()->SetTrackType(targetTrackType);
map_invalidate_element({ x, y }, stationElement); map_invalidate_element(loc, stationElement);
if (x != stationX0 || y != stationY0) if (stationLoc0 != loc)
{ {
x -= CoordsDirectionDelta[direction].x; loc -= CoordsDirectionDelta[loc.direction];
y -= CoordsDirectionDelta[direction].y;
finaliseStationDone = false; finaliseStationDone = false;
} }
} }
@@ -791,7 +780,7 @@ bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t directio
* *
* rct2: 0x006C494B * rct2: 0x006C494B
*/ */
bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags) bool track_remove_station_element(int32_t x, int32_t y, int32_t z, Direction direction, ride_id_t rideIndex, int32_t flags)
{ {
auto ride = get_ride(rideIndex); auto ride = get_ride(rideIndex);
if (ride == nullptr) if (ride == nullptr)
@@ -808,13 +797,12 @@ bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direc
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3))
{ {
TileElement* tileElement = map_get_track_element_at_with_direction_from_ride( TileElement* tileElement = map_get_track_element_at_with_direction_from_ride({ x, y, z << 3, direction }, rideIndex);
{ x, y, z << 3, static_cast<Direction>(direction) }, rideIndex);
if (tileElement != nullptr) if (tileElement != nullptr)
{ {
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
{ {
ride_remove_station(ride, x, y, z); ride_remove_station(ride, { x, y, z * COORDS_Z_STEP });
} }
} }
return true; return true;
@@ -825,13 +813,13 @@ bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direc
// Search backwards for more station // Search backwards for more station
x = stationX0; x = stationX0;
y = stationY0; y = stationY0;
while ((stationElement = find_station_element({ x, y, z * COORDS_Z_STEP }, direction, rideIndex)) != nullptr) while ((stationElement = find_station_element({ x, y, z * COORDS_Z_STEP, direction }, rideIndex)) != nullptr)
{ {
if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION) if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION)
{ {
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
{ {
ride_remove_station(ride, x, y, z); ride_remove_station(ride, { x, y, z * COORDS_Z_STEP });
} }
} }
@@ -851,14 +839,14 @@ bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direc
x += CoordsDirectionDelta[direction].x; x += CoordsDirectionDelta[direction].x;
y += CoordsDirectionDelta[direction].y; y += CoordsDirectionDelta[direction].y;
stationElement = find_station_element({ x, y, z * COORDS_Z_STEP }, direction, rideIndex); stationElement = find_station_element({ x, y, z * COORDS_Z_STEP, direction }, rideIndex);
if (stationElement != nullptr) if (stationElement != nullptr)
{ {
if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION) if (stationElement->AsTrack()->GetTrackType() == TRACK_ELEM_END_STATION)
{ {
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
{ {
ride_remove_station(ride, x, y, z); ride_remove_station(ride, { x, y, z * COORDS_Z_STEP });
} }
} }
@@ -891,7 +879,7 @@ bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direc
if (x != removeX || y != removeY) if (x != removeX || y != removeY)
{ {
stationElement = find_station_element({ x, y, z * COORDS_Z_STEP }, direction, rideIndex); stationElement = find_station_element({ x, y, z * COORDS_Z_STEP, direction }, rideIndex);
if (stationElement != nullptr) if (stationElement != nullptr)
{ {
int32_t targetTrackType; int32_t targetTrackType;

4
src/openrct2/ride/Track.h
View File

@@ -546,8 +546,8 @@ int32_t track_get_actual_bank(TileElement* tileElement, int32_t bank);
int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank); int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank);
int32_t track_get_actual_bank_3(Vehicle* vehicle, TileElement* tileElement); int32_t track_get_actual_bank_3(Vehicle* vehicle, TileElement* tileElement);
bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags); bool track_add_station_element(CoordsXYZD loc, ride_id_t rideIndex, int32_t flags);
bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags); bool track_remove_station_element(int32_t x, int32_t y, int32_t z, Direction direction, ride_id_t rideIndex, int32_t flags);
money32 maze_set_track( money32 maze_set_track(
uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, ride_id_t rideIndex, uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, ride_id_t rideIndex,