projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
object
/
growup.hpp
diff --git
a/src/object/growup.hpp
b/src/object/growup.hpp
index
ef62aeb
..
ec7484b
100644
(file)
--- a/
src/object/growup.hpp
+++ b/
src/object/growup.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,32
+12,28
@@
// 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 __GROWUP_H__
#define __GROWUP_H__
#ifndef __GROWUP_H__
#define __GROWUP_H__
-#include "moving_object.hpp"
-#include "sprite/sprite.hpp"
+#include "object/moving_sprite.hpp"
#include "physic.hpp"
#include "physic.hpp"
+#include "direction.hpp"
-class GrowUp : public Moving
Object
+class GrowUp : public Moving
Sprite, private UsesPhysic
{
public:
{
public:
- GrowUp();
- ~GrowUp();
+ GrowUp(
Direction direction = RIGHT
);
+ virtual GrowUp* clone() const { return new GrowUp(*this); }
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:
- Sprite* sprite;
- Physic physic;
+ void do_jump();
};
#endif
};
#endif
-