From c839a1746d38e6c355d46eb6767ecaa3542edf93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Thu, 28 Dec 2023 01:48:59 +0200 Subject: [PATCH] Resolve some odd type clash, remove using namespace for now --- src/openrct2/entity/Peep.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index a302f067de..a07103893c 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -63,7 +63,6 @@ #include #include -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();