From d093284569da1571658b1b83b9ec693a7ced2e3e Mon Sep 17 00:00:00 2001 From: Tleety Date: Wed, 9 Mar 2016 17:37:40 +0100 Subject: [PATCH] Rename variable --- include/Game/Systems/StartSystem.h | 2 +- src/Game/Systems/StartSystem.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Game/Systems/StartSystem.h b/include/Game/Systems/StartSystem.h index c7764e1b..fb2231e9 100644 --- a/include/Game/Systems/StartSystem.h +++ b/include/Game/Systems/StartSystem.h @@ -14,7 +14,7 @@ public: virtual void Update(double dt) override; private: - EntityWrapper m_activeCamera = EntityWrapper::Invalid; + EntityWrapper m_ActiveCamera = EntityWrapper::Invalid; EventRelay m_ECameraActivated; bool OnCameraActivated(const Events::SetCamera& e); diff --git a/src/Game/Systems/StartSystem.cpp b/src/Game/Systems/StartSystem.cpp index 4c67b210..3efc2ec3 100644 --- a/src/Game/Systems/StartSystem.cpp +++ b/src/Game/Systems/StartSystem.cpp @@ -15,7 +15,7 @@ void StartSystem::Update(double dt) } for(auto& cCamera: *cameras) { EntityWrapper cameraEntity = EntityWrapper(m_World, cCamera.EntityID); - if(cameraEntity == m_activeCamera){ + if(cameraEntity == m_ActiveCamera){ return; } if(cameraEntity.Name() == "Overview_Camera_Start_Menu") { @@ -28,6 +28,6 @@ void StartSystem::Update(double dt) bool StartSystem::OnCameraActivated(const Events::SetCamera& e) { - m_activeCamera = e.CameraEntity; + m_ActiveCamera = e.CameraEntity; return 1; }