projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating cherrybomb, adding juicebox (blue bomb).
[supertux.git]
/
src
/
badguy
/
mriceblock.hpp
diff --git
a/src/badguy/mriceblock.hpp
b/src/badguy/mriceblock.hpp
index
d3ad9db
..
ea55065
100644
(file)
--- a/
src/badguy/mriceblock.hpp
+++ b/
src/badguy/mriceblock.hpp
@@
-27,7
+27,7
@@
class MrIceBlock : public BadGuy, 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 activate();
void write(lisp::Writer& writer);
void activate();
void write(lisp::Writer& writer);
@@
-59,8
+59,6
@@
private:
IceState ice_state;
Timer flat_timer;
int squishcount;
IceState ice_state;
Timer flat_timer;
int squishcount;
- bool set_direction;
- Direction initial_direction;
};
#endif
};
#endif