projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#303: Typo fixes from mathnerd314
[supertux.git]
/
src
/
object
/
unstable_tile.hpp
diff --git
a/src/object/unstable_tile.hpp
b/src/object/unstable_tile.hpp
index
aec3e0e
..
a6bb71e
100644
(file)
--- a/
src/object/unstable_tile.hpp
+++ b/
src/object/unstable_tile.hpp
@@
-1,7
+1,8
@@
// $Id$
// $Id$
-//
-// SuperTux
-// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+// SuperTux - Unstable Tile
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,40
+13,38
@@
// 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.
// 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
// 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.
+
#ifndef __UNSTABLE_TILE_H__
#define __UNSTABLE_TILE_H__
#ifndef __UNSTABLE_TILE_H__
#define __UNSTABLE_TILE_H__
-#include "
moving_object
.hpp"
+#include "
object/moving_sprite
.hpp"
#include "lisp/lisp.hpp"
#include "physic.hpp"
#include "timer.hpp"
#include "lisp/lisp.hpp"
#include "physic.hpp"
#include "timer.hpp"
-class Sprite;
-class Player;
-
-/** A tile that starts falling down if tux stands to long on it */
-class UnstableTile : public MovingObject
+/**
+ * A block that disintegrates when stood on
+ */
+class UnstableTile : public MovingSprite, public UsesPhysic
{
public:
UnstableTile(const lisp::Lisp& lisp);
{
public:
UnstableTile(const lisp::Lisp& lisp);
- ~UnstableTile();
+ virtual UnstableTile* clone() const { return new UnstableTile(*this); }
HitResponse collision(GameObject& other, const CollisionHit& hit);
void update(float elapsed_time);
HitResponse collision(GameObject& other, const CollisionHit& hit);
void update(float elapsed_time);
- void draw(DrawingContext& context);
private:
private:
- Physic physic;
- Sprite* sprite;
- Timer timer;
- bool hit;
- bool falling;
+ enum State {
+ STATE_NORMAL, /**< default state */
+ STATE_CRUMBLING, /**< crumbling, still solid */
+ STATE_DISINTEGRATING /**< disintegrating, no longer solid */
+ };
+ State state;
};
#endif
};
#endif
-