mirror of https://github.com/OpenRCT2/OpenRCT2.git
Replace C casts and fix rebase error
This commit is contained in:
parent
fc66990543
commit
e587580653
|
@ -191,7 +191,7 @@ namespace OpenRCT2
|
|||
if (obj != nullptr)
|
||||
{
|
||||
auto entry = obj->GetObjectEntry();
|
||||
auto type = (uint16_t)(entry->flags & 0x0F);
|
||||
auto type = static_cast<uint16_t>(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);
|
||||
|
|
Loading…
Reference in New Issue