From ac7652f61d2a2160eb05044e42ba2a43fc37b592 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Tue, 17 Oct 2017 17:12:49 +0200
Subject: [PATCH] Create define for MONEY16_UNDEFINED

---
 src/openrct2/actions/RideCreateAction.hpp | 2 +-
 src/openrct2/common.h                     | 1 +
 src/openrct2/management/Finance.cpp       | 2 +-
 src/openrct2/ride/ride.c                  | 2 +-
 src/openrct2/windows/Ride.cpp             | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp
index 5b687078de..e07824a61f 100644
--- a/src/openrct2/actions/RideCreateAction.hpp
+++ b/src/openrct2/actions/RideCreateAction.hpp
@@ -280,7 +280,7 @@ public:
         ride->music_tune_id = 255;
 
         ride->breakdown_reason = 255;
-        ride->upkeep_cost = (money16)-1;
+        ride->upkeep_cost = MONEY16_UNDEFINED;
         ride->reliability = RIDE_INITIAL_RELIABILITY;
         ride->unreliability_factor = 1;
         ride->inspection_interval = RIDE_INSPECTION_EVERY_30_MINUTES;
diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 27f1b3abca..10766eb619 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -182,6 +182,7 @@ typedef fixed64_1dp money64;
 #define MONEY(whole, fraction)          ((whole) * 10 + ((fraction) / 10))
 
 #define MONEY_FREE                      MONEY(0,00)
+#define MONEY16_UNDEFINED               (money16)(uint16)0xFFFF
 #define MONEY32_UNDEFINED               ((money32)0x80000000)
 
 typedef void (EMPTY_ARGS_VOID_POINTER)();
diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp
index 55e8a0ee34..7d7fc2cad7 100644
--- a/src/openrct2/management/Finance.cpp
+++ b/src/openrct2/management/Finance.cpp
@@ -268,7 +268,7 @@ void finance_update_daily_profit()
         sint32 i;
         FOR_ALL_RIDES(i, ride)
         {
-            if (ride->status != RIDE_STATUS_CLOSED && ride->upkeep_cost != -1)
+            if (ride->status != RIDE_STATUS_CLOSED && ride->upkeep_cost != MONEY16_UNDEFINED)
             {
                 current_profit -= 2 * ride->upkeep_cost;
             }
diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
index 6bd6da3392..5f6045b344 100644
--- a/src/openrct2/ride/ride.c
+++ b/src/openrct2/ride/ride.c
@@ -2020,7 +2020,7 @@ static void ride_update(sint32 rideIndex)
         ride->income_per_hour = ride_calculate_income_per_hour(ride);
         ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
 
-        if (ride->upkeep_cost != (money16)(uint16)0xFFFF)
+        if (ride->upkeep_cost != MONEY16_UNDEFINED)
             ride->profit = (ride->income_per_hour - ((money32)ride->upkeep_cost * 16));
     }
 
diff --git a/src/openrct2/windows/Ride.cpp b/src/openrct2/windows/Ride.cpp
index 1e954443cb..3852819a05 100644
--- a/src/openrct2/windows/Ride.cpp
+++ b/src/openrct2/windows/Ride.cpp
@@ -6209,7 +6209,7 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi)
 
     // Running cost per hour
     costPerHour = ride->upkeep_cost * 16;
-    stringId = ride->upkeep_cost == (money16)(uint16)0xFFFF ? STR_RUNNING_COST_UNKNOWN : STR_RUNNING_COST_PER_HOUR;
+    stringId = ride->upkeep_cost == MONEY16_UNDEFINED ? STR_RUNNING_COST_UNKNOWN : STR_RUNNING_COST_PER_HOUR;
     gfx_draw_string_left(dpi, stringId, &costPerHour, COLOUR_BLACK, x, y);
     y += 10;