TODO update

[supertux.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index c86ad5d..163f1bd 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -32,15 +32,7 @@
 
 #define FPS (1000 / 25)
 
-
-/* Joystick buttons and axes: */
-
-#define JOY_A 0
-#define JOY_B 1
-#define JOY_START 9
-
-#define JOY_X 0
-#define JOY_Y 1
+enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
 
@@ -56,16 +48,6 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* Hurt modes: */
-
-#define KILL 0
-#define SHRINK 1
-
-/* Directions: */
-
-#define LEFT 0
-#define RIGHT 1
-
 /* Sizes: */
 
 #define SMALL 0
@@ -83,10 +65,15 @@ enum DyingType {
 #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.02
-#define RUN_ACCELERATION_X 0.03
+#define WALK_ACCELERATION_X 0.03
+#define RUN_ACCELERATION_X 0.04
 #define KILL_BOUNCE_YM 8.0
 
 #define SKID_XM 2.0
@@ -98,6 +85,14 @@ enum DyingType {
 
 #define LEVEL_WIDTH 375
 
+/* Timing constants (in ms): */
+
+#define KICKING_TIME 200
+
+/* Scrolling text speed */
+
+#define SCROLL_SPEED_CREDITS 2.0
+#define SCROLL_SPEED_MESSAGE 1.0
 
 /* Debugging */