projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed level editor crash (a hack)
[supertux.git]
/
src
/
gameobjs.h
diff --git
a/src/gameobjs.h
b/src/gameobjs.h
index
ff2e31e
..
49515a3
100644
(file)
--- a/
src/gameobjs.h
+++ b/
src/gameobjs.h
@@
-132,6
+132,9
@@
public:
virtual void collision(const MovingObject& other, int);
void collision(void *p_c_object, int c_object, CollisionType type);
virtual void collision(const MovingObject& other, int);
void collision(void *p_c_object, int c_object, CollisionType type);
+ float get_vel_x() { return vel_x; }
+ float get_vel_y() { return vel_y; }
+
Physic physic;
enum { M_NORMAL, M_HELD } mode;
Physic physic;
enum { M_NORMAL, M_HELD } mode;
@@
-140,6
+143,8
@@
public:
std::vector<int> pos_y;
float velocity;
std::vector<int> pos_y;
float velocity;
+ float vel_x, vel_y; // calculated based in the velocity
+
int point;
bool move;
unsigned int frame;
int point;
bool move;
unsigned int frame;