- reduced jump tolleranze to two tiles

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 97e6df1..3b0eabc 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -1,14 +1,21 @@
+//  $Id$
 //
-// Interface: player/tux
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
 //
-// Description: 
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
+//  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_PLAYER_H
 #define SUPERTUX_PLAYER_H
@@ -26,6 +33,7 @@
 
 #define TUX_SAFE_TIME 750
 #define TUX_INVINCIBLE_TIME 10000
+#define TUX_INVINCIBLE_TIME_WARNING 2000
 #define TIME_WARNING 20000     /* When to alert player they're low on time! */
 
 /* One-ups... */
@@ -39,20 +47,26 @@
 
 #include <vector>
 
-struct player_keymap_type
+struct PlayerKeymap
 {
+public:
   int jump;
   int duck;
   int left;
   int right;
   int fire;
+  
+  PlayerKeymap();
 };
 
+extern PlayerKeymap keymap;
+
 struct player_input_type
 {
   int right;
   int left;
   int up;
+  int old_up;
   int down;
   int fire;
   int old_fire;
@@ -60,48 +74,52 @@ struct player_input_type
 
 void player_input_init(player_input_type* pplayer_input);
 
+class Sprite;
+
 extern Surface* tux_life;
-extern std::vector<Surface*> tux_right;
-extern std::vector<Surface*> tux_left;
-extern Surface* smalltux_jump_left;
-extern Surface* smalltux_jump_right;
-extern Surface* smalltux_stand_left;
-extern Surface* smalltux_stand_right;
-extern Surface* bigtux_right[3];
-extern Surface* bigtux_left[3];
-extern Surface* bigtux_right_jump;
-extern Surface* bigtux_left_jump;
-extern Surface* ducktux_right;
-extern Surface* ducktux_left;
-extern Surface* skidtux_right;
-extern Surface* skidtux_left;
-extern Surface* firetux_right[3];
-extern Surface* firetux_left[3];
-extern Surface* bigfiretux_right[3];
-extern Surface* bigfiretux_left[3];
-extern Surface* bigfiretux_right_jump;
-extern Surface* bigfiretux_left_jump;
-extern Surface* duckfiretux_right;
-extern Surface* duckfiretux_left;
-extern Surface* skidfiretux_right;
-extern Surface* skidfiretux_left;
-extern Surface* cape_right[2];
-extern Surface* cape_left[2];
-extern Surface* bigcape_right[2];
-extern Surface* bigcape_left[2];
+
+extern Sprite* smalltux_gameover;
+extern Sprite* smalltux_star;
+extern Sprite* largetux_star;
+
+struct PlayerSprite
+{
+  Sprite* stand_left;
+  Sprite* stand_right;
+  Sprite* walk_right;
+  Sprite* walk_left;
+  Sprite* jump_right;
+  Sprite* jump_left;
+  Sprite* kick_left;
+  Sprite* kick_right;
+  Sprite* skid_right;
+  Sprite* skid_left;
+  Sprite* grab_left;
+  Sprite* grab_right;
+  Sprite* duck_right;
+  Sprite* duck_left;
+};
+
+extern PlayerSprite smalltux;
+extern PlayerSprite largetux;
+extern PlayerSprite firetux;
 
 class Player
 {
- public:
-  player_keymap_type keymap;
+public:
+  enum HurtMode { KILL, SHRINK };
 
   player_input_type  input;
   bool got_coffee;
   int size;
   bool duck;
+  bool holding_something;
   DyingType dying;
-  int dir;
+
+  Direction dir;
+
   bool jumping;
+  bool can_jump;
   int frame_;
   int frame_main;
 
@@ -112,9 +130,10 @@ class Player
   Timer skidding_timer;
   Timer safe_timer;
   Timer frame_timer;
+  Timer kick_timer;
   Physic physic;
 
- public:
+public:
   void init();
   int  key_event(SDLKey key, int state);
   void level_begin();
@@ -123,18 +142,23 @@ class Player
   void grabdistros();
   void draw();
   void collision(void* p_c_object, int c_object);
-  void kill(int mode);
+  void kill(HurtMode mode);
   void is_dying();
   bool is_dead();
   void player_remove_powerups();
   void keep_in_bounds();
   bool on_ground();
   bool under_solid();
+  void grow();
   
- private:
+private:
   void handle_horizontal_input();
   void handle_vertical_input();
   void remove_powerups();
 };
 
 #endif /*SUPERTUX_PLAYER_H*/
+
+/* Local Variables: */
+/* mode:c++ */
+/* End: */