X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpushbutton.cpp;h=3630cf6e31ec4fe347e3e0e89b964d356a2f4d59;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=38f1119802ef35356714bd0e29b0880b5b12a807;hpb=714a30abd887def6331a193216387e66cbfbd1bb;p=supertux.git

diff --git a/src/object/pushbutton.cpp b/src/object/pushbutton.cpp
index 38f111980..3630cf6e3 100644
--- a/src/object/pushbutton.cpp
+++ b/src/object/pushbutton.cpp
@@ -27,6 +27,7 @@
 #include "sprite/sprite_manager.hpp"
 #include "sector.hpp"
 #include "log.hpp"
+#include "sprite/sprite.hpp"
 
 namespace {
   const std::string BUTTON_SOUND = "sounds/switch.ogg";
@@ -34,7 +35,7 @@ namespace {
 }
 
 PushButton::PushButton(const lisp::Lisp& lisp)
-	: MovingSprite(lisp, "images/objects/pushbutton/pushbutton.sprite", LAYER_BACKGROUNDTILES+1, COLGROUP_MOVING), state(OFF)
+        : MovingSprite(lisp, "images/objects/pushbutton/pushbutton.sprite", LAYER_BACKGROUNDTILES+1, COLGROUP_MOVING), state(OFF)
 {
   sound_manager->preload(BUTTON_SOUND);
   set_action("off", -1);
@@ -53,10 +54,10 @@ PushButton::collision(GameObject& other, const CollisionHit& hit)
 {
   Player* player = dynamic_cast<Player*>(&other);
   if (!player) return FORCE_MOVE;
-  float vy = player->physic.vy;
+  float vy = player->physic.get_velocity_y();
 
   //player->add_velocity(Vector(0, -150));
-  player->physic.vy = -150;
+  player->physic.set_velocity_y(-150);
 
   if (state != OFF) return FORCE_MOVE;
   if (!hit.top) return FORCE_MOVE;
@@ -71,7 +72,7 @@ PushButton::collision(GameObject& other, const CollisionHit& hit)
 
   // play sound
   sound_manager->play(BUTTON_SOUND);
-  
+
   // run script
   std::istringstream stream(script);
   Sector::current()->run_script(stream, "PushButton");
@@ -80,4 +81,3 @@ PushButton::collision(GameObject& other, const CollisionHit& hit)
 }
 
 IMPLEMENT_FACTORY(PushButton, "pushbutton");
-