projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a bottom and top section to grumbel's blue mountain background. Extended 23...
[supertux.git]
/
src
/
badguy
/
spiky.hpp
diff --git
a/src/badguy/spiky.hpp
b/src/badguy/spiky.hpp
index
c0e448e
..
98f7e28
100644
(file)
--- a/
src/badguy/spiky.hpp
+++ b/
src/badguy/spiky.hpp
@@
-20,19
+20,14
@@
#ifndef __SPIKY_H__
#define __SPIKY_H__
#ifndef __SPIKY_H__
#define __SPIKY_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class Spiky : public
BadG
uy
+class Spiky : public
WalkingBadg
uy
{
public:
Spiky(const lisp::Lisp& reader);
{
public:
Spiky(const lisp::Lisp& reader);
- void activate();
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- void active_update(float elapsed_time);
- void collision_solid(const CollisionHit& hit);
- HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
-
virtual Spiky* clone() const { return new Spiky(*this); }
private:
virtual Spiky* clone() const { return new Spiky(*this); }
private: