huge CVS merge, see ChangeLog for details.

[supertux.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index b23e03c..19956de 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -7,7 +7,7 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/supertux/
  
-  April 11, 2000 - December 28, 2003
+  April 11, 2000 - February 1, 2004
 */
 
 
@@ -67,20 +67,20 @@
 
 #define MAX_WALK_XM 2.3
 #define MAX_RUN_XM 3.2
-#define MAX_YM 10
-#define MAX_JUMP_TIME 1000
-#define MAX_LIVES 4
+#define MAX_YM 20.0
+#define MAX_JUMP_TIME 375
+#define MAX_LIVES 4.0
 
-#define WALK_SPEED 1
+#define WALK_SPEED 1.0
 #define RUN_SPEED 1.5
-#define JUMP_SPEED 1.5
+#define JUMP_SPEED 1.2
 
-#define GRAVITY 1
-#define YM_FOR_JUMP 50
-#define KILL_BOUNCE_YM 8
+#define GRAVITY 1.0
+#define YM_FOR_JUMP 6.0
+#define KILL_BOUNCE_YM 8.0
 
-#define SKID_XM 2
-#define SKID_TIME 4
+#define SKID_XM 2.0
+#define SKID_TIME 200
 
 /* Size constraints: */