From 6752a764f6f4e351f708a45cd83d8d7cba0f2962 Mon Sep 17 00:00:00 2001 From: Petr Ohlidal Date: Wed, 23 Feb 2022 21:09:03 +0100 Subject: [PATCH] :bug: Fixed namespace leak in TurboProp.h --- source/main/gfx/GfxActor.cpp | 2 +- source/main/physics/air/TurboProp.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/main/gfx/GfxActor.cpp b/source/main/gfx/GfxActor.cpp index b1e187cbb2..436473d261 100644 --- a/source/main/gfx/GfxActor.cpp +++ b/source/main/gfx/GfxActor.cpp @@ -1953,7 +1953,7 @@ void RoR::GfxActor::SetWheelsVisible(bool value) int RoR::GfxActor::GetActorId () const { return m_actor->ar_instance_id; } int RoR::GfxActor::GetActorState () const { return static_cast(m_actor->ar_state); } -ActorType RoR::GfxActor::GetActorDriveable() const +RoR::ActorType RoR::GfxActor::GetActorDriveable() const { return m_actor->ar_driveable; } diff --git a/source/main/physics/air/TurboProp.h b/source/main/physics/air/TurboProp.h index f8ab1311b6..874c69d63e 100644 --- a/source/main/physics/air/TurboProp.h +++ b/source/main/physics/air/TurboProp.h @@ -27,7 +27,7 @@ #include -using namespace RoR; +namespace RoR { class Turboprop: public AeroEngine, public ZeroedMemoryAllocator { @@ -131,3 +131,5 @@ class Turboprop: public AeroEngine, public ZeroedMemoryAllocator NodeNum_t nodep[4]; NodeNum_t torquenode; }; + +} // namespace RoR