[Super-tux-commit] supertux/src world.cpp,1.83,1.84

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24809

Modified Files:
	world.cpp 
Log Message:
- fixed crash when hitting badguy with bullet

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- world.cpp	12 May 2004 18:28:37 -0000	1.83
+++ world.cpp	12 May 2004 19:43:08 -0000	1.84
@@ -310,7 +310,7 @@
   }
 }
 
-/* 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 @@
               // 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
             }