From e5aa3b33f2dbd480b45635626f7b3cc0a6ff3611 Mon Sep 17 00:00:00 2001 From: spacek531 Date: Sat, 20 Sep 2025 00:39:50 -0700 Subject: [PATCH] Use regular interval for swing sprite threshold (#25171) * use regular interval for swing sprite threshold * bump network * bump park file version --- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/park/ParkFile.h | 2 +- src/openrct2/ride/Vehicle.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index fee5e96306..67f02fe507 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -47,7 +47,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -constexpr uint8_t kStreamVersion = 5; +constexpr uint8_t kStreamVersion = 6; const std::string kStreamID = std::string(kOpenRCT2Version) + "-" + std::to_string(kStreamVersion); diff --git a/src/openrct2/park/ParkFile.h b/src/openrct2/park/ParkFile.h index c3459b9cde..9cd5c8399a 100644 --- a/src/openrct2/park/ParkFile.h +++ b/src/openrct2/park/ParkFile.h @@ -21,7 +21,7 @@ namespace OpenRCT2 struct ObjectRepositoryItem; // Current version that is saved. - constexpr uint32_t kParkFileCurrentVersion = 58; + constexpr uint32_t kParkFileCurrentVersion = 59; // The minimum version that is forwards compatible with the current version. constexpr uint32_t kParkFileMinVersion = 57; diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index a151779218..bacd2801b2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -5788,19 +5788,19 @@ int32_t Vehicle::GetSwingAmount() const static uint8_t GetSwingSprite(int16_t swingPosition) { - if (swingPosition < -10012) + if (swingPosition < -10010) return 11; - if (swingPosition > 10012) + if (swingPosition > 10010) return 12; - if (swingPosition < -8191) + if (swingPosition < -8190) return 9; - if (swingPosition > 8191) + if (swingPosition > 8190) return 10; - if (swingPosition < -6371) + if (swingPosition < -6370) return 7; - if (swingPosition > 6371) + if (swingPosition > 6370) return 8; if (swingPosition < -4550)