- fixed the bouncybrick artifact bug

[supertux.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index c86ad5d..c96fda4 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -19,34 +19,31 @@
 //  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
-       #define VERSION "0.0.5-0.0.6-CVS"
+       #define VERSION "0.1.1"
 #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: */
 
 #define UP 0
 #define DOWN 1
 
+/* Joystick menu delay */
+#define JOYSTICK_MENU_DELAY 500
+
 /* Dying types: */
 
 /* ---- NO 0 */
@@ -56,15 +53,11 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* Hurt modes: */
-
-#define KILL 0
-#define SHRINK 1
-
-/* Directions: */
-
-#define LEFT 0
-#define RIGHT 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)
 
 /* Sizes: */
 
@@ -83,10 +76,17 @@ 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_FIRE_BULLETS 2
+#define MAX_ICE_BULLETS  1
+#define FROZEN_TIME 3000
+
 #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
@@ -94,10 +94,19 @@ enum DyingType {
 
 /* Size constraints: */
 
-#define OFFSCREEN_DISTANCE 256
+#define X_OFFSCREEN_DISTANCE (screen->w/2)
+#define Y_OFFSCREEN_DISTANCE (screen->h/2)
 
 #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 */
 
@@ -109,5 +118,7 @@ enum DyingType {
        #define DEBUG_MSG( msg ) {}
 #endif
 
-#endif
+#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
+
+#endif /*SUPERTUX_DEFINES_H*/