X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=f2bc78a7e4fbbe146c27736a88579426226b08ad;hb=eb87b07de097463cf91cf76be9bbc6b9fc0cad98;hp=8093ab226aa8725d50b44352df886762376992e4;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git diff --git a/src/object/player.cpp b/src/object/player.cpp index 8093ab226..f2bc78a7e 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -23,8 +23,7 @@ #include #include -#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); }