From: Ryan Flegel <rflegel@gmail.com>
Date: Wed, 12 May 2004 19:43:08 +0000 (+0000)
Subject: - fixed crash when hitting badguy with bullet
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cd411f3e613b604802e7f4a91afc39783eecd505;p=supertux.git

- fixed crash when hitting badguy with bullet

SVN-Revision: 1148
---

diff --git a/src/world.cpp b/src/world.cpp
index 827433e38..7d1da6098 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -310,7 +310,7 @@ World::action(double frame_ratio)
   }
 }
 
-/* the space that it takes for the screen to start scrolling, regarding
+/* the space that it takes for the screen to start scrolling, regarding */
 /* screen bounds (in pixels) */
 // should be higher than screen->w/2 (320)
 #define X_SPACE (400-16)
@@ -414,7 +414,7 @@ World::collision_handler()
               // collision functions of the collided objects.
               // collide with bad_guy first, since bullet_collision will
               // delete the bullet
-              (*j)->collision(0, CO_BULLET);
+              (*j)->collision(&bullets[i], CO_BULLET);
               bullets[i].collision(CO_BADGUY);
               break; // bullet is invalid now, so break
             }