mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Rename Peep::maze_last_edge to MazeLastEdge

Browse Source
This commit is contained in:
Tulio Leao
2020-06-06 11:18:58 -03:00
parent 1a3f8490ad
commit f1f915b540
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@@ -262,7 +262,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, action_frame); COMPARE_FIELD(Peep, action_frame);
COMPARE_FIELD(Peep, step_progress); COMPARE_FIELD(Peep, step_progress);
COMPARE_FIELD(Peep, next_in_queue); COMPARE_FIELD(Peep, next_in_queue);
COMPARE_FIELD(Peep, maze_last_edge); COMPARE_FIELD(Peep, MazeLastEdge);
COMPARE_FIELD(Peep, InteractionRideIndex); COMPARE_FIELD(Peep, InteractionRideIndex);
COMPARE_FIELD(Peep, TimeInQueue); COMPARE_FIELD(Peep, TimeInQueue);
for (int i = 0; i < 32; i++) for (int i = 0; i < 32; i++)

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

@@ -3537,7 +3537,7 @@ static constexpr const CoordsXY _MazeEntranceStart[] = {
static void peep_update_ride_leave_entrance_maze(Guest* peep, Ride* ride, CoordsXYZD& entrance_loc) static void peep_update_ride_leave_entrance_maze(Guest* peep, Ride* ride, CoordsXYZD& entrance_loc)
{ {
peep->maze_last_edge = entrance_loc.direction + 1; peep->MazeLastEdge = entrance_loc.direction + 1;
entrance_loc.x += CoordsDirectionDelta[entrance_loc.direction].x; entrance_loc.x += CoordsDirectionDelta[entrance_loc.direction].x;
entrance_loc.y += CoordsDirectionDelta[entrance_loc.direction].y; entrance_loc.y += CoordsDirectionDelta[entrance_loc.direction].y;
@@ -3546,13 +3546,13 @@ static void peep_update_ride_leave_entrance_maze(Guest* peep, Ride* ride, Coords
if (scenario_rand() & 0x40) if (scenario_rand() & 0x40)
{ {
direction += 4; direction += 4;
peep->maze_last_edge += 2; peep->MazeLastEdge += 2;
} }
direction &= 0xF; direction &= 0xF;
// Direction is 11, 15, 3, or 7 // Direction is 11, 15, 3, or 7
peep->var_37 = direction; peep->var_37 = direction;
peep->maze_last_edge &= 3; peep->MazeLastEdge &= 3;
entrance_loc.x += _MazeEntranceStart[direction / 4].x; entrance_loc.x += _MazeEntranceStart[direction / 4].x;
entrance_loc.y += _MazeEntranceStart[direction / 4].y; entrance_loc.y += _MazeEntranceStart[direction / 4].y;
@@ -4884,7 +4884,7 @@ void Guest::UpdateRideMazePathfinding()
if (openHedges == 0) if (openHedges == 0)
return; return;
uint8_t mazeLastEdge = direction_reverse(maze_last_edge); uint8_t mazeLastEdge = direction_reverse(MazeLastEdge);
openHedges &= ~(1 << mazeLastEdge); openHedges &= ~(1 << mazeLastEdge);
if (openHedges == 0) if (openHedges == 0)
openHedges |= (1 << mazeLastEdge); openHedges |= (1 << mazeLastEdge);
@@ -4934,15 +4934,15 @@ void Guest::UpdateRideMazePathfinding()
switch (mazeType) switch (mazeType)
{ {
case maze_type::invalid: case maze_type::invalid:
maze_last_edge++; MazeLastEdge++;
maze_last_edge &= 3; MazeLastEdge &= 3;
return; return;
case maze_type::hedge: case maze_type::hedge:
destination_x = targetLoc.x; destination_x = targetLoc.x;
destination_y = targetLoc.y; destination_y = targetLoc.y;
var_37 = _MazeGetNewDirectionFromEdge[var_37 / 4][chosenEdge]; var_37 = _MazeGetNewDirectionFromEdge[var_37 / 4][chosenEdge];
maze_last_edge = chosenEdge; MazeLastEdge = chosenEdge;
break; break;
case maze_type::entrance_or_exit: case maze_type::entrance_or_exit:
targetLoc.x = destination_x; targetLoc.x = destination_x;
@@ -4958,7 +4958,7 @@ void Guest::UpdateRideMazePathfinding()
destination_x = targetLoc.x; destination_x = targetLoc.x;
destination_y = targetLoc.y; destination_y = targetLoc.y;
var_37 = 16; var_37 = 16;
maze_last_edge = chosenEdge; MazeLastEdge = chosenEdge;
break; break;
} }

2
src/openrct2/peep/Peep.h
View File

@@ -669,7 +669,7 @@ struct Peep : SpriteBase
}; };
union union
{ {
uint8_t maze_last_edge; uint8_t MazeLastEdge;
Direction PeepDirection; // Direction ? Direction PeepDirection; // Direction ?
}; };
uint8_t InteractionRideIndex; uint8_t InteractionRideIndex;

2
test/tests/S6ImportExportTests.cpp
View File

@@ -206,7 +206,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(action_frame); COMPARE_FIELD(action_frame);
COMPARE_FIELD(step_progress); COMPARE_FIELD(step_progress);
COMPARE_FIELD(next_in_queue); COMPARE_FIELD(next_in_queue);
COMPARE_FIELD(maze_last_edge); COMPARE_FIELD(MazeLastEdge);
COMPARE_FIELD(InteractionRideIndex); COMPARE_FIELD(InteractionRideIndex);
COMPARE_FIELD(TimeInQueue); COMPARE_FIELD(TimeInQueue);
for (int i = 0; i < 32; i++) for (int i = 0; i < 32; i++)