projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#303: Typo fixes from mathnerd314
[supertux.git]
/
src
/
object
/
gameobjs.hpp
diff --git
a/src/object/gameobjs.hpp
b/src/object/gameobjs.hpp
index
d15ed27
..
b3d50d7
100644
(file)
--- a/
src/object/gameobjs.hpp
+++ b/
src/object/gameobjs.hpp
@@
-22,7
+22,6
@@
#include "video/surface.hpp"
#include "timer.hpp"
#include "video/surface.hpp"
#include "timer.hpp"
-#include "physic.hpp"
#include "game_object.hpp"
#include "moving_object.hpp"
#include "serializable.hpp"
#include "game_object.hpp"
#include "moving_object.hpp"
#include "serializable.hpp"
@@
-37,7
+36,7
@@
class Sprite;
class BouncyCoin : public GameObject
{
public:
class BouncyCoin : public GameObject
{
public:
- BouncyCoin(const Vector& pos);
+ BouncyCoin(const Vector& pos
, bool emerge=false
);
~BouncyCoin();
virtual void update(float elapsed_time);
virtual void draw(DrawingContext& context);
~BouncyCoin();
virtual void update(float elapsed_time);
virtual void draw(DrawingContext& context);
@@
-46,6
+45,7
@@
private:
Sprite* sprite;
Vector position;
Timer timer;
Sprite* sprite;
Vector position;
Timer timer;
+ float emerge_distance;
};
class BrokenBrick : public GameObject
};
class BrokenBrick : public GameObject