projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...
[supertux.git]
/
src
/
object
/
firefly.hpp
diff --git
a/src/object/firefly.hpp
b/src/object/firefly.hpp
index
6f9f021
..
6325087
100644
(file)
--- a/
src/object/firefly.hpp
+++ b/
src/object/firefly.hpp
@@
-1,7
+1,7
@@
-// $Id
: bell.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,36
@@
// 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 __FIREFLY_H__
#define __FIREFLY_H__
#include "lisp/lisp.hpp"
#ifndef __FIREFLY_H__
#define __FIREFLY_H__
#include "lisp/lisp.hpp"
-#include "moving_object.hpp"
-#include "sprite/sprite.hpp"
+#include "object/moving_sprite.hpp"
#include "serializable.hpp"
#include "serializable.hpp"
+#include "badguy/badguy.hpp"
/**
* A Firefly: When tux touches it, it begins buzzing and you will respawn at this
* position.
*/
/**
* A Firefly: When tux touches it, it begins buzzing and you will respawn at this
* position.
*/
-class Firefly : public Moving
Object
, public Serializable
+class Firefly : public Moving
Sprite
, public Serializable
{
public:
Firefly(const lisp::Lisp& lisp);
{
public:
Firefly(const lisp::Lisp& lisp);
- ~Firefly();
+ virtual Firefly* clone() const { return new Firefly(*this); }
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- void update(float elapsed_time);
- void draw(DrawingContext& context);
HitResponse collision(GameObject& other, const CollisionHit& hit);
private:
HitResponse collision(GameObject& other, const CollisionHit& hit);
private:
- Sprite* sprite;
- bool ringing;
+ bool activated;
+ Vector initial_position; /**< position as in level file. This is where Tux will have to respawn, as the level is reset every time */
+ void reactivate();
};
#endif
};
#endif
-