From e58758065382d86ad1152ebbf7de20f601ff506e Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 2 Jun 2020 22:59:26 +0200 Subject: [PATCH] Replace C casts and fix rebase error --- src/openrct2/ParkFile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index 062b7cf796..d7577362ba 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -191,7 +191,7 @@ namespace OpenRCT2 if (obj != nullptr) { auto entry = obj->GetObjectEntry(); - auto type = (uint16_t)(entry->flags & 0x0F); + auto type = static_cast(entry->flags & 0x0F); type |= 0x8000; // Make as legacy object cs.Write(type); cs.Write(std::string_view(entry->name, 8)); @@ -233,7 +233,7 @@ namespace OpenRCT2 cs.ReadWrite(gScenarioCompletedCompanyValue); if (gScenarioCompletedCompanyValue == MONEY32_UNDEFINED - || gScenarioCompletedCompanyValue == (money32)0x80000001) + || gScenarioCompletedCompanyValue == COMPANY_VALUE_ON_FAILED_OBJECTIVE) { cs.Write(""); } @@ -531,8 +531,8 @@ namespace OpenRCT2 cs.ReadWrite(ride.custom_name); cs.ReadWrite(ride.default_name_number); - cs.ReadWrite(ride.price); - cs.ReadWrite(ride.price_secondary); + cs.ReadWrite(ride.price[0]); + cs.ReadWrite(ride.price[1]); // Colours cs.ReadWrite(ride.entrance_style);