projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
sspiky.hpp
diff --git
a/src/badguy/sspiky.hpp
b/src/badguy/sspiky.hpp
index
bb77419
..
b6a35ed
100644
(file)
--- a/
src/badguy/sspiky.hpp
+++ b/
src/badguy/sspiky.hpp
@@
-20,24
+20,25
@@
#ifndef __SSPIKY_H__
#define __SSPIKY_H__
#ifndef __SSPIKY_H__
#define __SSPIKY_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class SSpiky : public
BadG
uy
+class SSpiky : public
WalkingBadg
uy
{
public:
SSpiky(const lisp::Lisp& reader);
{
public:
SSpiky(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);
+ void freeze();
+ bool is_freezable() const;
+
virtual SSpiky* clone() const { return new SSpiky(*this); }
protected:
virtual SSpiky* clone() const { return new SSpiky(*this); }
protected:
- Timer timer;
-
enum SSpikyState {
SSPIKY_SLEEPING,
SSPIKY_WAKING,
enum SSpikyState {
SSPIKY_SLEEPING,
SSPIKY_WAKING,