projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
mriceblock.hpp
diff --git
a/src/badguy/mriceblock.hpp
b/src/badguy/mriceblock.hpp
index
4031e0d
..
ddf3847
100644
(file)
--- a/
src/badguy/mriceblock.hpp
+++ b/
src/badguy/mriceblock.hpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,45
+12,57
@@
// 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 __MRICEBLOCK_H__
#define __MRICEBLOCK_H__
#ifndef __MRICEBLOCK_H__
#define __MRICEBLOCK_H__
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
+#include "object/portable.hpp"
-class MrIceBlock : public
BadGuy
+class MrIceBlock : public
WalkingBadguy, public Portable
{
public:
MrIceBlock(const lisp::Lisp& reader);
{
public:
MrIceBlock(const lisp::Lisp& reader);
- MrIceBlock(
float pos_x, float pos_y
, Direction d);
+ MrIceBlock(
const Vector& pos
, Direction d);
- void
activat
e();
+ void
initializ
e();
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
+ HitResponse collision(GameObject& object, const CollisionHit& hit);
+ void collision_solid(const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+ HitResponse collision_player(Player& player, const CollisionHit& hit);
void active_update(float elapsed_time);
void active_update(float elapsed_time);
+ void grab(MovingObject& object, const Vector& pos, Direction dir);
+ void ungrab(MovingObject& object, Direction dir);
+ bool is_portable() const;
+
+ bool can_break();
+
+ virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
+
protected:
protected:
- bool collision_squished(
Player& player
);
+ bool collision_squished(
GameObject& object
);
private:
enum IceState {
ICESTATE_NORMAL,
ICESTATE_FLAT,
private:
enum IceState {
ICESTATE_NORMAL,
ICESTATE_FLAT,
+ ICESTATE_GRABBED,
ICESTATE_KICKED
};
ICESTATE_KICKED
};
+
+ void set_state(IceState state);
+
IceState ice_state;
IceState ice_state;
+ Timer nokick_timer;
Timer flat_timer;
int squishcount;
Timer flat_timer;
int squishcount;
- bool set_direction;
- Direction initial_direction;
};
#endif
};
#endif
-