X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fspecialriser.cpp;h=013109a8f3216207b4f8974ea0393e060f0de7c3;hb=78ac7aef674f518549f96160c6354b589553f952;hp=0058d6d76b428d3063618f2aa731d34c24a4de59;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git

diff --git a/src/object/specialriser.cpp b/src/object/specialriser.cpp
index 0058d6d76..013109a8f 100644
--- a/src/object/specialriser.cpp
+++ b/src/object/specialriser.cpp
@@ -1,34 +1,28 @@
-//  $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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  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 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  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.
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <math.h>
-#include "specialriser.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "sprite/sprite_manager.h"
+#include "video/drawing_context.hpp"
+#include "object/specialriser.hpp"
+#include "supertux/sector.hpp"
 
-SpecialRiser::SpecialRiser(MovingObject* _child)
-  : child(_child)
+SpecialRiser::SpecialRiser(Vector pos, MovingObject* _child) :
+  offset(),
+  child(_child)
 {
+  _child->set_pos(pos - Vector(0, 32));
   offset = 0;
 }
 
@@ -37,7 +31,7 @@ SpecialRiser::~SpecialRiser()
 }
 
 void
-SpecialRiser::action(float elapsed_time)
+SpecialRiser::update(float elapsed_time)
 {
   offset += 50 * elapsed_time;
   if(offset > 32) {
@@ -51,8 +45,9 @@ SpecialRiser::draw(DrawingContext& context)
 {
   context.push_transform();
   context.set_translation(
-      context.get_translation() + Vector(0, -32 + offset));
+    context.get_translation() + Vector(0, -32 + offset));
   child->draw(context);
   context.pop_transform();
 }
 
+/* EOF */