From 0423397c34a6885d87dc86d2e8ed00c6789577a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= Date: Thu, 5 Oct 2017 20:46:50 +0200 Subject: [PATCH] Fix #6376: RideCreateAction::Query ignores valid secondary colour input --- src/openrct2/actions/RideCreateAction.hpp | 3 ++- src/openrct2/network/network.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 19347e736c..cb5b21c857 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -98,7 +98,8 @@ public: rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); vehicle_colour_preset_list *presetList = rideEntry->vehicle_preset_list; - if (_colour2 >= presetList->count) + if ((presetList->count == 255 && _colour2 != 255) || + (presetList->count != 255 && _colour2 >= presetList->count)) { // FIXME: Add new error string. return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_INVALID_RIDE_TYPE); diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 91b9b3dd20..a1f8641a6c 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 "6" +#define NETWORK_STREAM_VERSION "7" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #ifdef __cplusplus