Committing RandomGenerator patch from Allen King, with a few small changes

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

diff --git a/src/object/unstable_tile.cpp b/src/object/unstable_tile.cpp
index 1494ac7..a7ac4f9 100644 (file)
--- a/src/object/unstable_tile.cpp
+++ b/src/object/unstable_tile.cpp
@@ -1,13 +1,33 @@
+//  $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 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, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
-#include "unstable_tile.h"
-#include "lisp/lisp.h"
-#include "object_factory.h"
-#include "player.h"
-#include "sector.h"
-#include "resources.h"
-#include "special/sprite_manager.h"
-#include "special/sprite.h"
+#include "unstable_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 "sprite/sprite.hpp"
+#include "random_generator.hpp"
 
 static const float CRACKTIME = 0.3;
 static const float FALLTIME = 0.8;
@@ -18,8 +38,9 @@ UnstableTile::UnstableTile(const lisp::Lisp& lisp)
   lisp.get("x", bbox.p1.x);
   lisp.get("y", bbox.p1.y);
   bbox.set_size(32, 32);
-  sprite = sprite_manager->create("unstable_tile");
+  sprite = sprite_manager->create("images/objects/unstable_tile/unstable_tile.sprite");
   flags |= FLAG_SOLID;
+  set_group(COLGROUP_STATIC);
 }
 
 UnstableTile::~UnstableTile()
@@ -46,14 +67,14 @@ UnstableTile::draw(DrawingContext& context)
   Vector pos = get_pos();
   // shacking
   if(timer.get_timegone() > CRACKTIME) {
-    pos.x += (rand() % 6) - 3;
+    pos.x += systemRandom.rand(-3, 3);
   } 
 
   sprite->draw(context, pos, LAYER_TILES);
 }
 
 void
-UnstableTile::action(float elapsed_time)
+UnstableTile::update(float elapsed_time)
 {
   if(falling) {
     movement = physic.get_movement(elapsed_time);