From d24961640a7444a100b9e2cf741b077f051ef625 Mon Sep 17 00:00:00 2001
From: LRFLEW <lrflew@aol.com>
Date: Thu, 9 Mar 2017 14:03:23 -0600
Subject: [PATCH] Update Xcode Project

Fix warning

Fix warning
---
 OpenRCT2.xcodeproj/project.pbxproj | 4 ++++
 src/openrct2/world/entrance.cpp    | 4 ++--
 src/openrct2/world/entrance.h      | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj
index ce2d6133d5..13ff135cf6 100644
--- a/OpenRCT2.xcodeproj/project.pbxproj
+++ b/OpenRCT2.xcodeproj/project.pbxproj
@@ -467,6 +467,7 @@
 		D46F2A9E1D39A25A00A36AB7 /* peep_data.c in Sources */ = {isa = PBXBuildFile; fileRef = D46F2A9D1D39A25A00A36AB7 /* peep_data.c */; };
 		D47304D51C4FF8250015C0EA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D47304D41C4FF8250015C0EA /* libz.tbd */; };
 		D48A8D831D00272F00649DA7 /* TcpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D48A8D811D00272F00649DA7 /* TcpSocket.cpp */; };
+		D48ABABA1E71EBD500A3E39C /* entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D48ABAB91E71EBD500A3E39C /* entrance.cpp */; };
 		D49464781E4DB27B00DC690E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D49464771E4DB27B00DC690E /* sprite.cpp */; };
 		D49766831D03B9FE002222CD /* SoftwareDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D49766811D03B9FE002222CD /* SoftwareDrawingEngine.cpp */; };
 		D49766861D03BAA5002222CD /* NewDrawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D49766841D03BAA5002222CD /* NewDrawing.cpp */; };
@@ -1222,6 +1223,7 @@
 		D4895D321C23EFDD000CD788 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = distribution/macos/Info.plist; sourceTree = SOURCE_ROOT; };
 		D48A8D811D00272F00649DA7 /* TcpSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TcpSocket.cpp; sourceTree = "<group>"; usesTabs = 0; };
 		D48A8D821D00272F00649DA7 /* TcpSocket.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = TcpSocket.h; sourceTree = "<group>"; usesTabs = 0; };
+		D48ABAB91E71EBD500A3E39C /* entrance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entrance.cpp; sourceTree = "<group>"; };
 		D49464771E4DB27B00DC690E /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite.cpp; sourceTree = "<group>"; };
 		D49766811D03B9FE002222CD /* SoftwareDrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoftwareDrawingEngine.cpp; sourceTree = "<group>"; };
 		D49766841D03BAA5002222CD /* NewDrawing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewDrawing.cpp; sourceTree = "<group>"; usesTabs = 0; };
@@ -2044,6 +2046,7 @@
 				D44271DA1CC81B3200D84D28 /* banner.c */,
 				D44271DB1CC81B3200D84D28 /* banner.h */,
 				D44271DE1CC81B3200D84D28 /* duck.c */,
+				D48ABAB91E71EBD500A3E39C /* entrance.cpp */,
 				D44271DF1CC81B3200D84D28 /* entrance.h */,
 				D44271E01CC81B3200D84D28 /* footpath.c */,
 				D44271E11CC81B3200D84D28 /* footpath.h */,
@@ -3020,6 +3023,7 @@
 				C686F9361CDBC3B7009F9BFC /* mini_helicopters.c in Sources */,
 				C686F93F1CDBC3B7009F9BFC /* enterprise.c in Sources */,
 				C686F91B1CDBC3B7009F9BFC /* mini_roller_coaster.c in Sources */,
+				D48ABABA1E71EBD500A3E39C /* entrance.cpp in Sources */,
 				D464FEE51D31A6AA00CBABAC /* BannerObject.cpp in Sources */,
 				D44272391CC81B3200D84D28 /* peep.c in Sources */,
 				D44272681CC81B3200D84D28 /* land_rights.c in Sources */,
diff --git a/src/openrct2/world/entrance.cpp b/src/openrct2/world/entrance.cpp
index 889a8dd698..fbfdd079b7 100644
--- a/src/openrct2/world/entrance.cpp
+++ b/src/openrct2/world/entrance.cpp
@@ -560,7 +560,7 @@ static money32 RideEntranceExitRemove(sint16 x, sint16 y, uint8 rideIndex, uint8
     return 0;
 }
 
-money32 RideEntranceExitPlaceGhost(uint8 rideIndex, sint16 x, sint16 y, uint8 direction, uint8 placeType, uint8 stationNum)
+static money32 RideEntranceExitPlaceGhost(uint8 rideIndex, sint16 x, sint16 y, uint8 direction, uint8 placeType, uint8 stationNum)
 {
     return game_do_command(
         x,
@@ -773,7 +773,7 @@ extern "C"
             *ebx & 0xFF,
             *edx & 0xFF,
             *edi & 0xFF,
-            (*edx >> 8) & 0xFF
+            ((*edx >> 8) & 0xFF) != 0
             );
     }
 
diff --git a/src/openrct2/world/entrance.h b/src/openrct2/world/entrance.h
index 94deae6a17..5b6029ff06 100644
--- a/src/openrct2/world/entrance.h
+++ b/src/openrct2/world/entrance.h
@@ -31,9 +31,9 @@ assert_struct_size(rct_entrance_type, 8);
 
 void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp);
 
-typedef struct rct_xyz16;
-typedef struct rct_xyzd16;
-typedef struct rct_map_element;
+typedef struct rct_xyz16 rct_xyz16;
+typedef struct rct_xyzd16 rct_xyzd16;
+typedef struct rct_map_element rct_map_element;
 
 extern bool gParkEntranceGhostExists;
 extern rct_xyz16 gParkEntranceGhostPosition;