Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / badguy / yeti_stalactite.cpp

diff --git a/src/badguy/yeti_stalactite.cpp b/src/badguy/yeti_stalactite.cpp
index 86e1f91..6673a27 100644 (file)
--- a/src/badguy/yeti_stalactite.cpp
+++ b/src/badguy/yeti_stalactite.cpp
@@ -1,8 +1,26 @@
-#include "yeti_stalactite.h"
-
-static const float SHAKE_TIME = .8;
-
-YetiStalactite::YetiStalactite(const lisp::Lisp& lisp)
+//  SuperTux
+//  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 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, see <http://www.gnu.org/licenses/>.
+
+#include "badguy/yeti_stalactite.hpp"
+
+#include "supertux/object_factory.hpp"
+
+static const float SHAKE_TIME = .8f;
+
+YetiStalactite::YetiStalactite(const Reader& lisp)
   : Stalactite(lisp)
 {
 }
@@ -25,12 +43,14 @@ YetiStalactite::is_hanging()
 }
 
 void
-YetiStalactite::active_action(float elapsed_time)
+YetiStalactite::active_update(float elapsed_time)
 {
   if(state == STALACTITE_HANGING)
     return;
 
-  Stalactite::active_action(elapsed_time);
+  Stalactite::active_update(elapsed_time);
 }
 
-IMPLEMENT_FACTORY(YetiStalactite, "yeti_stalactite")
+IMPLEMENT_FACTORY(YetiStalactite, "yeti_stalactite");
+
+/* EOF */