From 6695a4ce139c367ffc61790c8755bb4abbad047c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 16 Oct 2017 23:20:50 +0200 Subject: [PATCH] Fix #6497: Boat hire boats do not return to station Credit goes to @duncanspumpkin --- src/openrct2/network/network.h | 2 +- src/openrct2/ride/Vehicle.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 7fd52429f5..d8a66a7358 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -51,7 +51,7 @@ typedef struct GameAction GameAction; // This define specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "16" +#define NETWORK_STREAM_VERSION "17" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #ifdef __cplusplus diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 07a4a68d3e..64c5c1730b 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -4588,8 +4588,8 @@ static void vehicle_update_boat_location(rct_vehicle * vehicle) if (scenario_rand() & 1) { LocationXY16 destLocation = { - static_cast(returnPosition.x * 32 - TileDirectionDelta[returnDirection].x + 16), - static_cast(returnPosition.y * 32 - TileDirectionDelta[returnDirection].y + 16) + static_cast(returnPosition.x * 32 - TileDirectionDelta[returnDirection].x + 16), + static_cast(returnPosition.y * 32 - TileDirectionDelta[returnDirection].y + 16) }; destLocation.x -= vehicle->x;