fixed array update

gustavo-tomas · Jul 19, 2022 · 80acccb · 80acccb
1 parent 9b84ad6
commit 80acccb
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/State.cpp b/src/State.cpp
@@ -85,24 +85,29 @@ void State::Update(float dt)
         InputManager::GetInstance().QuitRequested())
         quitRequested = true;    
 
+    // Updates GOs
     for (unsigned long i = 0; i < objectArray.size(); i++)
-    {
-        // Updates GOs
         objectArray[i]->Update(dt);
+
+    // Checks for colisions
+    for (unsigned long i = 0; i < objectArray.size(); i++)
+    {
         if (objectArray[i]->IsDead())
             objectArray.erase(objectArray.begin() + i);
 
-        // Checks for colisions
-        for (unsigned long j = i + 1; j < objectArray.size(); j++)
+        else
         {
-            Collider* colliderA = (Collider*) objectArray[i]->GetComponent("Collider");
-            Collider* colliderB = (Collider*) objectArray[j]->GetComponent("Collider");
-            if (colliderA != nullptr && colliderB != nullptr)
+            for (unsigned long j = i + 1; j < objectArray.size(); j++)
             {
-                if (Collision::IsColliding(colliderA->box, colliderB->box, objectArray[i]->angleDeg, objectArray[j]->angleDeg))
+                Collider* colliderA = (Collider*) objectArray[i]->GetComponent("Collider");
+                Collider* colliderB = (Collider*) objectArray[j]->GetComponent("Collider");
+                if (colliderA != nullptr && colliderB != nullptr)
                 {
-                    objectArray[i]->NotifyCollision(*objectArray[j]);
-                    objectArray[j]->NotifyCollision(*objectArray[i]);
+                    if (Collision::IsColliding(colliderA->box, colliderB->box, objectArray[i]->angleDeg, objectArray[j]->angleDeg))
+                    {
+                        objectArray[i]->NotifyCollision(*objectArray[j]);
+                        objectArray[j]->NotifyCollision(*objectArray[i]);
+                    }
                 }
             }
         }