From f97068d0b60b23730d0cb669a3dc59385b50c37b Mon Sep 17 00:00:00 2001 From: Duncan Date: Wed, 11 Oct 2017 06:58:49 +0100 Subject: [PATCH] Fix #6420: Demolishing rides refunds twice as much as the ride costs to build --- src/openrct2/network/network.h | 2 +- src/openrct2/ride/ride.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 4696fa5d0c..a03d636af2 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 "12" +#define NETWORK_STREAM_VERSION "13" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #ifdef __cplusplus diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index e003186832..7371658d70 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -5480,7 +5480,7 @@ sint32 ride_get_refund_price(sint32 ride_id) if (type != TRACK_ELEM_INVERTED_90_DEG_UP_TO_FLAT_QUARTER_LOOP){ money32 removePrice = game_do_command( x, - GAME_COMMAND_FLAG_APPLY | (rotation << 8), + GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | (rotation << 8), y, type | (map_element_get_track_sequence(it.element) << 8), GAME_COMMAND_REMOVE_TRACK, @@ -5498,7 +5498,7 @@ sint32 ride_get_refund_price(sint32 ride_id) // Using GAME_COMMAND_FLAG_2 for below commands as a HACK to stop fences from being removed refundPrice += game_do_command( x, - GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (0 << 8), + GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (0 << 8), y, ride_id | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, @@ -5507,7 +5507,7 @@ sint32 ride_get_refund_price(sint32 ride_id) refundPrice += game_do_command( x, - GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (1 << 8), + GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (1 << 8), y + 16, ride_id | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, @@ -5516,7 +5516,7 @@ sint32 ride_get_refund_price(sint32 ride_id) refundPrice += game_do_command( x + 16, - GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (2 << 8), + GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (2 << 8), y + 16, ride_id | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, @@ -5525,7 +5525,7 @@ sint32 ride_get_refund_price(sint32 ride_id) refundPrice += game_do_command( x + 16, - GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (3 << 8), + GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_2 | (3 << 8), y, ride_id | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK,