[Super-tux-commit] supertux/src player.cpp,1.139,1.140 player.h,1.69,1.70

[Marek M. <wa...@us...>]

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

Modified Files:
	player.cpp player.h 
Log Message:
Stomp sprite stays in place now (i.e. doesn't follow Tux around anymore)


Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- player.cpp	7 Jun 2004 19:52:38 -0000	1.139
+++ player.cpp	8 Jun 2004 07:12:37 -0000	1.140
@@ -116,7 +116,8 @@
   jumping = false;
   can_jump = true;
   butt_jump = false;
-
+  
+  stomp_pos = Vector(0,0);
   frame_main = 0;
   frame_ = 0;
 
@@ -508,7 +509,13 @@
   // Do butt jump
   if (butt_jump && on_ground() && size == BIG)
   {
+    
+    if (duck) 
+      stomp_pos = Vector(base.x - 32, base.y);
+    else 
+      stomp_pos = Vector(base.x - 32, base.y + 32);    
     stomp_timer.start(STOMP_TIME);
+    
     butt_jump = false;
 
     // Break bricks beneath Tux
@@ -769,10 +776,7 @@
   
   // Draw stomp clouds when doing a butt jump
   if (stomp_timer.check())
-    if (duck) 
-      sprite->stomp->draw(context, Vector(base.x - 32, base.y), LAYER_OBJECTS + 1);
-    else 
-      sprite->stomp->draw(context, Vector(base.x - 32, base.y + 32), LAYER_OBJECTS + 1);
+      sprite->stomp->draw(context, stomp_pos, LAYER_OBJECTS + 1);
 
   // Draw blinking star overlay
   if (invincible_timer.started() &&

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- player.h	7 Jun 2004 19:52:46 -0000	1.69
+++ player.h	8 Jun 2004 07:12:37 -0000	1.70
@@ -153,6 +153,8 @@
   Timer growing_timer;
   Timer stomp_timer;
   Physic physic;
+  
+  Vector stomp_pos;
 
 public:
   Player();