projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- replaced YES/NO with true/false
[supertux.git]
/
src
/
defines.h
diff --git
a/src/defines.h
b/src/defines.h
index
542351e
..
97c7a78
100644
(file)
--- a/
src/defines.h
+++ b/
src/defines.h
@@
-3,11
+3,11
@@
Super Tux
Super Tux
- by Bill Kendrick
+ by Bill Kendrick
& Tobias Glaesser <tobi.web@gmx.de>
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/supertux/
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/supertux/
- April 11, 2000 -
December 28, 2003
+ April 11, 2000 -
March 15, 2004
*/
*/
@@
-16,7
+16,9
@@
#define SUPERTUX_DEFINES_H
/* Version: */
#define SUPERTUX_DEFINES_H
/* Version: */
-#define VERSION "0.0.5"
+#ifndef VERSION
+ #define VERSION "0.0.5-0.0.6-CVS"
+#endif
/* Frames per second: */
/* Frames per second: */
@@
-31,12
+33,6
@@
#define JOY_X 0
#define JOY_Y 1
#define JOY_X 0
#define JOY_Y 1
-
-/* Booleans: */
-
-#define NO 0
-#define YES 1
-
/* Direction (keyboard/joystick) states: */
#define UP 0
/* Direction (keyboard/joystick) states: */
#define UP 0
@@
-45,8
+41,11
@@
/* Dying types: */
/* ---- NO 0 */
/* Dying types: */
/* ---- NO 0 */
-#define SQUISHED 1
-#define FALLING 2
+enum DyingType {
+ DYING_NOT = 0,
+ DYING_SQUISHED = 1,
+ DYING_FALLING = 2
+};
/* Hurt modes: */
/* Hurt modes: */
@@
-65,22
+64,22
@@
/* Speed constraints: */
/* Speed constraints: */
-#define MAX_WALK_XM
8
-#define MAX_RUN_XM 3
-#define MAX_YM
1
0
-#define MAX_JUMP_TIME
1000
-#define MAX_LIVES 4
+#define MAX_WALK_XM
2.3
+#define MAX_RUN_XM 3
.2
+#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 RUN_SPEED 1.5
-#define JUMP_SPEED 1.
5
+#define JUMP_SPEED 1.
2
-#define GRAVITY 1
-#define YM_FOR_JUMP
5
0
-#define KILL_BOUNCE_YM 8
+#define GRAVITY 1
.0
+#define YM_FOR_JUMP
6.
0
+#define KILL_BOUNCE_YM 8
.0
-#define SKID_XM
4
-#define SKID_TIME
8
+#define SKID_XM
2.0
+#define SKID_TIME
200
/* Size constraints: */
/* Size constraints: */