X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fskull_tile.cpp;h=ef2ead930aa79b8f0bf1eb2af0886405c60dd7c6;hb=08ccb17345a52f5ffd8a5dd6ecf675cad55f16a7;hp=4afb2075b1845e4ec06ca259e481a0b430ad7ffc;hpb=737a97b08201d5799857bc71faab73689d705846;p=supertux.git

diff --git a/src/object/skull_tile.cpp b/src/object/skull_tile.cpp
index 4afb2075b..ef2ead930 100644
--- a/src/object/skull_tile.cpp
+++ b/src/object/skull_tile.cpp
@@ -1,7 +1,7 @@
-//  $Id: unstable_tile.cpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,11 +12,10 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
@@ -26,33 +25,20 @@
 #include "player.hpp"
 #include "sector.hpp"
 #include "resources.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "sprite/sprite.hpp"
+#include "random_generator.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)
-  : hit(false), falling(false)
+	: MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC), 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("skull_tile");
-  flags |= FLAG_SOLID;
-}
-
-SkullTile::~SkullTile()
-{
-  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;
@@ -64,12 +50,12 @@ void
 SkullTile::draw(DrawingContext& context)
 {
   Vector pos = get_pos();
-  // shacking
+  // shaking
   if(timer.get_timegone() > CRACKTIME) {
-    pos.x += (rand() % 6) - 3;
-  } 
+    pos.x += systemRandom.rand(-3, 3);
+  }
 
-  sprite->draw(context, pos, LAYER_TILES);
+  sprite->draw(context, pos, layer);
 }
 
 void
@@ -84,8 +70,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);