[Super-tux-commit] supertux/src/badguy badguy.cpp,1.4,1.5 dispenser.cpp,1.3,1.4

[Matze B. <mat...@us...>]

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

Modified Files:
	badguy.cpp dispenser.cpp 
Log Message:
some cleanups in the sprite class, increased delta for collision response

Index: dispenser.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dispenser.cpp	24 Nov 2004 18:19:51 -0000	1.3
+++ dispenser.cpp	24 Nov 2004 23:10:05 -0000	1.4
@@ -45,7 +45,7 @@
 }
 
 void
-Dispenser::active_action(float elapsed_time)
+Dispenser::active_action(float )
 {
    if (dispense_timer.check()) {
       launch_badguy();

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/badguy.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- badguy.cpp	23 Nov 2004 16:47:26 -0000	1.4
+++ badguy.cpp	24 Nov 2004 23:10:05 -0000	1.5
@@ -194,6 +194,9 @@
       }
       flags |= FLAG_NO_COLLDET;
       break;
+    case STATE_FALLING:
+      flags |= FLAG_NO_COLLDET;
+      break;
     default:
       break;
   }