From 4a78fd772ce30331e61fb4c9e0a0aab6fd4f5bb2 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Wed, 1 Mar 2023 21:58:15 +0100
Subject: [PATCH] Fix #19524: Incorrect staff count beyond 32767 (#19530)

---
 data/language/en-GB.txt          | 2 +-
 distribution/changelog.txt       | 1 +
 src/openrct2-ui/windows/Park.cpp | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt
index 96bed8349d..9a7c0f7cde 100644
--- a/data/language/en-GB.txt
+++ b/data/language/en-GB.txt
@@ -1675,7 +1675,7 @@ STR_2314    :{WINDOW_COLOUR_2}Ride length: {BLACK}{STRINGID}
 STR_2315    :{WINDOW_COLOUR_2}Cost: {BLACK}around {CURRENCY}
 STR_2316    :{WINDOW_COLOUR_2}Space required: {BLACK}{COMMA16} × {COMMA16} blocks
 STR_2321    :{WINDOW_COLOUR_2}Number of rides/attractions: {BLACK}{COMMA16}
-STR_2322    :{WINDOW_COLOUR_2}Staff: {BLACK}{COMMA16}
+STR_2322    :{WINDOW_COLOUR_2}Staff: {BLACK}{COMMA32}
 STR_2323    :{WINDOW_COLOUR_2}Park size: {BLACK}{COMMA32}m²
 STR_2324    :{WINDOW_COLOUR_2}Park size: {BLACK}{COMMA32}sq.ft.
 STR_2325    :Buy land to extend park
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 8a5c804f4b..a4dcd895e3 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -56,6 +56,7 @@
 - Fix: [#19391] String corruption caused by an improper buffer handling in ‘GfxWrapString’.
 - Fix: [#19475] Cannot increase loan when more than £1000 in debt.
 - Fix: [#19517] Crash when peeps try to exit or enter hacked rides that have no waypoints specified.
+- Fix: [#19524] Staff counter shows incorrect values if there are more than 32767 staff members.
 
 0.4.3 (2022-12-14)
 ------------------------------------------------------------------------
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index 1dc9456c02..7aa89fe9f0 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -190,8 +190,8 @@ static constexpr const WindowParkAward _parkAwards[] = {
 
 class ParkWindow final : public Window
 {
-    int16_t _numberOfStaff = -1;
-    int16_t _numberOfRides = -1;
+    int32_t _numberOfStaff = -1;
+    int32_t _numberOfRides = -1;
     uint8_t _peepAnimationFrame = 0;
 
 public: