projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove draw_text from renderer.hpp and lightmap.hpp since text drawing is done in...
[supertux.git]
/
src
/
badguy
/
poisonivy.hpp
diff --git
a/src/badguy/poisonivy.hpp
b/src/badguy/poisonivy.hpp
index
0005eaa
..
783f232
100644
(file)
--- a/
src/badguy/poisonivy.hpp
+++ b/
src/badguy/poisonivy.hpp
@@
-20,25
+20,20
@@
#ifndef __POISONIVY_H__
#define __POISONIVY_H__
#ifndef __POISONIVY_H__
#define __POISONIVY_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class PoisonIvy : public
BadG
uy
+class PoisonIvy : public
WalkingBadg
uy
{
public:
PoisonIvy(const lisp::Lisp& reader);
{
public:
PoisonIvy(const lisp::Lisp& reader);
- PoisonIvy(
float pos_x, float pos_y
, Direction d);
+ PoisonIvy(
const Vector& pos
, Direction d);
- void activate();
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
- HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-
virtual PoisonIvy* clone() const { return new PoisonIvy(*this); }
protected:
virtual PoisonIvy* clone() const { return new PoisonIvy(*this); }
protected:
- bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
+ bool collision_squished(GameObject& object);
+
};
#endif
};
#endif