diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 8cabfc6f8d..66f2744310 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -170,7 +170,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Constants - static constexpr StringId _windowFinancesSummaryRowLabels[EnumValue(ExpenditureType::Count)] = { + static constexpr StringId _windowFinancesSummaryRowLabels[EnumValue(ExpenditureType::count)] = { STR_FINANCES_SUMMARY_RIDE_CONSTRUCTION, STR_FINANCES_SUMMARY_RIDE_RUNNING_COSTS, STR_FINANCES_SUMMARY_LAND_PURCHASE, @@ -404,7 +404,7 @@ namespace OpenRCT2::Ui::Windows int32_t row_width = std::max(scrolls[0].contentWidth, self.width()); // Expenditure / Income row labels - for (int32_t i = 0; i < static_cast(ExpenditureType::Count); i++) + for (int32_t i = 0; i < static_cast(ExpenditureType::count); i++) { // Darken every even row if (i % 2 == 0) @@ -438,7 +438,7 @@ namespace OpenRCT2::Ui::Windows // Month expenditures money64 profit = 0; - for (int32_t j = 0; j < static_cast(ExpenditureType::Count); j++) + for (int32_t j = 0; j < static_cast(ExpenditureType::count); j++) { auto expenditure = gameState.park.expenditureTable[i][j]; if (expenditure != 0) @@ -599,7 +599,7 @@ namespace OpenRCT2::Ui::Windows screenCoords.y += 14; // Expenditure / Income row labels - for (int32_t i = 0; i < static_cast(ExpenditureType::Count); i++) + for (int32_t i = 0; i < static_cast(ExpenditureType::count); i++) { // Darken every even row if (i % 2 == 0) diff --git a/src/openrct2/actions/BannerPlaceAction.cpp b/src/openrct2/actions/BannerPlaceAction.cpp index 922abaf03c..dad84d99d8 100644 --- a/src/openrct2/actions/BannerPlaceAction.cpp +++ b/src/openrct2/actions/BannerPlaceAction.cpp @@ -56,7 +56,7 @@ GameActions::Result BannerPlaceAction::Query() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.ErrorTitle = STR_CANT_POSITION_THIS_HERE; if (!LocationValid(_loc)) @@ -118,7 +118,7 @@ GameActions::Result BannerPlaceAction::Execute() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.ErrorTitle = STR_CANT_POSITION_THIS_HERE; if (!MapCheckCapacityAndReorganise(_loc)) diff --git a/src/openrct2/actions/BannerRemoveAction.cpp b/src/openrct2/actions/BannerRemoveAction.cpp index 9691e6a41a..1320a4fbfa 100644 --- a/src/openrct2/actions/BannerRemoveAction.cpp +++ b/src/openrct2/actions/BannerRemoveAction.cpp @@ -46,7 +46,7 @@ void BannerRemoveAction::Serialise(DataSerialiser& stream) GameActions::Result BannerRemoveAction::Query() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; @@ -94,7 +94,7 @@ GameActions::Result BannerRemoveAction::Query() const GameActions::Result BannerRemoveAction::Execute() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; diff --git a/src/openrct2/actions/BannerSetColourAction.cpp b/src/openrct2/actions/BannerSetColourAction.cpp index 10b78d19d7..8a3d7c4125 100644 --- a/src/openrct2/actions/BannerSetColourAction.cpp +++ b/src/openrct2/actions/BannerSetColourAction.cpp @@ -56,7 +56,7 @@ GameActions::Result BannerSetColourAction::Execute() const GameActions::Result BannerSetColourAction::QueryExecute(bool isExecuting) const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index 99089dba12..e6d3e00319 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -63,7 +63,7 @@ GameActions::Result BannerSetStyleAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, errorTitle, STR_ERR_BANNER_ELEMENT_NOT_FOUND); } - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto location = banner->position.ToCoordsXY().ToTileCentre(); res.Position = { location, TileElementHeight(location) }; @@ -133,7 +133,7 @@ GameActions::Result BannerSetStyleAction::Execute() const GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_BANNER_ELEMENT_NOT_FOUND); } - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto location = banner->position.ToCoordsXY().ToTileCentre(); res.Position = { location, TileElementHeight(location) }; diff --git a/src/openrct2/actions/ClearAction.cpp b/src/openrct2/actions/ClearAction.cpp index a8826b8ca1..d1a19d3e64 100644 --- a/src/openrct2/actions/ClearAction.cpp +++ b/src/openrct2/actions/ClearAction.cpp @@ -65,7 +65,7 @@ GameActions::Result ClearAction::CreateResult() const { auto result = GameActions::Result(); result.ErrorTitle = STR_UNABLE_TO_REMOVE_ALL_SCENERY_FROM_HERE; - result.Expenditure = ExpenditureType::Landscaping; + result.Expenditure = ExpenditureType::landscaping; auto x = (_range.GetLeft() + _range.GetRight()) / 2 + 16; auto y = (_range.GetTop() + _range.GetBottom()) / 2 + 16; diff --git a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp index 801e30dc35..c1811d996c 100644 --- a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp +++ b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp @@ -53,7 +53,7 @@ void FootpathAdditionPlaceAction::Serialise(DataSerialiser& stream) GameActions::Result FootpathAdditionPlaceAction::Query() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc; if (!LocationValid(_loc)) { @@ -150,7 +150,7 @@ GameActions::Result FootpathAdditionPlaceAction::Execute() const { auto res = GameActions::Result(); res.Position = _loc; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto tileElement = MapGetFootpathElement(_loc); auto pathElement = tileElement->AsPath(); diff --git a/src/openrct2/actions/FootpathLayoutPlaceAction.cpp b/src/openrct2/actions/FootpathLayoutPlaceAction.cpp index 9399fb1ddd..6eb5371e60 100644 --- a/src/openrct2/actions/FootpathLayoutPlaceAction.cpp +++ b/src/openrct2/actions/FootpathLayoutPlaceAction.cpp @@ -67,7 +67,7 @@ GameActions::Result FootpathLayoutPlaceAction::Query() const { auto res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc.ToTileCentre(); gFootpathGroundFlags = 0; @@ -103,7 +103,7 @@ GameActions::Result FootpathLayoutPlaceAction::Execute() const { auto res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc.ToTileCentre(); if (!(GetFlags() & GAME_COMMAND_FLAG_GHOST)) diff --git a/src/openrct2/actions/FootpathPlaceAction.cpp b/src/openrct2/actions/FootpathPlaceAction.cpp index 270e506f22..5f19db237e 100644 --- a/src/openrct2/actions/FootpathPlaceAction.cpp +++ b/src/openrct2/actions/FootpathPlaceAction.cpp @@ -76,7 +76,7 @@ GameActions::Result FootpathPlaceAction::Query() const { auto res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc.ToTileCentre(); gFootpathGroundFlags = 0; @@ -128,7 +128,7 @@ GameActions::Result FootpathPlaceAction::Execute() const { auto res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc.ToTileCentre(); if (!(GetFlags() & GAME_COMMAND_FLAG_GHOST)) diff --git a/src/openrct2/actions/FootpathRemoveAction.cpp b/src/openrct2/actions/FootpathRemoveAction.cpp index c2eef248aa..b8f633833c 100644 --- a/src/openrct2/actions/FootpathRemoveAction.cpp +++ b/src/openrct2/actions/FootpathRemoveAction.cpp @@ -50,7 +50,7 @@ GameActions::Result FootpathRemoveAction::Query() const { auto res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = { _loc.x + 16, _loc.y + 16, _loc.z }; if (!LocationValid(_loc)) @@ -81,7 +81,7 @@ GameActions::Result FootpathRemoveAction::Execute() const { auto res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = { _loc.x + 16, _loc.y + 16, _loc.z }; if (!(GetFlags() & GAME_COMMAND_FLAG_GHOST)) diff --git a/src/openrct2/actions/GameActionResult.h b/src/openrct2/actions/GameActionResult.h index 6c2065050d..3fbabc2c16 100644 --- a/src/openrct2/actions/GameActionResult.h +++ b/src/openrct2/actions/GameActionResult.h @@ -62,7 +62,7 @@ namespace OpenRCT2::GameActions std::array ErrorMessageArgs{}; CoordsXYZ Position = { kLocationNull, kLocationNull, kLocationNull }; money64 Cost = 0; - ExpenditureType Expenditure = ExpenditureType::Count; + ExpenditureType Expenditure = ExpenditureType::count; #ifdef __ANDROID__ // Any_cast throws a bad_any_cast exception on Android diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index d37428106d..ec59bdd5c7 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -85,7 +85,7 @@ GameActions::Result LandBuyRightsAction::QueryExecute(bool isExecuting) const centre.z = TileElementHeight(centre); res.Position = centre; - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; // Game command modified to accept selection size for (auto y = validRange.GetTop(); y <= validRange.GetBottom(); y += kCoordsXYStep) diff --git a/src/openrct2/actions/LandLowerAction.cpp b/src/openrct2/actions/LandLowerAction.cpp index 0d519c4d3b..dfbc21ef21 100644 --- a/src/openrct2/actions/LandLowerAction.cpp +++ b/src/openrct2/actions/LandLowerAction.cpp @@ -75,7 +75,7 @@ GameActions::Result LandLowerAction::QueryExecute(bool isExecuting) const auto validRange = ClampRangeWithinMap(_range); res.Position = { _coords.x, _coords.y, TileElementHeight(_coords) }; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; if (isExecuting) { diff --git a/src/openrct2/actions/LandRaiseAction.cpp b/src/openrct2/actions/LandRaiseAction.cpp index 470f83cf97..c6fb849907 100644 --- a/src/openrct2/actions/LandRaiseAction.cpp +++ b/src/openrct2/actions/LandRaiseAction.cpp @@ -76,7 +76,7 @@ GameActions::Result LandRaiseAction::QueryExecute(bool isExecuting) const auto validRange = ClampRangeWithinMap(_range); res.Position = { _coords.x, _coords.y, TileElementHeight(_coords) }; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; if (isExecuting) { diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index cb1613ce98..fcbe2075d8 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -151,7 +151,7 @@ GameActions::Result LandSetHeightAction::Query() const } auto res = GameActions::Result(); res.Cost = sceneryRemovalCost + GetSurfaceHeightChangeCost(surfaceElement); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; return res; } @@ -179,7 +179,7 @@ GameActions::Result LandSetHeightAction::Execute() const auto res = GameActions::Result(); res.Position = { _coords.x + 16, _coords.y + 16, surfaceHeight }; res.Cost = cost; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; return res; } diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index b387bc3e88..ac8a1da0c2 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -82,7 +82,7 @@ GameActions::Result LandSetRightsAction::QueryExecute(bool isExecuting) const centre.z = TileElementHeight(centre); res.Position = centre; - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; if (!isInEditorMode() && !getGameState().cheats.sandboxMode) { diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index b6eb21fc93..6a1701e8d6 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -346,7 +346,7 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const auto res = GameActions::Result(); res.ErrorTitle = kErrorTitles[_isLowering ? 0 : 1]; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = { _coords.x, _coords.y, centreZ }; // Do the smoothing diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index 6af4f398d3..9b93bdf47d 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -66,7 +66,7 @@ GameActions::Result LargeSceneryPlaceAction::Query() const { auto res = GameActions::Result(); res.ErrorTitle = STR_CANT_POSITION_THIS_HERE; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; int16_t surfaceHeight = TileElementHeight(_loc); res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; @@ -202,7 +202,7 @@ GameActions::Result LargeSceneryPlaceAction::Execute() const { auto res = GameActions::Result(); res.ErrorTitle = STR_CANT_POSITION_THIS_HERE; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; int16_t surfaceHeight = TileElementHeight(_loc); res.Position.x = _loc.x + 16; diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index 955f7b9931..aa33d6d92a 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -57,7 +57,7 @@ GameActions::Result LargeSceneryRemoveAction::Query() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Cost = 0; TileElement* tileElement = FindLargeSceneryElement(_loc, _tileIndex); @@ -136,7 +136,7 @@ GameActions::Result LargeSceneryRemoveAction::Execute() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Cost = 0; TileElement* tileElement = FindLargeSceneryElement(_loc, _tileIndex); diff --git a/src/openrct2/actions/LargeScenerySetColourAction.cpp b/src/openrct2/actions/LargeScenerySetColourAction.cpp index fcb073927c..4664aa7cc2 100644 --- a/src/openrct2/actions/LargeScenerySetColourAction.cpp +++ b/src/openrct2/actions/LargeScenerySetColourAction.cpp @@ -64,7 +64,7 @@ GameActions::Result LargeScenerySetColourAction::Execute() const GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting) const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = TileElementHeight(_loc); diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index 2bdbaa1274..3ee2f4638f 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -49,7 +49,7 @@ GameActions::Result MazePlaceTrackAction::Query() const auto res = GameActions::Result(); res.Position = _loc + CoordsXYZ{ 8, 8, 0 }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.ErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; if ((_loc.z & 0xF) != 0) { @@ -146,7 +146,7 @@ GameActions::Result MazePlaceTrackAction::Execute() const auto res = GameActions::Result(); res.Position = _loc + CoordsXYZ{ 8, 8, 0 }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.ErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; auto ride = GetRide(_rideIndex); diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index 53c6acb0fb..0b82b3df99 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -84,7 +84,7 @@ GameActions::Result MazeSetTrackAction::Query() const auto res = GameActions::Result(); res.Position = _loc + CoordsXYZ{ 8, 8, 0 }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.ErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; if ((_loc.z & 0xF) != 0 && _mode == GC_SET_MAZE_TRACK_BUILD) { @@ -192,7 +192,7 @@ GameActions::Result MazeSetTrackAction::Execute() const auto res = GameActions::Result(); res.Position = _loc + CoordsXYZ{ 8, 8, 0 }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.ErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; auto ride = GetRide(_rideIndex); diff --git a/src/openrct2/actions/ParkEntrancePlaceAction.cpp b/src/openrct2/actions/ParkEntrancePlaceAction.cpp index 44159c2a34..98c011a17b 100644 --- a/src/openrct2/actions/ParkEntrancePlaceAction.cpp +++ b/src/openrct2/actions/ParkEntrancePlaceAction.cpp @@ -62,7 +62,7 @@ GameActions::Result ParkEntrancePlaceAction::Query() const } auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; res.Position = { _loc.x, _loc.y, _loc.z }; auto mapSizeUnits = GetMapSizeUnits() - CoordsXY{ kCoordsXYStep, kCoordsXYStep }; @@ -121,7 +121,7 @@ GameActions::Result ParkEntrancePlaceAction::Query() const GameActions::Result ParkEntrancePlaceAction::Execute() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; res.Position = CoordsXYZ{ _loc.x, _loc.y, _loc.z }; uint32_t flags = GetFlags(); diff --git a/src/openrct2/actions/ParkEntranceRemoveAction.cpp b/src/openrct2/actions/ParkEntranceRemoveAction.cpp index a48aabf91f..77857c5f79 100644 --- a/src/openrct2/actions/ParkEntranceRemoveAction.cpp +++ b/src/openrct2/actions/ParkEntranceRemoveAction.cpp @@ -49,7 +49,7 @@ GameActions::Result ParkEntranceRemoveAction::Query() const } auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; res.Position = _loc; res.ErrorTitle = STR_CANT_REMOVE_THIS; @@ -68,7 +68,7 @@ GameActions::Result ParkEntranceRemoveAction::Query() const GameActions::Result ParkEntranceRemoveAction::Execute() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; res.Position = _loc; res.ErrorTitle = STR_CANT_REMOVE_THIS; diff --git a/src/openrct2/actions/ParkMarketingAction.cpp b/src/openrct2/actions/ParkMarketingAction.cpp index 09218ac460..cc2e8346f1 100644 --- a/src/openrct2/actions/ParkMarketingAction.cpp +++ b/src/openrct2/actions/ParkMarketingAction.cpp @@ -92,7 +92,7 @@ GameActions::Result ParkMarketingAction::CreateResult() const { auto result = GameActions::Result(); result.ErrorTitle = STR_CANT_START_MARKETING_CAMPAIGN; - result.Expenditure = ExpenditureType::Marketing; + result.Expenditure = ExpenditureType::marketing; result.Cost = CalculatePrice(); return result; } diff --git a/src/openrct2/actions/PeepSpawnPlaceAction.cpp b/src/openrct2/actions/PeepSpawnPlaceAction.cpp index 1a07fb787d..c975cf242c 100644 --- a/src/openrct2/actions/PeepSpawnPlaceAction.cpp +++ b/src/openrct2/actions/PeepSpawnPlaceAction.cpp @@ -51,7 +51,7 @@ GameActions::Result PeepSpawnPlaceAction::Query() const } auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; res.Position = _location; auto mapSizeUnits = GetMapSizeUnits() - CoordsXY{ 16, 16 }; @@ -90,7 +90,7 @@ GameActions::Result PeepSpawnPlaceAction::Query() const GameActions::Result PeepSpawnPlaceAction::Execute() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::LandPurchase; + res.Expenditure = ExpenditureType::landPurchase; res.Position = _location; // Shift the spawn point to the edge of the tile diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 57ed72a0d7..4bcfdab712 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -299,7 +299,7 @@ GameActions::Result RideCreateAction::Execute() const auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByClass(WindowClass::RideList); - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.SetData(RideId{ rideIndex }); return res; diff --git a/src/openrct2/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp index 53fe6897f5..0df74d5d62 100644 --- a/src/openrct2/actions/RideDemolishAction.cpp +++ b/src/openrct2/actions/RideDemolishAction.cpp @@ -144,7 +144,7 @@ GameActions::Result RideDemolishAction::DemolishRide(Ride& ride) const MarketingCancelCampaignsForRide(_rideIndex); auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Cost = refundPrice; if (!ride.overallView.IsNull()) @@ -270,7 +270,7 @@ money64 RideDemolishAction::DemolishTracks() const GameActions::Result RideDemolishAction::RefurbishRide(Ride& ride) const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Cost = GetRefurbishPrice(ride); ride.renew(); diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index 57746df9b7..26dba45030 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -132,7 +132,7 @@ GameActions::Result RideEntranceExitPlaceAction::Query() const auto res = GameActions::Result(); res.Position = { _loc.ToTileCentre(), z }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Cost += canBuild.Cost; return res; } @@ -190,7 +190,7 @@ GameActions::Result RideEntranceExitPlaceAction::Execute() const auto res = GameActions::Result(); res.Position = { _loc.ToTileCentre(), z }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Cost += canBuild.Cost; auto* entranceElement = TileElementInsert(CoordsXYZ{ _loc, z }, 0b1111); @@ -266,7 +266,7 @@ GameActions::Result RideEntranceExitPlaceAction::TrackPlaceQuery(const CoordsXYZ } auto res = GameActions::Result(); res.Position = { loc.ToTileCentre(), TileElementHeight(loc) }; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Cost += canBuild.Cost; return res; } diff --git a/src/openrct2/actions/RideSetColourSchemeAction.cpp b/src/openrct2/actions/RideSetColourSchemeAction.cpp index e3439109cc..fa24171067 100644 --- a/src/openrct2/actions/RideSetColourSchemeAction.cpp +++ b/src/openrct2/actions/RideSetColourSchemeAction.cpp @@ -74,7 +74,7 @@ GameActions::Result RideSetColourSchemeAction::Query() const GameActions::Result RideSetColourSchemeAction::Execute() const { GameActions::Result res = GameActions::Result(); - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.ErrorTitle = STR_CANT_SET_COLOUR_SCHEME; GetTrackElementOriginAndApplyChanges(_loc, _trackType, _newColourScheme, nullptr, { TrackElementSetFlag::colourScheme }); diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index 4fc90b3512..a395b20b98 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -78,7 +78,7 @@ GameActions::Result RideSetPriceAction::Query() const GameActions::Result RideSetPriceAction::Execute() const { GameActions::Result res = GameActions::Result(); - res.Expenditure = ExpenditureType::ParkRideTickets; + res.Expenditure = ExpenditureType::parkRideTickets; auto ride = GetRide(_rideIndex); if (ride == nullptr) diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index a3ff08ad13..e80e0f22b5 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -118,7 +118,7 @@ GameActions::Result RideSetStatusAction::Query() const GameActions::Result RideSetStatusAction::Execute() const { GameActions::Result res = GameActions::Result(); - res.Expenditure = ExpenditureType::RideRunningCosts; + res.Expenditure = ExpenditureType::rideRunningCosts; auto ride = GetRide(_rideIndex); if (ride == nullptr) diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 48f6d4b4b7..b71e3cf5f4 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -284,7 +284,7 @@ GameActions::Result SmallSceneryPlaceAction::Query() const const uint8_t groundFlags = clearanceData.GroundFlags & (ELEMENT_IS_ABOVE_GROUND | ELEMENT_IS_UNDERGROUND); res.SetData(SmallSceneryPlaceActionResult{ groundFlags, 0, 0 }); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Cost = sceneryEntry->price + canBuild.Cost; return res; @@ -420,7 +420,7 @@ GameActions::Result SmallSceneryPlaceAction::Execute() const return canBuild; } - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Cost = sceneryEntry->price + canBuild.Cost; auto* sceneryElement = TileElementInsert( diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index 4e13cc2a64..b241f99610 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -71,7 +71,7 @@ GameActions::Result SmallSceneryRemoveAction::Query() const } res.Cost = entry->removal_price; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc; if (gLegacyScene != LegacyScene::scenarioEditor && !(GetFlags() & GAME_COMMAND_FLAG_GHOST) @@ -123,7 +123,7 @@ GameActions::Result SmallSceneryRemoveAction::Execute() const } res.Cost = entry->removal_price; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = _loc; TileElement* tileElement = FindSceneryElement(); diff --git a/src/openrct2/actions/SmallScenerySetColourAction.cpp b/src/openrct2/actions/SmallScenerySetColourAction.cpp index 896e16236f..40ac2a47e3 100644 --- a/src/openrct2/actions/SmallScenerySetColourAction.cpp +++ b/src/openrct2/actions/SmallScenerySetColourAction.cpp @@ -71,7 +71,7 @@ GameActions::Result SmallScenerySetColourAction::Execute() const GameActions::Result SmallScenerySetColourAction::QueryExecute(bool isExecuting) const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 5be4c61e7b..67ff44829f 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -73,7 +73,7 @@ GameActions::Result StaffHireNewAction::Execute() const GameActions::Result StaffHireNewAction::QueryExecute(bool execute) const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Wages; + res.Expenditure = ExpenditureType::wages; if (_staffType >= static_cast(StaffType::Count)) { diff --git a/src/openrct2/actions/SurfaceSetStyleAction.cpp b/src/openrct2/actions/SurfaceSetStyleAction.cpp index 8d5cfc3559..d43ace39e5 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.cpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.cpp @@ -48,7 +48,7 @@ GameActions::Result SurfaceSetStyleAction::Query() const { auto res = GameActions::Result(); res.ErrorTitle = STR_CANT_CHANGE_LAND_TYPE; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto validRange = ClampRangeWithinMap(_range.Normalise()); auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); @@ -151,7 +151,7 @@ GameActions::Result SurfaceSetStyleAction::Execute() const { auto res = GameActions::Result(); res.ErrorTitle = STR_CANT_CHANGE_LAND_TYPE; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto validRange = ClampRangeWithinMap(_range.Normalise()); auto xMid = (validRange.GetLeft() + validRange.GetRight()) / 2 + 16; diff --git a/src/openrct2/actions/TrackDesignAction.cpp b/src/openrct2/actions/TrackDesignAction.cpp index 7feb1f1b65..73a379c337 100644 --- a/src/openrct2/actions/TrackDesignAction.cpp +++ b/src/openrct2/actions/TrackDesignAction.cpp @@ -58,7 +58,7 @@ GameActions::Result TrackDesignAction::Query() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; if (!LocationValid(_loc)) { @@ -138,7 +138,7 @@ GameActions::Result TrackDesignAction::Execute() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; auto& gameState = getGameState(); auto& objManager = GetContext()->GetObjectManager(); diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 0a7cc6f437..81e0c55acc 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -121,7 +121,7 @@ GameActions::Result TrackPlaceAction::Query() const } auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Position.x = _origin.x + 16; res.Position.y = _origin.y + 16; res.Position.z = _origin.z; @@ -443,7 +443,7 @@ GameActions::Result TrackPlaceAction::Execute() const } auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; res.Position.x = _origin.x + 16; res.Position.y = _origin.y + 16; res.Position.z = _origin.z; diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index cfdf7cffd4..d328f4cfac 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -69,7 +69,7 @@ GameActions::Result TrackRemoveAction::Query() const res.Position.x = _origin.x + 16; res.Position.y = _origin.y + 16; res.Position.z = _origin.z; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; auto comparableTrackType = normaliseTrackType(_trackType); @@ -262,7 +262,7 @@ GameActions::Result TrackRemoveAction::Execute() const res.Position.x = _origin.x + 16; res.Position.y = _origin.y + 16; res.Position.z = _origin.z; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; auto comparableTrackType = normaliseTrackType(_trackType); diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp index 9ef8b09c75..9884cb0ab1 100644 --- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp +++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp @@ -58,7 +58,7 @@ GameActions::Result TrackSetBrakeSpeedAction::QueryExecute(bool isExecuting) con res.Position = _loc; res.Position.x += 16; res.Position.y += 16; - res.Expenditure = ExpenditureType::RideConstruction; + res.Expenditure = ExpenditureType::rideConstruction; if (!LocationValid(_loc)) { diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 089af693ac..a59eac5376 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -75,7 +75,7 @@ GameActions::Result WallPlaceAction::Query() const res.ErrorTitle = STR_CANT_BUILD_THIS_HERE; res.Position = _loc; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x += 16; res.Position.y += 16; @@ -291,7 +291,7 @@ GameActions::Result WallPlaceAction::Execute() const res.ErrorTitle = STR_CANT_BUILD_THIS_HERE; res.Position = _loc; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position.x += 16; res.Position.y += 16; diff --git a/src/openrct2/actions/WallRemoveAction.cpp b/src/openrct2/actions/WallRemoveAction.cpp index ec1bba608b..a5f911319d 100644 --- a/src/openrct2/actions/WallRemoveAction.cpp +++ b/src/openrct2/actions/WallRemoveAction.cpp @@ -42,7 +42,7 @@ GameActions::Result WallRemoveAction::Query() const { GameActions::Result res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; if (!LocationValid(_loc)) { @@ -71,7 +71,7 @@ GameActions::Result WallRemoveAction::Execute() const { GameActions::Result res = GameActions::Result(); res.Cost = 0; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST; diff --git a/src/openrct2/actions/WallSetColourAction.cpp b/src/openrct2/actions/WallSetColourAction.cpp index a5c3f4a8c2..fe5808004c 100644 --- a/src/openrct2/actions/WallSetColourAction.cpp +++ b/src/openrct2/actions/WallSetColourAction.cpp @@ -59,7 +59,7 @@ GameActions::Result WallSetColourAction::Query() const res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; if (!LocationValid(_loc)) { @@ -122,7 +122,7 @@ GameActions::Result WallSetColourAction::Execute() const res.Position.x = _loc.x + 16; res.Position.y = _loc.y + 16; res.Position.z = _loc.z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto wallElement = MapGetWallElementAt(_loc); if (wallElement == nullptr) diff --git a/src/openrct2/actions/WaterLowerAction.cpp b/src/openrct2/actions/WaterLowerAction.cpp index 656e0cce08..96809000fb 100644 --- a/src/openrct2/actions/WaterLowerAction.cpp +++ b/src/openrct2/actions/WaterLowerAction.cpp @@ -64,7 +64,7 @@ GameActions::Result WaterLowerAction::QueryExecute(bool isExecuting) const z = waterHeight; } res.Position.z = z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; uint8_t minHeight = GetLowestHeight(validRange); bool hasChanged = false; diff --git a/src/openrct2/actions/WaterRaiseAction.cpp b/src/openrct2/actions/WaterRaiseAction.cpp index 5cc656699f..80de805495 100644 --- a/src/openrct2/actions/WaterRaiseAction.cpp +++ b/src/openrct2/actions/WaterRaiseAction.cpp @@ -64,7 +64,7 @@ GameActions::Result WaterRaiseAction::QueryExecute(bool isExecuting) const z = waterHeight; } res.Position.z = z; - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; auto maxHeight = GetHighestHeight(validRange) / kCoordsZStep; bool hasChanged = false; diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp index a716272af9..21a5954830 100644 --- a/src/openrct2/actions/WaterSetHeightAction.cpp +++ b/src/openrct2/actions/WaterSetHeightAction.cpp @@ -48,7 +48,7 @@ void WaterSetHeightAction::Serialise(DataSerialiser& stream) GameActions::Result WaterSetHeightAction::Query() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = { _coords, _height * kCoordsZStep }; auto& gameState = getGameState(); @@ -116,7 +116,7 @@ GameActions::Result WaterSetHeightAction::Query() const GameActions::Result WaterSetHeightAction::Execute() const { auto res = GameActions::Result(); - res.Expenditure = ExpenditureType::Landscaping; + res.Expenditure = ExpenditureType::landscaping; res.Position = { _coords, _height * kCoordsZStep }; int32_t surfaceHeight = TileElementHeight(_coords); diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 05cfbf1067..9ce11fa485 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1716,18 +1716,18 @@ static bool GuestDecideAndBuyItem(Guest& guest, Ride& ride, const ShopItem shopI guest.AmountOfSouvenirs++; money64* expend_type = &guest.PaidOnSouvenirs; - ExpenditureType expenditure = ExpenditureType::ShopStock; + ExpenditureType expenditure = ExpenditureType::shopStock; if (shopItemDescriptor.IsFood()) { expend_type = &guest.PaidOnFood; - expenditure = ExpenditureType::FoodDrinkStock; + expenditure = ExpenditureType::foodDrinkStock; } if (shopItemDescriptor.IsDrink()) { expend_type = &guest.PaidOnDrink; - expenditure = ExpenditureType::FoodDrinkStock; + expenditure = ExpenditureType::foodDrinkStock; } if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) @@ -3900,7 +3900,7 @@ void Guest::UpdateRideFreeVehicleEnterRide(Ride& ride) { ride.totalProfit = AddClamp(ride.totalProfit, ridePrice); ride.windowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME; - SpendMoney(PaidOnRides, ridePrice, ExpenditureType::ParkRideTickets); + SpendMoney(PaidOnRides, ridePrice, ExpenditureType::parkRideTickets); } } diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 9011eaf580..f164c3d146 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -1905,7 +1905,7 @@ static bool PeepInteractWithEntrance(Peep* peep, const CoordsXYE& coords, uint8_ } gameState.park.totalIncomeFromAdmissions += entranceFee; - guest->SpendMoney(guest->PaidToEnter, entranceFee, ExpenditureType::ParkEntranceTickets); + guest->SpendMoney(guest->PaidToEnter, entranceFee, ExpenditureType::parkEntranceTickets); guest->PeepFlags |= PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY; } @@ -2277,7 +2277,7 @@ static bool PeepInteractWithShop(Peep* peep, const CoordsXYE& coords) { ride->totalProfit = AddClamp(ride->totalProfit, cost); ride->windowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME; - guest->SpendMoney(cost, ExpenditureType::ParkRideTickets); + guest->SpendMoney(cost, ExpenditureType::parkRideTickets); } auto coordsCentre = coords.ToTileCentre(); diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 56e42e36d0..59d041632d 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -37,7 +37,7 @@ const money64 research_cost_table[RESEARCH_FUNDING_COUNT] = { 400.00_GBP, // Maximum funding }; -static constexpr int32_t dword_988E60[EnumValue(ExpenditureType::Count)] = { +static constexpr int32_t dword_988E60[EnumValue(ExpenditureType::count)] = { 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, }; @@ -106,7 +106,7 @@ void FinancePayWages() for (auto peep : EntityList()) { - FinancePayment(GetStaffWage(peep->AssignedStaffType) / 4, ExpenditureType::Wages); + FinancePayment(GetStaffWage(peep->AssignedStaffType) / 4, ExpenditureType::wages); } } @@ -123,7 +123,7 @@ void FinancePayResearch() } const uint8_t level = gameState.researchFundingLevel; - FinancePayment(research_cost_table[level] / 4, ExpenditureType::Research); + FinancePayment(research_cost_table[level] / 4, ExpenditureType::research); } /** @@ -147,7 +147,7 @@ void FinancePayInterest() ? (current_loan / 2400) : (current_loan * 5 * current_interest_rate) >> 14; - FinancePayment(interest_to_pay, ExpenditureType::Interest); + FinancePayment(interest_to_pay, ExpenditureType::interest); } /** @@ -172,7 +172,7 @@ void FinancePayRideUpkeep() { ride.totalProfit = AddClamp(ride.totalProfit, -upkeep); ride.windowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME; - FinancePayment(upkeep, ExpenditureType::RideRunningCosts); + FinancePayment(upkeep, ExpenditureType::rideRunningCosts); } } @@ -195,7 +195,7 @@ void FinanceResetHistory() for (uint32_t i = 0; i < kExpenditureTableMonthCount; ++i) { - for (uint32_t j = 0; j < static_cast(ExpenditureType::Count); ++j) + for (uint32_t j = 0; j < static_cast(ExpenditureType::count); ++j) { gameState.park.expenditureTable[i][j] = 0; } @@ -211,7 +211,7 @@ void FinanceInit() auto& gameState = getGameState(); // It only initialises the first month - for (uint32_t i = 0; i < static_cast(ExpenditureType::Count); i++) + for (uint32_t i = 0; i < static_cast(ExpenditureType::count); i++) { gameState.park.expenditureTable[0][i] = 0; } @@ -332,14 +332,14 @@ void FinanceShiftExpenditureTable() // Shift the table for (size_t i = kExpenditureTableMonthCount - 1; i >= 1; i--) { - for (size_t j = 0; j < static_cast(ExpenditureType::Count); j++) + for (size_t j = 0; j < static_cast(ExpenditureType::count); j++) { gameState.park.expenditureTable[i][j] = gameState.park.expenditureTable[i - 1][j]; } } // Zero the beginning of the table, which is the new month - for (uint32_t i = 0; i < static_cast(ExpenditureType::Count); i++) + for (uint32_t i = 0; i < static_cast(ExpenditureType::count); i++) { gameState.park.expenditureTable[0][i] = 0; } @@ -368,10 +368,10 @@ money64 FinanceGetLastMonthShopProfit() { const auto* lastMonthExpenditure = getGameState().park.expenditureTable[1]; - profit += lastMonthExpenditure[EnumValue(ExpenditureType::ShopSales)]; - profit += lastMonthExpenditure[EnumValue(ExpenditureType::ShopStock)]; - profit += lastMonthExpenditure[EnumValue(ExpenditureType::FoodDrinkSales)]; - profit += lastMonthExpenditure[EnumValue(ExpenditureType::FoodDrinkStock)]; + profit += lastMonthExpenditure[EnumValue(ExpenditureType::shopSales)]; + profit += lastMonthExpenditure[EnumValue(ExpenditureType::shopStock)]; + profit += lastMonthExpenditure[EnumValue(ExpenditureType::foodDrinkSales)]; + profit += lastMonthExpenditure[EnumValue(ExpenditureType::foodDrinkStock)]; } return profit; } diff --git a/src/openrct2/management/Finance.h b/src/openrct2/management/Finance.h index 3a3dbf3f89..6706ad19cf 100644 --- a/src/openrct2/management/Finance.h +++ b/src/openrct2/management/Finance.h @@ -14,21 +14,21 @@ enum class ExpenditureType : int32_t { - RideConstruction = 0, - RideRunningCosts, - LandPurchase, - Landscaping, - ParkEntranceTickets, - ParkRideTickets, - ShopSales, - ShopStock, - FoodDrinkSales, - FoodDrinkStock, - Wages, - Marketing, - Research, - Interest, - Count + rideConstruction = 0, + rideRunningCosts, + landPurchase, + landscaping, + parkEntranceTickets, + parkRideTickets, + shopSales, + shopStock, + foodDrinkSales, + foodDrinkStock, + wages, + marketing, + research, + interest, + count }; constexpr uint8_t kExpenditureTableMonthCount = 16; diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 18ca7dae63..1970b905fa 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -918,7 +918,7 @@ namespace OpenRCT2 if (cs.getMode() == OrcaStream::Mode::reading) { auto numMonths = std::min(kExpenditureTableMonthCount, cs.read()); - auto numTypes = std::min(static_cast(ExpenditureType::Count), cs.read()); + auto numTypes = std::min(static_cast(ExpenditureType::count), cs.read()); for (uint32_t i = 0; i < numMonths; i++) { for (uint32_t j = 0; j < numTypes; j++) @@ -930,7 +930,7 @@ namespace OpenRCT2 else { auto numMonths = static_cast(kExpenditureTableMonthCount); - auto numTypes = static_cast(ExpenditureType::Count); + auto numTypes = static_cast(ExpenditureType::count); cs.write(numMonths); cs.write(numTypes); diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 545713fcfc..4c738a4c62 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -736,7 +736,7 @@ ObjectiveStatus Objective::CheckGuestsAndRating() const ObjectiveStatus Objective::CheckMonthlyRideIncome() const { - money64 lastMonthRideIncome = getGameState().park.expenditureTable[1][EnumValue(ExpenditureType::ParkRideTickets)]; + money64 lastMonthRideIncome = getGameState().park.expenditureTable[1][EnumValue(ExpenditureType::parkRideTickets)]; if (lastMonthRideIncome >= Currency) { return ObjectiveStatus::Success; @@ -826,10 +826,10 @@ ObjectiveStatus Objective::CheckRepayLoanAndParkValue() const ObjectiveStatus Objective::CheckMonthlyFoodIncome() const { const auto* lastMonthExpenditure = getGameState().park.expenditureTable[1]; - auto lastMonthProfit = lastMonthExpenditure[EnumValue(ExpenditureType::ShopSales)] - + lastMonthExpenditure[EnumValue(ExpenditureType::ShopStock)] - + lastMonthExpenditure[EnumValue(ExpenditureType::FoodDrinkSales)] - + lastMonthExpenditure[EnumValue(ExpenditureType::FoodDrinkStock)]; + auto lastMonthProfit = lastMonthExpenditure[EnumValue(ExpenditureType::shopSales)] + + lastMonthExpenditure[EnumValue(ExpenditureType::shopStock)] + + lastMonthExpenditure[EnumValue(ExpenditureType::foodDrinkSales)] + + lastMonthExpenditure[EnumValue(ExpenditureType::foodDrinkStock)]; if (lastMonthProfit >= Currency) { diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 537842edf3..bcaa6fdb01 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -1143,7 +1143,7 @@ GameActions::Result ScriptEngine::DukToGameActionResult(const DukValue& d) if (!expenditureType.empty()) { auto expenditure = StringToExpenditureType(expenditureType); - if (expenditure != ExpenditureType::Count) + if (expenditure != ExpenditureType::count) { result.Expenditure = expenditure; } @@ -1192,7 +1192,7 @@ ExpenditureType ScriptEngine::StringToExpenditureType(std::string_view expenditu { return static_cast(std::distance(std::begin(ExpenditureTypes), it)); } - return ExpenditureType::Count; + return ExpenditureType::count; } DukValue ScriptEngine::GameActionResultToDuk(const GameAction& action, const GameActions::Result& result) @@ -1215,7 +1215,7 @@ DukValue ScriptEngine::GameActionResultToDuk(const GameAction& action, const Gam { obj.Set("position", ToDuk(_context, result.Position)); } - if (result.Expenditure != ExpenditureType::Count) + if (result.Expenditure != ExpenditureType::count) { obj.Set("expenditureType", ExpenditureTypeToString(result.Expenditure)); } diff --git a/src/openrct2/scripting/bindings/world/ScPark.cpp b/src/openrct2/scripting/bindings/world/ScPark.cpp index e0d1065956..00a683c134 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.cpp +++ b/src/openrct2/scripting/bindings/world/ScPark.cpp @@ -420,7 +420,7 @@ namespace OpenRCT2::Scripting GetDate().GetMonthsElapsed() + 1, static_cast(0), static_cast(kExpenditureTableMonthCount)); std::vector result(recordedMonths, 0); auto type = ScriptEngine::StringToExpenditureType(expenditureType); - if (type != ExpenditureType::Count) + if (type != ExpenditureType::count) { auto& gameState = getGameState(); for (size_t i = 0; i < recordedMonths; ++i) diff --git a/src/openrct2/world/ParkData.h b/src/openrct2/world/ParkData.h index 9a16cf49eb..738e431ddc 100644 --- a/src/openrct2/world/ParkData.h +++ b/src/openrct2/world/ParkData.h @@ -80,7 +80,7 @@ namespace OpenRCT2::Park // The total profit for the entire scenario that precedes the current financial table. money64 historicalProfit; money64 currentProfit; - money64 expenditureTable[kExpenditureTableMonthCount][EnumValue(ExpenditureType::Count)]; + money64 expenditureTable[kExpenditureTableMonthCount][EnumValue(ExpenditureType::count)]; money64 currentExpenditure; money64 companyValue;