X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdefines.h;h=c96fda4fcacc15461b91d7df911ee44af0e6601d;hb=f9c5c22959ac3020274f3be3531d176e413b0220;hp=2810cf6e71d8454d665a3f38676572f2f76bc341;hpb=f2ee6a2811ee77534fd64da2536b5ad294cc625c;p=supertux.git

diff --git a/src/defines.h b/src/defines.h
index 2810cf6e7..c96fda4fc 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -19,13 +19,15 @@
 //  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: */
@@ -39,6 +41,9 @@ enum Direction { LEFT = 0, RIGHT = 1 };
 #define UP 0
 #define DOWN 1
 
+/* Joystick menu delay */
+#define JOYSTICK_MENU_DELAY 500
+
 /* Dying types: */
 
 /* ---- NO 0 */
@@ -48,10 +53,11 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* Screen proprities: */
-/* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */
-#define SCREEN_W 640
-#define SCREEN_H 480
+/* 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: */
 
@@ -74,7 +80,9 @@ enum DyingType {
 
 #define START_LIVES 4
 
-#define MAX_BULLETS 2
+#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.03
@@ -86,7 +94,8 @@ 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
 
@@ -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*/