Switched from tinygettext/tags/tinygetext-supertux/ to tinygettext/trunk/

[supertux.git] / src / object / player.cpp

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 4db9d11..052a4c5 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -30,12 +30,12 @@
 #include "object/sprite_particle.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "supertux/game_session.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 #include "supertux/tile.hpp"
 #include "trigger/climbable.hpp"
 
-#include <cmath>
+#include <math.h>
 
 //#define SWIMMING
 
@@ -103,12 +103,51 @@ bool no_water = true;
 }
 
 Player::Player(PlayerStatus* _player_status, const std::string& name) :
+  deactivated(),
+  controller(),
   scripting_controller(0), 
   player_status(_player_status), 
+  duck(),
+  dead(),
+  dying(),
+  backflipping(),
+  backflip_direction(),
+  peekingX(),
+  peekingY(),
+  swimming(),
+  speedlimit(),
   scripting_controller_old(0),
+  jump_early_apex(),
+  on_ice(),
+  ice_this_frame(),
+  dir(),
+  old_dir(),
+  last_ground_y(),
+  fall_mode(),
+  on_ground_flag(),
+  jumping(),
+  can_jump(),
+  jump_button_timer(), 
+  wants_buttjump(),
+  does_buttjump(),
+  invincible_timer(),
+  skidding_timer(),
+  safe_timer(),
+  kick_timer(),
+  shooting_timer(),
+  dying_timer(),
+  growing(),
+  backflip_timer(),
+  physic(),
+  visible(),
   grabbed_object(NULL), 
+  sprite(),
+  airarrow(),
+  floor_normal(),
   ghost_mode(false), 
   edit_mode(false), 
+  unduck_hurt_timer(),
+  idle_timer(),
   idle_stage(0),
   climbing(0)
 {