projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Finish work on Path through the Clouds
[supertux.git]
/
src
/
object
/
flower.hpp
diff --git
a/src/object/flower.hpp
b/src/object/flower.hpp
index
fadca51
..
e1c06ac
100644
(file)
--- a/
src/object/flower.hpp
+++ b/
src/object/flower.hpp
@@
-1,7
+1,7
@@
// $Id$
// $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,25
+12,22
@@
// 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 __FLOWER_H__
#define __FLOWER_H__
#include "moving_object.hpp"
#include "sprite/sprite.hpp"
#ifndef __FLOWER_H__
#define __FLOWER_H__
#include "moving_object.hpp"
#include "sprite/sprite.hpp"
-#include "p
hysic
.hpp"
+#include "p
layer_status
.hpp"
class Flower : public MovingObject
{
public:
class Flower : public MovingObject
{
public:
- enum Type {
- FIREFLOWER, ICEFLOWER
- };
- Flower(Type type);
+ Flower(BonusType type);
~Flower();
virtual void update(float elapsed_time);
~Flower();
virtual void update(float elapsed_time);
@@
-38,9
+35,8
@@
public:
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
private:
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
private:
- Type type;
+
Bonus
Type type;
Sprite* sprite;
};
#endif
Sprite* sprite;
};
#endif
-