mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Fix travis errors

Browse Source
This commit is contained in:
duncanspumpkin
2018-04-03 19:36:50 +01:00
parent 2488cb9c3a
commit 80e3b736d7
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,8 +266,8 @@ void rct_peep::UpdateSitting()
sint32 ebx = var_37 & 0x7;
LocationXYZ16 loc =
{
(x & 0xFFE0) + _981F2C[ebx].x,
(y & 0xFFE0) + _981F2C[ebx].y,
(sint16)((x & 0xFFE0) + _981F2C[ebx].x),
(sint16)((y & 0xFFE0) + _981F2C[ebx].y),
z
};
@@ -2829,7 +2829,7 @@ void rct_peep::UpdateRideMazePathfinding()
if (openHedges == 0)
return;
uint8 mazeLastEdge = mazeLastEdge ^ (1 << 1);
uint8 mazeLastEdge = maze_last_edge ^ (1 << 1);
openHedges &= ~(1 << mazeLastEdge);
if (openHedges == 0)
openHedges |= (1 << mazeLastEdge);

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

@@ -98,8 +98,6 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep * peep, sint32 ride
static void peep_give_real_name(rct_peep * peep);
static void peep_release_balloon(rct_peep * peep, sint16 spawn_height);
bool loc_690FD0(rct_peep * peep, uint8 * rideToView, uint8 * rideSeatToView, rct_tile_element * tileElement);
// clang-format off
static constexpr const char *gPeepEasterEggNames[] = {
"MICHAEL SCHUMACHER",