Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003/src
Modified Files:
badguy.cpp
Log Message:
Bugfix: dying variable was not being initialized, thus resulting in those zombie badguys.
Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- badguy.cpp 21 Oct 2004 21:40:33 -0000 1.133
+++ badguy.cpp 22 Oct 2004 22:50:10 -0000 1.134
@@ -210,6 +210,7 @@
frozen_timer.init(true);
timer.init(true);
+ dying = DYING_NOT;
seen = true;
dir = activation_dir;
@@ -904,7 +905,7 @@
if(!seen)
return;
-
+
switch (kind)
{
case BAD_MRICEBLOCK:
@@ -1226,9 +1227,6 @@
void
BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
{
- if(!seen)
- return;
-
BadGuy* pbad_c = NULL;
Bullet* pbullet_c = NULL;
|
