projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve exception feedback a bit
[supertux.git]
/
src
/
defines.h
diff --git
a/src/defines.h
b/src/defines.h
index
c86ad5d
..
8d1e184
100644
(file)
--- a/
src/defines.h
+++ b/
src/defines.h
@@
-19,28
+19,18
@@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
-#if !defined( SUPERTUX_DEFINES_H )
+#ifndef SUPERTUX_DEFINES_H
+#define SUPERTUX_DEFINES_H 1
+
+#include <config.h>
-#define SUPERTUX_DEFINES_H
/* Version: */
#ifndef VERSION
/* Version: */
#ifndef VERSION
- #define VERSION "0.
0.5-0.0.6-CVS
"
+ #define VERSION "0.
1.1
"
#endif
#endif
-/* Frames per second: */
-
-#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: */
/* Direction (keyboard/joystick) states: */
@@
-56,20
+46,11
@@
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
-#define BIG 1
+/* Screen-related stuff */
+// +1 is needed because when tiles are wrapping around the screen there
+// are two partial tiles on the screen
+#define VISIBLE_TILES_X (25 +1)
+#define VISIBLE_TILES_Y (19 +1)
/* Speed constraints: */
/* Speed constraints: */
@@
-83,10
+64,17
@@
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_FIRE_BULLETS 2
+#define MAX_ICE_BULLETS 1
+#define FROZEN_TIME 3000
+
#define YM_FOR_JUMP 6.0
#define YM_FOR_JUMP 6.0
-#define WALK_ACCELERATION_X 0.0
2
-#define RUN_ACCELERATION_X 0.0
3
+#define WALK_ACCELERATION_X 0.0
3
+#define RUN_ACCELERATION_X 0.0
4
#define KILL_BOUNCE_YM 8.0
#define SKID_XM 2.0
#define KILL_BOUNCE_YM 8.0
#define SKID_XM 2.0
@@
-94,10
+82,8
@@
enum DyingType {
/* Size constraints: */
/* Size constraints: */
-#define OFFSCREEN_DISTANCE 256
-
-#define LEVEL_WIDTH 375
-
+#define X_OFFSCREEN_DISTANCE (screen->w/2)
+#define Y_OFFSCREEN_DISTANCE (screen->h/2)
/* Debugging */
/* Debugging */
@@
-109,5
+95,7
@@
enum DyingType {
#define DEBUG_MSG( msg ) {}
#endif
#define DEBUG_MSG( msg ) {}
#endif
-#endif
+#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
+
+#endif /*SUPERTUX_DEFINES_H*/