Diff: SIgame.cpp

Revision:

2:129acb1b98c7

Parent:

0:4564efa43302

--- a/SIgame.cpp	Tue Mar 05 20:29:40 2013 +0000
+++ b/SIgame.cpp	Thu Mar 07 22:52:36 2013 +0000
@@ -102,7 +102,7 @@
     
     for (i = 0; i < ELASER_CAP; i++)
     {   // Find enemy laser in same location as player's laser if so
-        if (pylaser->x == elaser[i].x && pylaser->y == elaser[i].y && 
+        if (pylaser->x == elaser[i].x && pylaser->y <= elaser[i].y+2 && 
                 !(pylaser->collide || elaser[i].collide))
         {   // Both lasers cancel each other out and disappear on screen
             pylaser->collide = elaser[i].collide = true;
@@ -144,7 +144,8 @@
                 (wave[r][c].x)++;
             
             // Player loses if any alien reaches screen border at player's side
-            if (wave[r][c].y > SCREENHEIGHT - (wave[r][c].height << 1) + 1)
+            if (wave[r][c].y > SCREENHEIGHT - (wave[r][c].height << 1) + 1
+                    && !(wave[r][c].killed))
                 reach = true;
         }
     }