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

diff --git a/src/defines.h b/src/defines.h
index 8d1e18459..f0b880c24 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -18,18 +18,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef SUPERTUX_DEFINES_H
-#define SUPERTUX_DEFINES_H 1
+#define SUPERTUX_DEFINES_H
 
 #include <config.h>
 
-/* Version: */
-
-#ifndef VERSION
-	#define VERSION "0.1.1"
-#endif
-
 enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
@@ -46,23 +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)
-
 /* 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 */
 
@@ -70,32 +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)
-
-/* Debugging */
+#define FROZEN_TIME 3.0
 
-#ifdef DEBUG
-        #define DEBUG_MSG( msg ) { \
-       	printf( msg ); printf("\n"); \
-        }
-        #else
-       #define DEBUG_MSG( msg ) {}
-#endif
+#define WALK_ACCELERATION_X 300
+#define RUN_ACCELERATION_X 400
 
-#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
+#define SKID_XM 200
+#define SKID_TIME .3
 
 #endif /*SUPERTUX_DEFINES_H*/