projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made buttjump a bit easier to perform
[supertux.git]
/
src
/
object
/
coin.hpp
diff --git
a/src/object/coin.hpp
b/src/object/coin.hpp
index
e4f3d9b
..
16d04c9
100644
(file)
--- a/
src/object/coin.hpp
+++ b/
src/object/coin.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,35
+12,26
@@
// 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 __COIN_H__
#define __COIN_H__
#ifndef __COIN_H__
#define __COIN_H__
-#include "moving_
object
.hpp"
+#include "moving_
sprite
.hpp"
#include "lisp/lisp.hpp"
#include "lisp/lisp.hpp"
-class Sprite;
-
-class Coin : public MovingObject
+class Coin : public MovingSprite
{
public:
Coin(const Vector& pos);
Coin(const lisp::Lisp& reader);
{
public:
Coin(const Vector& pos);
Coin(const lisp::Lisp& reader);
- ~Coin();
HitResponse collision(GameObject& other, const CollisionHit& hit);
HitResponse collision(GameObject& other, const CollisionHit& hit);
- void update(float elapsed_time);
- void draw(DrawingContext& context);
void collect();
void collect();
-
-private:
- Sprite* sprite;
};
#endif
};
#endif
-