Merge remote-tracking branch 'origin/master' into Menu

2016-02-11 21:16:31 +01:00
parent fee50ba3b6 5bcadd5b1a
commit 851418b1de
23 changed files with 1035 additions and 136 deletions
@@ -16,6 +16,9 @@ void CapturePointHUDSystem::Update(double dt)

    auto CapturePointHUDElements = m_World->GetComponents("CapturePointHUD");
    auto CapturePoints = m_World->GetComponents("CapturePoint");
+    if (CapturePointHUDElements == nullptr) {
+        return;
+    }

    if(!CapturePointHUDElements) {
        return;