X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdefines.h;h=f0b880c246d93bf6ad55108b500926fb0671fc70;hb=875ef8eb7e93726bc67dfa7f05da946250e588d4;hp=dd5b1a8b3ebe3bdf3cfa9999e32b84daf9352138;hpb=c52b9b393b0ea1abeb8b2dc93247ee1d2a49055f;p=supertux.git

diff --git a/src/defines.h b/src/defines.h
index dd5b1a8b3..f0b880c24 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -18,19 +18,10 @@
 //  along with this program; if not, write to the Free Software
 //  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
-/* Version: */
-
-#ifndef VERSION
-	#define VERSION "0.1.1"
-#endif
 
-/* Frames per second: */
-
-#define FPS (1000 / 25)
+#include <config.h>
 
 enum Direction { LEFT = 0, RIGHT = 1 };
 
@@ -39,9 +30,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 */
@@ -51,28 +39,12 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* 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
-
 /* Speed constraints: */
-
-#define MAX_WALK_XM 2.3
-#define MAX_RUN_XM 3.2
-#define MAX_YM 20.0
-#define MAX_JUMP_TIME 375
+#define MAX_WALK_XM 230
+#define MAX_RUN_XM 320
 #define MAX_LIVES 99
 
-#define WALK_SPEED 1.0
-#define RUN_SPEED 1.5
-#define JUMP_SPEED 1.2
+#define WALK_SPEED 100
 
 /* gameplay related defines */
 
@@ -80,41 +52,13 @@ enum DyingType {
 
 #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
-#define RUN_ACCELERATION_X 0.04
-#define KILL_BOUNCE_YM 8.0
-
-#define SKID_XM 2.0
-#define SKID_TIME 200
-
-/* Size constraints: */
-
-#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
+#define FROZEN_TIME 3.0
 
-/* Debugging */
+#define WALK_ACCELERATION_X 300
+#define RUN_ACCELERATION_X 400
 
-#ifdef DEBUG
-        #define DEBUG_MSG( msg ) { \
-       	printf( msg ); printf("\n"); \
-        }
-        #else
-       #define DEBUG_MSG( msg ) {}
-#endif
+#define SKID_XM 200
+#define SKID_TIME .3
 
-#endif
+#endif /*SUPERTUX_DEFINES_H*/