X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdefines.h;h=8d1e18459c6ff417c3f7c3a8fbf1b7775cb60927;hb=546364c9567ef212ea9276201facf73f5ada696a;hp=163f1bdd3e70a095b44d6ae4bbdf13f18a9fedaa;hpb=a53b840b2644f292a348533f86745588c08424d9;p=supertux.git

diff --git a/src/defines.h b/src/defines.h
index 163f1bdd3..8d1e18459 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -19,19 +19,17 @@
 //  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)
-
 enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
@@ -48,10 +46,11 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* 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: */
 
@@ -69,7 +68,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
@@ -81,18 +82,8 @@ enum DyingType {
 
 /* Size constraints: */
 
-#define OFFSCREEN_DISTANCE 256
-
-#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
+#define X_OFFSCREEN_DISTANCE (screen->w/2)
+#define Y_OFFSCREEN_DISTANCE (screen->h/2)
 
 /* Debugging */
 
@@ -104,5 +95,7 @@ enum DyingType {
        #define DEBUG_MSG( msg ) {}
 #endif
 
-#endif
+#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
+
+#endif /*SUPERTUX_DEFINES_H*/