From 80e3b736d7bd0d09e3fa5e870a52813ed95463e2 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Tue, 3 Apr 2018 19:36:50 +0100
Subject: [PATCH] Fix travis errors

---
 src/openrct2/peep/Guest.cpp | 6 +++---
 src/openrct2/peep/Peep.cpp  | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp
index 026e6b29e2..dd0b3e1a39 100644
--- a/src/openrct2/peep/Guest.cpp
+++ b/src/openrct2/peep/Guest.cpp
@@ -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);
diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp
index 8ee4caceac..2da15e8a77 100644
--- a/src/openrct2/peep/Peep.cpp
+++ b/src/openrct2/peep/Peep.cpp
@@ -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",