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
/
kugelblitz.hpp
diff --git
a/src/badguy/kugelblitz.hpp
b/src/badguy/kugelblitz.hpp
index
30f0b43
..
b169997
100644
(file)
--- a/
src/badguy/kugelblitz.hpp
+++ b/
src/badguy/kugelblitz.hpp
@@
-1,7
+1,7
@@
-// $Id
: jumpy.hpp 2642 2005-06-26 13:38:53Z matzebraun
$
-//
+// $Id$
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5 Marek Moeckel <wansti@gmx
.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,36
+12,45
@@
// 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 __KUGELBLITZ_H__
#define __KUGELBLITZ_H__
#include "badguy.hpp"
#include "timer.hpp"
#ifndef __KUGELBLITZ_H__
#define __KUGELBLITZ_H__
#include "badguy.hpp"
#include "timer.hpp"
+#include "object/electrifier.hpp"
class Kugelblitz : public BadGuy
{
public:
Kugelblitz(const lisp::Lisp& reader);
class Kugelblitz : public BadGuy
{
public:
Kugelblitz(const lisp::Lisp& reader);
- void activate();
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+ void initialize();
HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
+ void collision_solid(const CollisionHit& hit);
+ HitResponse collision_player(Player& player, const CollisionHit& hit);
void write(lisp::Writer& writer);
void active_update(float);
void write(lisp::Writer& writer);
void active_update(float);
+ void kill_fall();
+ void explode();
+
+ virtual Kugelblitz* clone() const { return new Kugelblitz(*this); }
private:
private:
+ void try_activate();
HitResponse hit(const CollisionHit& hit);
Vector pos_groundhit;
bool groundhit_pos_set;
HitResponse hit(const CollisionHit& hit);
Vector pos_groundhit;
bool groundhit_pos_set;
+ bool dying;
Timer movement_timer;
Timer movement_timer;
+ Timer lifetime;
int direction;
int direction;
+ State state;
};
#endif
};
#endif
-