X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdefines.h;h=c2c71a7e115f2d58aa821261fe19af2315007bc6;hb=37f463fdfe74340a06c8510b4dc04c46a5a1ccbf;hp=b2d16f1faa2b5eca299e155003d06d24af18be40;hpb=f9f9fbe54cef6c10191d68ff57b807ae76af4f4e;p=supertux.git

diff --git a/src/defines.h b/src/defines.h
index b2d16f1fa..c2c71a7e1 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,41 +1,38 @@
-/*
-  defines.h
-  
-  Super Tux
-  
-  by Bill Kendrick
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
- 
-  April 11, 2000 - December 28, 2003
-*/
-
+//  $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.
 
 #if !defined( SUPERTUX_DEFINES_H )
 
 #define SUPERTUX_DEFINES_H
 /* Version: */
 
-#define VERSION "0.0.5-0.0.6-CVS"
+#ifndef VERSION
+	#define VERSION "0.0.5-0.0.6-CVS"
+#endif
 
 /* 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
-
-
-/* Booleans: */
-
-#define NO 0
-#define YES 1
+enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
 
@@ -45,18 +42,11 @@
 /* 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
+enum DyingType {
+  DYING_NOT = 0,
+  DYING_SQUISHED = 1,
+  DYING_FALLING = 2
+};
 
 /* Sizes: */
 
@@ -67,16 +57,23 @@
 
 #define MAX_WALK_XM 2.3
 #define MAX_RUN_XM 3.2
-#define MAX_YM 10.0
-#define MAX_JUMP_TIME 1000
-#define MAX_LIVES 4.0
+#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.5
+#define JUMP_SPEED 1.2
 
-#define GRAVITY 1.0
-#define YM_FOR_JUMP 50.0
+/* 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
@@ -88,6 +85,9 @@
 
 #define LEVEL_WIDTH 375
 
+/* Timing constants (in ms): */
+
+#define KICKING_TIME 200
 
 /* Debugging */