- bullet tweaks

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 0c80910..4271c4f 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
@@ -39,15 +46,20 @@
 
 #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;
@@ -60,50 +72,50 @@ struct player_input_type
 
 void player_input_init(player_input_type* pplayer_input);
 
-extern texture_type tux_life;
-extern std::vector<texture_type> tux_right;
-extern std::vector<texture_type> tux_left;
-extern texture_type smalltux_jump_left;
-extern texture_type smalltux_jump_right;
-extern texture_type smalltux_stand_left;
-extern texture_type smalltux_stand_right;
-extern texture_type bigtux_right[3];
-extern texture_type bigtux_left[3];
-extern texture_type bigtux_right_jump;
-extern texture_type bigtux_left_jump;
-extern texture_type ducktux_right;
-extern texture_type ducktux_left;
-extern texture_type skidtux_right;
-extern texture_type skidtux_left;
-extern texture_type firetux_right[3];
-extern texture_type firetux_left[3];
-extern texture_type bigfiretux_right[3];
-extern texture_type bigfiretux_left[3];
-extern texture_type bigfiretux_right_jump;
-extern texture_type bigfiretux_left_jump;
-extern texture_type duckfiretux_right;
-extern texture_type duckfiretux_left;
-extern texture_type skidfiretux_right;
-extern texture_type skidfiretux_left;
-extern texture_type cape_right[2];
-extern texture_type cape_left[2];
-extern texture_type bigcape_right[2];
-extern texture_type bigcape_left[2];
+class Sprite;
+
+extern Surface* tux_life;
+
+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;
-  int lives;
-  int score;
-  int distros;
+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;
   int frame_;
   int frame_main;
@@ -117,7 +129,7 @@ class Player
   Timer frame_timer;
   Physic physic;
 
- public:
+public:
   void init();
   int  key_event(SDLKey key, int state);
   void level_begin();
@@ -126,7 +138,7 @@ 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();
@@ -134,10 +146,14 @@ class Player
   bool on_ground();
   bool under_solid();
   
- private:
-  void handle_horizontal_input(int dir);
+private:
+  void handle_horizontal_input();
   void handle_vertical_input();
   void remove_powerups();
 };
 
 #endif /*SUPERTUX_PLAYER_H*/
+
+/* Local Variables: */
+/* mode:c++ */
+/* End: */