projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- decreased kick time even more, fixed type error
[supertux.git]
/
src
/
defines.h
diff --git
a/src/defines.h
b/src/defines.h
index
ef93b93
..
c2c71a7
100644
(file)
--- a/
src/defines.h
+++ b/
src/defines.h
@@
-32,6
+32,8
@@
#define FPS (1000 / 25)
#define FPS (1000 / 25)
+enum Direction { LEFT = 0, RIGHT = 1 };
+
/* Direction (keyboard/joystick) states: */
#define UP 0
/* Direction (keyboard/joystick) states: */
#define UP 0
@@
-46,16
+48,6
@@
enum DyingType {
DYING_FALLING = 2
};
DYING_FALLING = 2
};
-/* Hurt modes: */
-
-#define KILL 0
-#define SHRINK 1
-
-/* Directions: */
-
-#define LEFT 0
-#define RIGHT 1
-
/* Sizes: */
#define SMALL 0
/* Sizes: */
#define SMALL 0
@@
-73,7
+65,12
@@
enum DyingType {
#define RUN_SPEED 1.5
#define JUMP_SPEED 1.2
#define RUN_SPEED 1.5
#define JUMP_SPEED 1.2
-#define GRAVITY 1.0
+/* gameplay related defines */
+
+#define START_LIVES 4
+
+#define MAX_BULLETS 2
+
#define YM_FOR_JUMP 6.0
#define WALK_ACCELERATION_X 0.03
#define RUN_ACCELERATION_X 0.04
#define YM_FOR_JUMP 6.0
#define WALK_ACCELERATION_X 0.03
#define RUN_ACCELERATION_X 0.04
@@
-88,6
+85,9
@@
enum DyingType {
#define LEVEL_WIDTH 375
#define LEVEL_WIDTH 375
+/* Timing constants (in ms): */
+
+#define KICKING_TIME 200
/* Debugging */
/* Debugging */