kugelblitz electrifies water on contact - electrified water is baaaaaaad

[supertux.git] / src / object / specialriser.cpp

diff --git a/src/object/specialriser.cpp b/src/object/specialriser.cpp
index 24ab26f..e15b77e 100644 (file)
--- a/src/object/specialriser.cpp
+++ b/src/object/specialriser.cpp
@@ -17,20 +17,19 @@
 //  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>
 
 #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) {