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

Merge pull request #24034 from Gymnasiast/refactor/gamestate-t-lower-camel-case

Browse Source 
Change GameState_t members to lowerCamelCase
This commit is contained in:
Matt
2025-03-21 23:32:02 +02:00
committed by GitHub
parent 8385b41a5e 4badffcdb6
commit 94be70f8a8
179 changed files with 2619 additions and 2619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/entity/Staff.cpp
View File

@@ -478,7 +478,7 @@ bool Staff::DoHandymanPathFinding()
Direction litterDirection = INVALID_DIRECTION;
uint8_t validDirections = GetValidPatrolDirections(NextLoc);
if ((StaffOrders & STAFF_ORDERS_SWEEPING) && ((GetGameState().CurrentTicks + Id.ToUnderlying()) & 0xFFF) > 110)
if ((StaffOrders & STAFF_ORDERS_SWEEPING) && ((getGameState().currentTicks + Id.ToUnderlying()) & 0xFFF) > 110)
{
litterDirection = HandymanDirectionToNearestLitter();
}
@@ -950,15 +950,15 @@ int32_t Staff::GetHireDate() const
colour_t StaffGetColour(StaffType staffType)
{
const auto& gameState = GetGameState();
const auto& gameState = getGameState();
switch (staffType)
{
case StaffType::Handyman:
return gameState.StaffHandymanColour;
return gameState.staffHandymanColour;
case StaffType::Mechanic:
return gameState.StaffMechanicColour;
return gameState.staffMechanicColour;
case StaffType::Security:
return gameState.StaffSecurityColour;
return gameState.staffSecurityColour;
case StaffType::Entertainer:
return 0;
default:
@@ -969,17 +969,17 @@ colour_t StaffGetColour(StaffType staffType)
GameActions::Result StaffSetColour(StaffType staffType, colour_t value)
{
auto& gameState = GetGameState();
auto& gameState = getGameState();
switch (staffType)
{
case StaffType::Handyman:
gameState.StaffHandymanColour = value;
gameState.staffHandymanColour = value;
break;
case StaffType::Mechanic:
gameState.StaffMechanicColour = value;
gameState.staffMechanicColour = value;
break;
case StaffType::Security:
gameState.StaffSecurityColour = value;
gameState.staffSecurityColour = value;
break;
default:
return GameActions::Result(