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

diff --git a/src/defines.h b/src/defines.h
index 542351e7d..8d1e18459 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,41 +1,36 @@
-/*
-  defines.h
-  
-  Super Tux
-  
-  by Bill Kendrick
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
- 
-  April 11, 2000 - December 28, 2003
-*/
-
-
-#if !defined( SUPERTUX_DEFINES_H )
-
-#define SUPERTUX_DEFINES_H
-/* Version: */
-
-#define VERSION "0.0.5"
-
-/* Frames per second: */
-
-#define FPS (1000 / 25)
-
-
-/* Joystick buttons and axes: */
-
-#define JOY_A 0
-#define JOY_B 1
-
-#define JOY_X 0
-#define JOY_Y 1
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  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
+
+#include <config.h>
 
+/* Version: */
 
-/* Booleans: */
+#ifndef VERSION
+	#define VERSION "0.1.1"
+#endif
 
-#define NO 0
-#define YES 1
+enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
 
@@ -45,49 +40,50 @@
 /* Dying types: */
 
 /* ---- NO 0 */
-#define SQUISHED 1
-#define FALLING 2
-
-/* Hurt modes: */
-
-#define KILL 0
-#define SHRINK 1
-
-/* Directions: */
-
-#define LEFT 0
-#define RIGHT 1
-
-/* Sizes: */
-
-#define SMALL 0
-#define BIG 1
+enum DyingType {
+  DYING_NOT = 0,
+  DYING_SQUISHED = 1,
+  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 8
-#define MAX_RUN_XM 3
-#define MAX_YM 10
-#define MAX_JUMP_TIME 1000
-#define MAX_LIVES 4
+#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
+#define WALK_SPEED 1.0
 #define RUN_SPEED 1.5
-#define JUMP_SPEED 1.5
+#define JUMP_SPEED 1.2
 
-#define GRAVITY 1
-#define YM_FOR_JUMP 50
-#define KILL_BOUNCE_YM 8
+/* gameplay related defines */
 
-#define SKID_XM 4
-#define SKID_TIME 8
+#define START_LIVES 4
 
-/* Size constraints: */
+#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 OFFSCREEN_DISTANCE 256
+#define SKID_XM 2.0
+#define SKID_TIME 200
 
-#define LEVEL_WIDTH 375
+/* Size constraints: */
 
+#define X_OFFSCREEN_DISTANCE (screen->w/2)
+#define Y_OFFSCREEN_DISTANCE (screen->h/2)
 
 /* Debugging */
 
@@ -99,5 +95,7 @@
        #define DEBUG_MSG( msg ) {}
 #endif
 
-#endif
+#define UNUSED_ARG(a) do {/* null */} while (&a == 0)
+
+#endif /*SUPERTUX_DEFINES_H*/