projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more aspect ratio stuff
[supertux.git]
/
src
/
badguy
/
plant.hpp
diff --git
a/src/badguy/plant.hpp
b/src/badguy/plant.hpp
index
ab0dfd5
..
97aea8b
100644
(file)
--- a/
src/badguy/plant.hpp
+++ b/
src/badguy/plant.hpp
@@
-27,9
+27,9
@@
class Plant : public BadGuy
public:
Plant(const lisp::Lisp& reader);
public:
Plant(const lisp::Lisp& reader);
- void
activat
e();
+ void
initializ
e();
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
-
HitResponse collision_solid(GameObject& other,
const CollisionHit& hit);
+
void collision_solid(
const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
void active_update(float elapsed_time);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
void active_update(float elapsed_time);
@@
-44,7
+44,7
@@
protected:
PLANT_WALKING
};
PlantState state;
PLANT_WALKING
};
PlantState state;
-
+
};
#endif
};
#endif