X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdefines.h;h=c408b688a3fbcd94d6d5066786702e5cd615d754;hb=02d54bd21d3d72e46ecad8f6038666b0384d4eb8;hp=163f1bdd3e70a095b44d6ae4bbdf13f18a9fedaa;hpb=56dc2f295387a370cf6f77bf446706ceb2dce1a6;p=supertux.git

diff --git a/src/defines.h b/src/defines.h
index 163f1bdd3..c408b688a 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -18,91 +18,33 @@
 //  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.0.5-0.0.6-CVS"
-#endif
 
-/* Frames per second: */
-
-#define FPS (1000 / 25)
+#include <config.h>
 
 enum Direction { LEFT = 0, RIGHT = 1 };
 
-/* Direction (keyboard/joystick) states: */
-
+/* keyboard/joystick states: */
 #define UP 0
 #define DOWN 1
 
 /* Dying types: */
-
-/* ---- NO 0 */
 enum DyingType {
   DYING_NOT = 0,
   DYING_SQUISHED = 1,
   DYING_FALLING = 2
 };
 
-/* 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_LIVES 99
 
-#define WALK_SPEED 1.0
-#define RUN_SPEED 1.5
-#define JUMP_SPEED 1.2
-
 /* gameplay related defines */
-
 #define START_LIVES 4
 
-#define MAX_BULLETS 2
-
-#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 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
-
-/* Debugging */
-
-#ifdef DEBUG
-        #define DEBUG_MSG( msg ) { \
-       	printf( msg ); printf("\n"); \
-        }
-        #else
-       #define DEBUG_MSG( msg ) {}
-#endif
+#define MAX_FIRE_BULLETS 2
+#define MAX_ICE_BULLETS  1
+#define FROZEN_TIME 3.0
 
-#endif
+#endif /*SUPERTUX_DEFINES_H*/