From 784237202b8ffe2097fae34a87fbe053886ca43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 21 Apr 2023 12:58:39 +0200 Subject: [PATCH] Raise water and land height limits to 254 units/182m/600ft (#19988) * Raise water and land height limits to 254 units/182m/600ft New parks load correctly in older versions, but cannot be altered there. Fixes #17739 * Add changelog, bump network and park file version --- distribution/changelog.txt | 1 + src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/park/ParkFile.h | 2 +- src/openrct2/world/Map.h | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 4041782c0e..a572ee1294 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -5,6 +5,7 @@ - Feature: [#19446] Add new color options to color dropdown. - Feature: [#19547] Add large sloped turns to hybrid coaster and single rail coaster. - Feature: [OpenMusic#25] Added Prehistoric ride music style. +- Improved: [#17739] Raise water and land height limits to 254 units/182m/600ft. - Improved: [#18490] Reduce guests walking through trains on level crossing next to station. - Improved: [#18996] When marketing campaigns are disabled, disable the Marketing tab in the Finances window. - Improved: [#19764] Miscellaneous scenery tab now grouped next to the all-scenery tab. diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 4a685f42f2..35a13838b1 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -43,7 +43,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "11" +#define NETWORK_STREAM_VERSION "12" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION diff --git a/src/openrct2/park/ParkFile.h b/src/openrct2/park/ParkFile.h index d6a425e5b7..e42f954674 100644 --- a/src/openrct2/park/ParkFile.h +++ b/src/openrct2/park/ParkFile.h @@ -9,7 +9,7 @@ struct ObjectRepositoryItem; namespace OpenRCT2 { // Current version that is saved. - constexpr uint32_t PARK_FILE_CURRENT_VERSION = 28; + constexpr uint32_t PARK_FILE_CURRENT_VERSION = 29; // The minimum version that is forwards compatible with the current version. constexpr uint32_t PARK_FILE_MIN_VERSION = 28; diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 926886ed3d..6867108061 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -16,10 +16,10 @@ #include #include -#define MINIMUM_LAND_HEIGHT 2 -#define MAXIMUM_LAND_HEIGHT 142 -#define MINIMUM_WATER_HEIGHT 2 -#define MAXIMUM_WATER_HEIGHT 142 +constexpr uint8_t MINIMUM_LAND_HEIGHT = 2; +constexpr uint8_t MAXIMUM_LAND_HEIGHT = 254; +constexpr uint8_t MINIMUM_WATER_HEIGHT = 2; +constexpr uint8_t MAXIMUM_WATER_HEIGHT = 254; #define MINIMUM_MAP_SIZE_TECHNICAL 5 #define MAXIMUM_MAP_SIZE_TECHNICAL 1001