[Super-tux-commit] supertux/src/object player.cpp,1.6,1.7 tilemap.h,1.3,1.4

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

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

Modified Files:
	player.cpp tilemap.h 
Log Message:
had more changes lying around here

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/object/player.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- player.cpp	1 Apr 2005 12:16:53 -0000	1.6
+++ player.cpp	3 Apr 2005 21:22:05 -0000	1.7
@@ -550,18 +550,17 @@
      }
    }
 
-#if 0
    /* In case the player has pressed Down while in a certain range of air,
       enable butt jump action */
   if (input.down && !butt_jump && !duck)
-    if(tiles_on_air(TILES_FOR_BUTTJUMP) && jumping)
+    //if(tiles_on_air(TILES_FOR_BUTTJUMP) && jumping)
       butt_jump = true;
-#endif
 
    /* When Down is not held anymore, disable butt jump */
   if(butt_jump && !input.down)
     butt_jump = false;
 
+#if 0
   // Do butt jump
   if (butt_jump && on_ground() && is_big())
   {
@@ -574,7 +573,6 @@
     
     butt_jump = false;
 
-#if 0
     // Break bricks beneath Tux
     if(Sector::current()->trybreakbrick(
           Vector(base.x + 1, base.y + base.height), false)
@@ -584,9 +582,7 @@
       physic.set_velocity_y(2);
       butt_jump = true;
     }
-#endif
 
-#if 0
     // Kill nearby badguys
     std::vector<GameObject*> gameobjects = Sector::current()->gameobjects;
     for (std::vector<GameObject*>::iterator i = gameobjects.begin();
@@ -606,8 +602,8 @@
           }
       }
     }
-#endif
   }
+#endif
 
   /** jumping is only allowed if we're about to touch ground soon and if the
    * button has been up in between the last jump
@@ -932,6 +928,7 @@
       physic.set_acceleration(0, 0);
       physic.set_velocity(0, 700);
       player_status->lives -= 1;
+      player_status->bonus = NO_BONUS;
       dying = true;
       dying_timer.start(3.0);
       flags |= FLAG_NO_COLLDET;
@@ -948,6 +945,7 @@
     bbox.set_size(31.8, 31.8);
   on_ground_flag = false;
   duck = false;
+  last_ground_y = vector.y;
 
   input.reset();
   physic.reset();

Index: tilemap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/object/tilemap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tilemap.h	25 Mar 2005 20:39:56 -0000	1.3
+++ tilemap.h	3 Apr 2005 21:22:05 -0000	1.4
@@ -93,7 +93,8 @@
   }
 
 private:
-  std::vector<uint32_t> tiles;
+  typedef std::vector<uint32_t> Tiles;
+  Tiles tiles;
   
 private:
   TileManager* tilemanager;