Textureable sun and moon.

[dragonfireclient.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 8028fe6afb57d5cb7e750bb04d268b554fea2e31..8ad6ff241ffaa76a7d3c292490009ed7f4efdebc 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "hud.h"
 #include "constants.h"
 #include "gamedef.h"
-#include "connection.h" // PEER_ID_INEXISTENT
 #include "settings.h"
 #include "content_sao.h"
 #include "util/numeric.h"
@@ -34,9 +33,13 @@ Player::Player(IGameDef *gamedef):
        is_climbing(false),
        swimming_vertical(false),
        camera_barely_in_ceiling(false),
+       light(0),
        inventory(gamedef->idef()),
        hp(PLAYER_MAX_HP),
+       hurt_tilt_timer(0),
+       hurt_tilt_strength(0),
        peer_id(PEER_ID_INEXISTENT),
+       keyPressed(0),
 // protected
        m_gamedef(gamedef),
        m_breath(-1),
@@ -44,7 +47,7 @@ Player::Player(IGameDef *gamedef):
        m_yaw(0),
        m_speed(0,0,0),
        m_position(0,0,0),
-       m_collisionbox(-BS*0.30,0.0,-BS*0.30,BS*0.30,BS*1.55,BS*0.30),
+       m_collisionbox(-BS*0.30,0.0,-BS*0.30,BS*0.30,BS*1.75,BS*0.30),
        m_last_pitch(0),
        m_last_yaw(0),
        m_last_pos(0,0,0),
@@ -82,9 +85,11 @@ Player::Player(IGameDef *gamedef):
        movement_gravity                = 9.81 * BS;
 
        // Movement overrides are multipliers and must be 1 by default
-       physics_override_speed   = 1;
-       physics_override_jump    = 1;
-       physics_override_gravity = 1;
+       physics_override_speed        = 1;
+       physics_override_jump         = 1;
+       physics_override_gravity      = 1;
+       physics_override_sneak        = true;
+       physics_override_sneak_glitch = true;
 
        hud_flags = HUD_FLAG_HOTBAR_VISIBLE | HUD_FLAG_HEALTHBAR_VISIBLE |
                         HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE |