fixed a bug in my last effects removal, improved the algo to determine if a badguy...

[supertux.git] / src / object / player.cpp

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 8093ab2..f2bc78a 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -23,8 +23,7 @@
 #include <iostream>
 #include <cassert>
 
-#include "app/globals.h"
-#include "app/gettext.h"
+#include "gettext.h"
 #include "sprite/sprite_manager.h"
 #include "player.h"
 #include "tile.h"
@@ -80,17 +79,16 @@ TuxBodyParts::set_action(std::string action, int loops)
 }
 
 void
-TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer,
-                  Uint32 drawing_effect)
+TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer)
 {
   if(head != NULL)
-    head->draw(context, pos, layer-1, drawing_effect);
+    head->draw(context, pos, layer-1);
   if(body != NULL)
-    body->draw(context, pos, layer-3, drawing_effect);
+    body->draw(context, pos, layer-3);
   if(arms != NULL)
-    arms->draw(context, pos, layer,   drawing_effect);
+    arms->draw(context, pos, layer);
   if(feet != NULL)
-    feet->draw(context, pos, layer-2, drawing_effect);
+    feet->draw(context, pos, layer-2);
 }
 
 Player::Player(PlayerStatus* _player_status)
@@ -898,6 +896,6 @@ Player::bounce(BadGuy& )
   if(controller->hold(Controller::JUMP))
     physic.set_velocity_y(520);
   else
-    physic.set_velocity_y(200);
+    physic.set_velocity_y(300);
 }