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

Fix missed 'using' in Finance.h

Browse Source
This commit is contained in:
Michael Steenbeek
2025-12-11 01:18:27 +01:00
committed by GitHub
parent f311c15a5d
commit 31344adc61
11 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@@ -33,6 +33,7 @@
#include <openrct2/world/tile_element/EntranceElement.h>
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
namespace OpenRCT2::Ui::Windows
{

1
src/openrct2-ui/windows/RideConstruction.cpp
View File

@@ -66,6 +66,7 @@ constexpr uint8_t kVerticalDropButtonStart = 6;
using namespace OpenRCT2::Numerics;
using namespace OpenRCT2::TrackMetaData;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
namespace OpenRCT2::Ui::Windows
{

1
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@@ -41,6 +41,7 @@
using namespace OpenRCT2::Numerics;
using namespace OpenRCT2::TrackMetaData;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
namespace OpenRCT2::Ui::Windows
{

1
src/openrct2/management/Finance.cpp
View File

@@ -29,6 +29,7 @@
using namespace OpenRCT2;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
// Monthly research funding costs
const money64 kResearchCosts[RESEARCH_FUNDING_COUNT] = {

6
src/openrct2/management/Finance.h
View File

@@ -13,8 +13,6 @@
#include "../core/Money.hpp"
#include "Research.h"
using OpenRCT2::GameActions::CommandFlags;
enum class ExpenditureType : int32_t
{
rideConstruction = 0,
@@ -41,8 +39,8 @@ constexpr uint8_t kMaxBankLoanInterestRate = 255;
extern const money64 kResearchCosts[RESEARCH_FUNDING_COUNT];
bool FinanceCheckMoneyRequired(CommandFlags flags);
bool FinanceCheckAffordability(money64 cost, CommandFlags flags);
bool FinanceCheckMoneyRequired(OpenRCT2::GameActions::CommandFlags flags);
bool FinanceCheckAffordability(money64 cost, OpenRCT2::GameActions::CommandFlags flags);
void FinancePayment(money64 amount, ExpenditureType type);
void FinancePayWages();
void FinancePayResearch();

1
src/openrct2/ride/RideConstruction.cpp
View File

@@ -51,6 +51,7 @@
using namespace OpenRCT2;
using namespace OpenRCT2::TrackMetaData;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
money64 _currentTrackPrice;

1
src/openrct2/ride/TrackDesign.cpp
View File

@@ -77,6 +77,7 @@
using namespace OpenRCT2;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
namespace OpenRCT2::TrackDesignSceneryElementFlags
{

3
src/openrct2/ride/TrackDesign.h
View File

@@ -10,6 +10,7 @@
#pragma once
#include "../Limits.h"
#include "../actions/CommandFlag.h"
#include "../actions/GameActionResult.h"
#include "../core/EnumUtils.hpp"
#include "../object/Object.h"
@@ -238,7 +239,7 @@ extern RideId gTrackDesignSaveRideIndex;
void TrackDesignMirror(TrackDesign& td);
OpenRCT2::GameActions::Result TrackDesignPlace(
const TrackDesign& td, CommandFlags flags, bool placeScenery, Ride& ride, const CoordsXYZD& coords);
const TrackDesign& td, OpenRCT2::GameActions::CommandFlags flags, bool placeScenery, Ride& ride, const CoordsXYZD& coords);
void TrackDesignPreviewRemoveGhosts(const TrackDesign& td, Ride& ride, const CoordsXYZD& coords);
void TrackDesignPreviewDrawOutlines(
TrackDesignState& tds, const TrackDesign& td, Ride& ride, const CoordsXYZD& coords, bool placeScenery);

1
src/openrct2/world/ConstructionClearance.cpp
View File

@@ -35,6 +35,7 @@
using namespace OpenRCT2;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
static bool MapPlaceClearFunc(
TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price, bool is_scenery)

11
src/openrct2/world/ConstructionClearance.h
View File

@@ -25,7 +25,7 @@ struct CoordsXYRangedZ;
class QuarterTile;
using ClearingFunction = bool (&)(
OpenRCT2::TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price);
OpenRCT2::TileElement** tile_element, const CoordsXY& coords, OpenRCT2::GameActions::CommandFlags flags, money64* price);
enum
{
@@ -45,8 +45,9 @@ enum class CreateCrossingMode
};
bool MapPlaceNonSceneryClearFunc(
OpenRCT2::TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price);
bool MapPlaceSceneryClearFunc(OpenRCT2::TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price);
OpenRCT2::TileElement** tile_element, const CoordsXY& coords, OpenRCT2::GameActions::CommandFlags flags, money64* price);
bool MapPlaceSceneryClearFunc(
OpenRCT2::TileElement** tile_element, const CoordsXY& coords, OpenRCT2::GameActions::CommandFlags flags, money64* price);
struct ConstructClearResult
{
@@ -54,8 +55,8 @@ struct ConstructClearResult
};
[[nodiscard]] OpenRCT2::GameActions::Result MapCanConstructWithClearAt(
const CoordsXYRangedZ& pos, ClearingFunction clearFunc, QuarterTile quarterTile, CommandFlags flags, uint8_t slope,
CreateCrossingMode crossingMode = CreateCrossingMode::none, bool isTree = false);
const CoordsXYRangedZ& pos, ClearingFunction clearFunc, QuarterTile quarterTile, OpenRCT2::GameActions::CommandFlags flags,
uint8_t slope, CreateCrossingMode crossingMode = CreateCrossingMode::none, bool isTree = false);
[[nodiscard]] OpenRCT2::GameActions::Result MapCanConstructAt(const CoordsXYRangedZ& pos, QuarterTile bl);

1
src/openrct2/world/Footpath.cpp
View File

@@ -50,6 +50,7 @@
using namespace OpenRCT2;
using namespace OpenRCT2::TrackMetaData;
using OpenRCT2::GameActions::CommandFlag;
using OpenRCT2::GameActions::CommandFlags;
void FootpathUpdateQueueEntranceBanner(const CoordsXY& footpathPos, TileElement* tileElement);