projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tux grows faster, stops growing when hit
[supertux.git]
/
src
/
object
/
powerup.hpp
diff --git
a/src/object/powerup.hpp
b/src/object/powerup.hpp
index
f7b6567
..
4779db1
100644
(file)
--- a/
src/object/powerup.hpp
+++ b/
src/object/powerup.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,37
+12,31
@@
// 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 __POWERUP_H__
#define __POWERUP_H__
#ifndef __POWERUP_H__
#define __POWERUP_H__
-#include "
moving_object
.hpp"
+#include "
object/moving_sprite
.hpp"
#include "lisp/lisp.hpp"
#include "lisp/lisp.hpp"
-#include "sprite/sprite.hpp"
#include "collision_hit.hpp"
#include "physic.hpp"
#include "collision_hit.hpp"
#include "physic.hpp"
-class PowerUp : public Moving
Object
+class PowerUp : public Moving
Sprite, private UsesPhysic
{
public:
PowerUp(const lisp::Lisp& lisp);
{
public:
PowerUp(const lisp::Lisp& lisp);
- ~PowerUp();
virtual void update(float elapsed_time);
virtual void update(float elapsed_time);
- virtual void
draw(DrawingContext& contex
t);
+ virtual void
collision_solid(const CollisionHit& hi
t);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-
+
private:
private:
- std::string sprite_name;
- Sprite* sprite;
- Physic physic;
std::string script;
bool no_physics;
};
#endif
std::string script;
bool no_physics;
};
#endif
-