X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fspecialriser.cpp;h=60c7861e029d043254ad5ebad18528d3940e9222;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=24ab26f95a3f53dbc24840a6f99aa4459e5f6d2c;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/object/specialriser.cpp b/src/object/specialriser.cpp
index 24ab26f95..60c7861e0 100644
--- a/src/object/specialriser.cpp
+++ b/src/object/specialriser.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,25 +12,24 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
 #include <math.h>
-#include "specialriser.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "app/globals.h"
-#include "sprite/sprite_manager.h"
+#include "specialriser.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "sprite/sprite_manager.hpp"
 
-SpecialRiser::SpecialRiser(MovingObject* _child)
+SpecialRiser::SpecialRiser(Vector pos, MovingObject* _child)
   : child(_child)
 {
+  _child->set_pos(pos - Vector(0, 32));
   offset = 0;
 }
 
@@ -39,7 +38,7 @@ SpecialRiser::~SpecialRiser()
 }
 
 void
-SpecialRiser::action(float elapsed_time)
+SpecialRiser::update(float elapsed_time)
 {
   offset += 50 * elapsed_time;
   if(offset > 32) {
@@ -57,4 +56,3 @@ SpecialRiser::draw(DrawingContext& context)
   child->draw(context);
   context.pop_transform();
 }
-