projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made trampolines less likely to interfere with level design:
[supertux.git]
/
src
/
badguy
/
mriceblock.hpp
diff --git
a/src/badguy/mriceblock.hpp
b/src/badguy/mriceblock.hpp
index
ea55065
..
98c4225
100644
(file)
--- a/
src/badguy/mriceblock.hpp
+++ b/
src/badguy/mriceblock.hpp
@@
-20,10
+20,10
@@
#ifndef __MRICEBLOCK_H__
#define __MRICEBLOCK_H__
#ifndef __MRICEBLOCK_H__
#define __MRICEBLOCK_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
#include "object/portable.hpp"
#include "object/portable.hpp"
-class MrIceBlock : public
BadG
uy, public Portable
+class MrIceBlock : public
WalkingBadg
uy, public Portable
{
public:
MrIceBlock(const lisp::Lisp& reader);
{
public:
MrIceBlock(const lisp::Lisp& reader);
@@
-32,7
+32,7
@@
public:
void activate();
void write(lisp::Writer& writer);
HitResponse collision(GameObject& object, const CollisionHit& hit);
void activate();
void write(lisp::Writer& writer);
HitResponse collision(GameObject& object, const CollisionHit& hit);
-
HitResponse collision_solid(GameObject& object,
const CollisionHit& hit);
+
void collision_solid(
const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
HitResponse collision_player(Player& player, const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
HitResponse collision_player(Player& player, const CollisionHit& hit);
@@
-40,6
+40,7
@@
public:
void grab(MovingObject& object, const Vector& pos, Direction dir);
void ungrab(MovingObject& object, Direction dir);
void grab(MovingObject& object, const Vector& pos, Direction dir);
void ungrab(MovingObject& object, Direction dir);
+ bool can_break();
virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }
virtual MrIceBlock* clone() const { return new MrIceBlock(*this); }