mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Move _restrictedScenery to GameState_t

Browse source
This commit is contained in:
Gymnasiast 2024-02-25 16:59:03 +01:00
parent 53b68f23fa
commit f98157d4f1
No known key found for this signature in database
GPG key ID: DBFFF47AB2CA3EDD
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/openrct2/GameState.h
View file

@ -82,6 +82,8 @@ namespace OpenRCT2
std::array<Ride, OpenRCT2::Limits::MaxRidesInPark> Rides{};
std::vector<TileElement> TileElements;
std::vector<ScenerySelection> RestrictedScenery;
News::ItemQueues NewsItems;
colour_t StaffHandymanColour;

17
src/openrct2/world/Scenery.cpp
View file

@ -60,7 +60,7 @@ int16_t gSceneryCtrlPressZ;
money64 gClearSceneryCost;
static std::vector<ScenerySelection> _restrictedScenery;
using namespace OpenRCT2;
// rct2: 0x009A3E74
const CoordsXY SceneryQuadrantOffsets[] = {
@ -373,17 +373,19 @@ static bool IsSceneryEntryValid(const ScenerySelection& item)
bool IsSceneryItemRestricted(const ScenerySelection& item)
{
return std::find(std::begin(_restrictedScenery), std::end(_restrictedScenery), item) != std::end(_restrictedScenery);
auto& gameState = GetGameState();
return std::find(std::begin(gameState.RestrictedScenery), std::end(gameState.RestrictedScenery), item)
!= std::end(gameState.RestrictedScenery);
}
void ClearRestrictedScenery()
{
_restrictedScenery.clear();
GetGameState().RestrictedScenery.clear();
}
std::vector<ScenerySelection>& GetRestrictedScenery()
{
return _restrictedScenery;
return GetGameState().RestrictedScenery;
}
static std::vector<ScenerySelection> GetAllMiscScenery()
@ -418,16 +420,19 @@ static std::vector<ScenerySelection> GetAllMiscScenery()
void RestrictAllMiscScenery()
{
auto& gameState = GetGameState();
auto miscScenery = GetAllMiscScenery();
_restrictedScenery.insert(_restrictedScenery.begin(), miscScenery.begin(), miscScenery.end());
gameState.RestrictedScenery.insert(gameState.RestrictedScenery.begin(), miscScenery.begin(), miscScenery.end());
}
void MarkAllUnrestrictedSceneryAsInvented()
{
auto& gameState = GetGameState();
auto miscScenery = GetAllMiscScenery();
for (const auto& sceneryItem : miscScenery)
{
if (std::find(_restrictedScenery.begin(), _restrictedScenery.end(), sceneryItem) == _restrictedScenery.end())
if (std::find(gameState.RestrictedScenery.begin(), gameState.RestrictedScenery.end(), sceneryItem)
== gameState.RestrictedScenery.end())
{
ScenerySetInvented(sceneryItem);
}