X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdefines.h;h=8d1e18459c6ff417c3f7c3a8fbf1b7775cb60927;hb=4c53a552c13dbe9d587e34e3cf48e82877d09288;hp=121fe261585c8d33c61e4ac0f9a3f7474f24542d;hpb=6bc6636a5e7830338458c71019f2d3a5b4026c72;p=supertux.git

diff --git a/src/defines.h b/src/defines.h
index 121fe2615..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.1.1"
 #endif
 
-/* Frames per second: */
-
-#define FPS (1000 / 25)
-
 enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
@@ -39,9 +37,6 @@ enum Direction { LEFT = 0, RIGHT = 1 };
 #define UP 0
 #define DOWN 1
 
-/* Joystick menu delay */
-#define JOYSTICK_MENU_DELAY 500
-
 /* Dying types: */
 
 /* ---- NO 0 */
@@ -54,13 +49,8 @@ enum DyingType {
 /* 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: */
-
-#define SMALL 0
-#define BIG 1
+#define VISIBLE_TILES_X (25 +1)
+#define VISIBLE_TILES_Y (19 +1)
 
 /* Speed constraints: */
 
@@ -92,19 +82,8 @@ enum DyingType {
 
 /* Size constraints: */
 
-#define X_OFFSCREEN_DISTANCE 280
-#define Y_OFFSCREEN_DISTANCE 240
-
-#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 */
 
@@ -116,5 +95,7 @@ enum DyingType {
        #define DEBUG_MSG( msg ) {}
 #endif
 
-#endif
+#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
+
+#endif /*SUPERTUX_DEFINES_H*/