mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity

Replace remaining usages of money16, money32 (#19469)

Browse Source 
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
This commit is contained in:
Michael Steenbeek
2023-03-02 22:55:42 +01:00
committed by GitHub
parent 6a89dfbfe9
commit dd624f9bff
105 changed files with 535 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/object/FootpathItemObject.cpp
View File

@@ -27,7 +27,7 @@ void FootpathItemObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
_legacyType.flags = stream->ReadValue<uint16_t>();
_legacyType.draw_type = static_cast<PathBitDrawType>(stream->ReadValue<uint8_t>());
_legacyType.tool_id = static_cast<CursorID>(stream->ReadValue<uint8_t>());
_legacyType.price = stream->ReadValue<int16_t>();
_legacyType.price = stream->ReadValue<money16>();
_legacyType.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
stream->Seek(2, OpenRCT2::STREAM_SEEK_CURRENT);
@@ -39,7 +39,7 @@ void FootpathItemObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
GetImageTable().Read(context, stream);
// Validate properties
if (_legacyType.price <= 0)
if (_legacyType.price <= 0.00_GBP)
{
context->LogError(ObjectError::InvalidProperty, "Price can not be free or negative.");
}
@@ -109,7 +109,7 @@ void FootpathItemObject::ReadJson(IReadObjectContext* context, json_t& root)
{
_legacyType.draw_type = ParseDrawType(Json::GetString(properties["renderAs"]));
_legacyType.tool_id = Cursor::FromString(Json::GetString(properties["cursor"]), CursorID::LamppostDown);
_legacyType.price = Json::GetNumber<int16_t>(properties["price"]);
_legacyType.price = Json::GetNumber<money64>(properties["price"]);
SetPrimarySceneryGroup(ObjectEntryDescriptor(Json::GetString(properties["sceneryGroup"])));