diff --git a/include/Game/CapturePointSystem.h b/include/Game/CapturePointSystem.h index f7e600d7..c9ff0477 100644 --- a/include/Game/CapturePointSystem.h +++ b/include/Game/CapturePointSystem.h @@ -29,7 +29,7 @@ private: EventRelay m_ETriggerLeave; bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e); - bool WinnerWasFound = false; + bool m_WinnerWasFound = false; //need to track these variables for the captureSystem to work as per design! const int m_NotACapturePoint = 999; int m_Team1NextPossibleCapturePoint = m_NotACapturePoint; diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt index 04146670..c8f63028 100644 --- a/src/Game/CMakeLists.txt +++ b/src/Game/CMakeLists.txt @@ -21,6 +21,7 @@ set(SOURCE_FILES "Game.cpp" "HealthSystem.cpp" "PlayerSystem.cpp" + "CapturePointSystem.cpp" ) set(LIBRARIES diff --git a/src/Game/CapturePointSystem.cpp b/src/Game/CapturePointSystem.cpp index 315e9729..867ddc62 100644 --- a/src/Game/CapturePointSystem.cpp +++ b/src/Game/CapturePointSystem.cpp @@ -11,7 +11,7 @@ CapturePointSystem::CapturePointSystem(EventBroker* eventBroker) //here all capturepoints will update their component //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt -void CapturePointSystem::UpdateComponent(World *world, ComponentWrapper &capturePoint, double dt) +void CapturePointSystem::UpdateComponent(World* world, ComponentWrapper& capturePoint, double dt) { //for testing only: //dt = 20.0; @@ -140,13 +140,13 @@ void CapturePointSystem::UpdateComponent(World *world, ComponentWrapper &capture } //WIN: check for possible winCondition = check if the homebase is owned by the other team - if (!WinnerWasFound && (int)capturePoint["OwnedBy"] != 0 && (int)capturePoint["IsHomeCapturePointForTeamNumber"] != 0 && + if (!m_WinnerWasFound && (int)capturePoint["OwnedBy"] != 0 && (int)capturePoint["IsHomeCapturePointForTeamNumber"] != 0 && (int)capturePoint["IsHomeCapturePointForTeamNumber"] != (int)capturePoint["OwnedBy"]) { //publish Win event Events::Win e; e.TeamThatWon = capturePoint["OwnedBy"]; m_EventBroker->Publish(e); - WinnerWasFound = true; + m_WinnerWasFound = true; } }