X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.cpp;h=ed83793ec9d30d6ffc6b8e5f9fa99410e5be8298;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=0260e950e74ca4820a6fb92d256fa0a6fc4140de;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git

diff --git a/src/object/trampoline.cpp b/src/object/trampoline.cpp
index 0260e950e..ed83793ec 100644
--- a/src/object/trampoline.cpp
+++ b/src/object/trampoline.cpp
@@ -2,7 +2,7 @@
 //
 //  SuperTux - Trampoline
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
-//  
+//
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
 //  as published by the Free Software Foundation; either version 2
@@ -25,7 +25,7 @@
 #include "audio/sound_manager.hpp"
 #include "sprite/sprite_manager.hpp"
 
-/* Trampoline will accelerate player to to VY_INITIAL, if 
+/* Trampoline will accelerate player to to VY_INITIAL, if
  * he jumps on it to VY_MIN. */
 namespace {
   const std::string TRAMPOLINE_SOUND = "sounds/trampoline.wav";
@@ -77,7 +77,7 @@ Trampoline::collision(GameObject& other, const CollisionHit& hit )
     float vy = player->physic.get_velocity_y();
     //player is falling down on trampoline
     if(hit.top && vy > 0) {
-      if(player->get_controller()->hold(Controller::JUMP)) { 
+      if(player->get_controller()->hold(Controller::JUMP)) {
         vy = VY_MIN;
       } else {
         vy = VY_INITIAL;
@@ -88,15 +88,15 @@ Trampoline::collision(GameObject& other, const CollisionHit& hit )
       return FORCE_MOVE;
     }
   }
-  //Fake being solid for moving_object. 
+  //Fake being solid for moving_object.
   MovingObject* moving_object = dynamic_cast<MovingObject*> (&other);
   if( moving_object ){
       if( hit.top ){
         float inside = moving_object->get_bbox().get_bottom() - get_bbox().get_top();
         if( inside > 0 ){
           Vector pos = moving_object->get_pos();
-          pos.y -= inside; 
-          moving_object->set_pos( pos );    
+          pos.y -= inside;
+          moving_object->set_pos( pos );
         }
       }
       CollisionHit hit_other = hit;
@@ -107,12 +107,12 @@ Trampoline::collision(GameObject& other, const CollisionHit& hit )
   return FORCE_MOVE;
 }
 
-void 
+void
 Trampoline::collision_solid( const CollisionHit& hit ){
   if( hit.bottom ){
      on_ground = true;
   }
-} 
+}
 
 void
 Trampoline::grab( MovingObject&, const Vector& pos, Direction ){