X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fskull_tile.cpp;h=48d9ed2209d98042bb3ff9fcc5a861dcc0a6e938;hb=590d47c3c3cf4641d97ee1579af69edbc355e5a8;hp=66e4c90eeac89bd9fc0509a2bc0350bd6a5f4e7a;hpb=d963f8dc3d2c4e432d3eeecd15351169e10243da;p=supertux.git

diff --git a/src/object/skull_tile.cpp b/src/object/skull_tile.cpp
index 66e4c90ee..48d9ed220 100644
--- 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,47 +12,30 @@
 //  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 "sprite/sprite_manager.hpp"
+#include "math/random_generator.hpp"
+#include "object/player.hpp"
+#include "object/skull_tile.hpp"
 #include "sprite/sprite.hpp"
-#include "random_generator.hpp"
-
-static const float CRACKTIME = 0.3;
-static const float FALLTIME = 0.8;
-
-SkullTile::SkullTile(const lisp::Lisp& lisp)
-  : hit(false), falling(false)
-{
-  lisp.get("x", bbox.p1.x);
-  lisp.get("y", bbox.p1.y);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("images/objects/skull_tile/skull_tile.sprite");
-  flags |= FLAG_SOLID;
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
-  set_group(COLGROUP_STATIC);
-}
+static const float CRACKTIME = 0.3f;
+static const float FALLTIME = 0.8f;
 
-SkullTile::~SkullTile()
+SkullTile::SkullTile(const Reader& lisp) :
+  MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC),
+  physic(),
+  timer(),
+  hit(false),
+  falling(false)
 {
-  delete sprite;
 }
 
 HitResponse
-SkullTile::collision(GameObject& other, const CollisionHit& hitdata)
+SkullTile::collision(GameObject& other, const CollisionHit& )
 {
-  if(hitdata.normal.y < 0.8)
-    return FORCE_MOVE;
-
   Player* player = dynamic_cast<Player*> (&other);
   if(player)
     hit = true;
@@ -66,12 +47,12 @@ void
 SkullTile::draw(DrawingContext& context)
 {
   Vector pos = get_pos();
-  // shacking
+  // shaking
   if(timer.get_timegone() > CRACKTIME) {
-    pos.x += systemRandom.rand(-3, 3);
-  } 
+    pos.x += graphicsRandom.rand(-3, 3);
+  }
 
-  sprite->draw(context, pos, LAYER_TILES);
+  sprite->draw(context, pos, layer);
 }
 
 void
@@ -86,8 +67,7 @@ SkullTile::update(float elapsed_time)
   } else if(hit) {
     if(timer.check()) {
       falling = true;
-      physic.enable_gravity(true);      
-      flags &= ~FLAG_SOLID;
+      physic.enable_gravity(true);
       timer.stop();
     } else if(!timer.started()) {
       timer.start(FALLTIME);
@@ -98,4 +78,4 @@ SkullTile::update(float elapsed_time)
   hit = false;
 }
 
-IMPLEMENT_FACTORY(SkullTile, "skull_tile");
+/* EOF */