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

diff --git a/src/defines.h b/src/defines.h
index 97c7a7849..f0b880c24 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,37 +1,29 @@
-/*
-  defines.h
-  
-  Super Tux
-  
-  by Bill Kendrick & Tobias Glaesser <tobi.web@gmx.de>
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
- 
-  April 11, 2000 - March 15, 2004
-*/
-
-
-#if !defined( SUPERTUX_DEFINES_H )
-
+//  $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
-/* Version: */
-
-#ifndef VERSION
-	#define VERSION "0.0.5-0.0.6-CVS"
-#endif
-
-/* Frames per second: */
 
-#define FPS (1000 / 25)
+#include <config.h>
 
-
-/* Joystick buttons and axes: */
-
-#define JOY_A 0
-#define JOY_B 1
-
-#define JOY_X 0
-#define JOY_Y 1
+enum Direction { LEFT = 0, RIGHT = 1 };
 
 /* Direction (keyboard/joystick) states: */
 
@@ -47,56 +39,26 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* Hurt modes: */
-
-#define KILL 0
-#define SHRINK 1
-
-/* Directions: */
-
-#define LEFT 0
-#define RIGHT 1
-
-/* Sizes: */
-
-#define SMALL 0
-#define BIG 1
-
 /* Speed constraints: */
+#define MAX_WALK_XM 230
+#define MAX_RUN_XM 320
+#define MAX_LIVES 99
 
-#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 4.0
-
-#define WALK_SPEED 1.0
-#define RUN_SPEED 1.5
-#define JUMP_SPEED 1.2
-
-#define GRAVITY 1.0
-#define YM_FOR_JUMP 6.0
-#define KILL_BOUNCE_YM 8.0
-
-#define SKID_XM 2.0
-#define SKID_TIME 200
-
-/* Size constraints: */
+#define WALK_SPEED 100
 
-#define OFFSCREEN_DISTANCE 256
+/* gameplay related defines */
 
-#define LEVEL_WIDTH 375
+#define START_LIVES 4
 
+#define MAX_FIRE_BULLETS 2
+#define MAX_ICE_BULLETS  1
+#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*/