kugelblitz electrifies water on contact - electrified water is baaaaaaad

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

diff --git a/src/object/gameobjs.cpp b/src/object/gameobjs.cpp
index e863be3..777db2c 100644 (file)
--- a/src/object/gameobjs.cpp
+++ b/src/object/gameobjs.cpp
@@ -24,17 +24,17 @@
 #include <iostream>
 #include <cmath>
 
-#include "tile.h"
-#include "tile_manager.h"
-#include "game_session.h"
-#include "gameobjs.h"
-#include "sprite/sprite_manager.h"
-#include "resources.h"
-#include "sector.h"
-#include "tilemap.h"
-#include "video/drawing_context.h"
-#include "camera.h"
-#include "main.h"
+#include "tile.hpp"
+#include "tile_manager.hpp"
+#include "game_session.hpp"
+#include "gameobjs.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "resources.hpp"
+#include "sector.hpp"
+#include "tilemap.hpp"
+#include "video/drawing_context.hpp"
+#include "camera.hpp"
+#include "main.hpp"
 
 BouncyCoin::BouncyCoin(const Vector& pos)
   : position(pos)
@@ -50,7 +50,7 @@ BouncyCoin::~BouncyCoin()
 }
 
 void
-BouncyCoin::action(float elapsed_time)
+BouncyCoin::update(float elapsed_time)
 {
   position.y += -200 * elapsed_time;
 
@@ -79,7 +79,7 @@ BrokenBrick::~BrokenBrick()
 }
 
 void
-BrokenBrick::action(float elapsed_time)
+BrokenBrick::update(float elapsed_time)
 {
   position += movement * elapsed_time;
 
@@ -118,7 +118,7 @@ FloatingText::FloatingText(const Vector& pos, int score)
 }
 
 void
-FloatingText::action(float elapsed_time)
+FloatingText::update(float elapsed_time)
 {
   position.y -= 1.4 * elapsed_time;
 
@@ -155,7 +155,7 @@ SmokeCloud::SmokeCloud(const Vector& pos)
 }
 
 void
-SmokeCloud::action(float elapsed_time)
+SmokeCloud::update(float elapsed_time)
 {
   position.y -= 120 * elapsed_time;
 
@@ -209,7 +209,7 @@ Particles::~Particles()
 }
 
 void
-Particles::action(float elapsed_time)
+Particles::update(float elapsed_time)
 {
   Vector camera = Sector::current()->camera->get_translation();