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
b3a28ec
..
b6a35ed
100644
(file)
--- a/
src/badguy/sspiky.hpp
+++ b/
src/badguy/sspiky.hpp
@@
-1,7
+1,7
@@
-// $Id
: sspiky.hpp 2642 2005-06-26 13:38:53Z matzebraun
$
-//
+// $Id$
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,38
+12,39
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#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);
-protected:
-
Timer timer
;
+ void freeze();
+
bool is_freezable() const
;
+ virtual SSpiky* clone() const { return new SSpiky(*this); }
+
+protected:
enum SSpikyState {
SSPIKY_SLEEPING,
SSPIKY_WAKING,
SSPIKY_WALKING
};
SSpikyState state;
enum SSpikyState {
SSPIKY_SLEEPING,
SSPIKY_WAKING,
SSPIKY_WALKING
};
SSpikyState state;
-
};
#endif
};
#endif