X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsspiky.hpp;h=d99629d587656a94084e9bd44b04b274ae8ea9c3;hb=c8303cceed3279a3580829a28bbb2d7b8d89843b;hp=532e06e019e21b7cb2fc82f382de9410bcdfa646;hpb=4c9b57d29e67f9db5605f378549b07f670baa837;p=supertux.git diff --git a/src/badguy/sspiky.hpp b/src/badguy/sspiky.hpp index 532e06e01..d99629d58 100644 --- a/src/badguy/sspiky.hpp +++ b/src/badguy/sspiky.hpp @@ -20,22 +20,22 @@ #ifndef __SSPIKY_H__ #define __SSPIKY_H__ -#include "badguy.hpp" +#include "walking_badguy.hpp" -class SSpiky : public BadGuy +class SSpiky : public WalkingBadguy { public: SSpiky(const lisp::Lisp& reader); void activate(); 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); -protected: - Timer timer; + virtual SSpiky* clone() const { return new SSpiky(*this); } +protected: enum SSpikyState { SSPIKY_SLEEPING, SSPIKY_WAKING,