Fix potential bug when checking collisions

MatthewL246 · Dec 4, 2023 · e3ef779 · e3ef779
1 parent 845f95e
commit e3ef779
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/source/game.c b/source/game.c
@@ -27,6 +27,7 @@ void CheckBulletEnemyCollisions(void)
             {
                 currentBullet->health -= 1;
                 currentEnemy->health -= currentBullet->damage;
+                bool shouldReturn = false;
 
                 if (currentBullet->health <= 0)
                 {
@@ -37,7 +38,8 @@ void CheckBulletEnemyCollisions(void)
 
                     if (!currentBullet)
                     {
-                        return;
+                        // There are no more bullets to iterate
+                        shouldReturn = true;
                     }
                 }
                 if (currentEnemy->health <= 0)
@@ -48,9 +50,15 @@ void CheckBulletEnemyCollisions(void)
 
                     if (!currentEnemy)
                     {
-                        return;
+                        // There are no more enemies to iterate
+                        shouldReturn = true;
                     }
                 }
+
+                if (shouldReturn)
+                {
+                    return;
+                }
             }
         }
     }