mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve some odd type clash, remove using namespace for now

This commit is contained in:
ζeh Matt 2023-12-28 01:48:59 +02:00
parent f708e911e4
commit c839a1746d
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/entity/Peep.cpp
View File

@ -63,7 +63,6 @@
#include <memory>
#include <optional>
using namespace OpenRCT2;
using namespace OpenRCT2::Audio;
uint8_t gGuestChangeModifier;
@ -213,7 +212,7 @@ void PeepUpdateAll()
if (gScreenFlags & SCREEN_FLAGS_EDITOR)
return;
const auto currentTicks = GetGameState().CurrentTicks;
const auto currentTicks = OpenRCT2::GetGameState().CurrentTicks;
int32_t i = 0;
// Warning this loop can delete peeps
@ -892,7 +891,7 @@ void Peep::SetState(PeepState new_state)
*/
void Peep::UpdatePicked()
{
if (GetGameState().CurrentTicks & 0x1F)
if (OpenRCT2::GetGameState().CurrentTicks & 0x1F)
return;
SubState++;
auto* guest = As<Guest>();