From 1f71d7a24ed832fcd9f6fbdcb08b2a1436b75e7f Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Mon, 10 May 2021 21:54:17 +0100
Subject: [PATCH] Fix more money64 issues

---
 src/openrct2-ui/windows/EditorScenarioOptions.cpp | 4 ++--
 src/openrct2-ui/windows/GameBottomToolbar.cpp     | 4 ++--
 src/openrct2-ui/windows/RideList.cpp              | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
index b10a1c0f23..28e2360159 100644
--- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp
+++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
@@ -970,8 +970,8 @@ static void window_editor_scenario_options_guests_paint(rct_window* w, rct_drawp
         // Cash per guest value
         screenCoords = w->windowPos
             + ScreenCoordsXY{ w->widgets[WIDX_CASH_PER_GUEST].left + 1, w->widgets[WIDX_CASH_PER_GUEST].top };
-        arg = gGuestInitialCash;
-        DrawTextBasic(dpi, screenCoords, STR_CURRENCY_FORMAT_LABEL, &arg);
+        money64 value = gGuestInitialCash;
+        DrawTextBasic(dpi, screenCoords, STR_CURRENCY_FORMAT_LABEL, &value);
     }
 
     // Guest initial happiness label
diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index b3299f2fef..f62e629a70 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -198,8 +198,8 @@ static OpenRCT2String window_game_bottom_toolbar_tooltip(
     switch (widgetIndex)
     {
         case WIDX_MONEY:
-            ft.Add<int32_t>(gCurrentProfit);
-            ft.Add<int32_t>(gParkValue);
+            ft.Add<money64>(gCurrentProfit);
+            ft.Add<money64>(gParkValue);
             break;
         case WIDX_PARK_RATING:
             ft.Add<int16_t>(gParkRating);
diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp
index 549e3a9a7d..12a8d337bc 100644
--- a/src/openrct2-ui/windows/RideList.cpp
+++ b/src/openrct2-ui/windows/RideList.cpp
@@ -628,7 +628,7 @@ static void window_ride_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
                 if (ride->profit != MONEY64_UNDEFINED)
                 {
                     formatSecondary = STR_PROFIT_LABEL;
-                    ft.Add<int32_t>(ride->profit);
+                    ft.Add<money64>(ride->profit);
                 }
                 break;
             case INFORMATION_TYPE_TOTAL_CUSTOMERS:
@@ -640,7 +640,7 @@ static void window_ride_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
                 if (ride->total_profit != MONEY64_UNDEFINED)
                 {
                     formatSecondary = STR_RIDE_LIST_TOTAL_PROFIT_LABEL;
-                    ft.Add<int32_t>(ride->total_profit);
+                    ft.Add<money64>(ride->total_profit);
                 }
                 break;
             case INFORMATION_TYPE_CUSTOMERS:
@@ -670,7 +670,7 @@ static void window_ride_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
                 if (ride->income_per_hour != MONEY64_UNDEFINED)
                 {
                     formatSecondary = STR_RIDE_LIST_INCOME_LABEL;
-                    ft.Add<int32_t>(ride->income_per_hour);
+                    ft.Add<money64>(ride->income_per_hour);
                 }
                 break;
             case INFORMATION_TYPE_RUNNING_COST:
@@ -678,7 +678,7 @@ static void window_ride_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
                 if (ride->upkeep_cost != MONEY16_UNDEFINED)
                 {
                     formatSecondary = STR_RIDE_LIST_RUNNING_COST_LABEL;
-                    ft.Add<int32_t>(ride->upkeep_cost * 16);
+                    ft.Add<money64>(ride->upkeep_cost * 16);
                 }
                 break;
             case INFORMATION_TYPE_QUEUE_LENGTH: