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

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

diff --git a/src/object/skull_tile.cpp b/src/object/skull_tile.cpp
index 04f140c..6dfecd8 100644 (file)
--- a/src/object/skull_tile.cpp
+++ b/src/object/skull_tile.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  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 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
@@ -14,27 +12,21 @@
 //  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 "skull_tile.hpp"
-#include "lisp/lisp.hpp"
-#include "object_factory.hpp"
-#include "player.hpp"
-#include "sector.hpp"
-#include "resources.hpp"
+#include "math/random_generator.hpp"
+#include "object/player.hpp"
+#include "object/skull_tile.hpp"
 #include "sprite/sprite.hpp"
-#include "random_generator.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
-static const float CRACKTIME = 0.3;
-static const float FALLTIME = 0.8;
+static const float CRACKTIME = 0.3f;
+static const float FALLTIME = 0.8f;
 
-SkullTile::SkullTile(const lisp::Lisp& lisp)
-       : MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC), hit(false), falling(false)
+SkullTile::SkullTile(const Reader& lisp)
+  : MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC), hit(false), falling(false)
 {
-  flags |= FLAG_SOLID;
 }
 
 HitResponse
@@ -51,7 +43,7 @@ void
 SkullTile::draw(DrawingContext& context)
 {
   Vector pos = get_pos();
-  // shacking
+  // shaking
   if(timer.get_timegone() > CRACKTIME) {
     pos.x += systemRandom.rand(-3, 3);
   }
@@ -72,7 +64,6 @@ SkullTile::update(float elapsed_time)
     if(timer.check()) {
       falling = true;
       physic.enable_gravity(true);
-      flags &= ~FLAG_SOLID;
       timer.stop();
     } else if(!timer.started()) {
       timer.start(FALLTIME);
@@ -84,3 +75,5 @@ SkullTile::update(float elapsed_time)
 }
 
 IMPLEMENT_FACTORY(SkullTile, "skull_tile");
+
+/* EOF */