Fix building under MSVC

[dragonfireclient.git] / src / localplayer.cpp

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 13117d8811b54830ac5856c9fd63d867ba8ce9d6..a6f04849ab42c27778f3904e3be42c6036ef25af 100644 (file)
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -43,6 +43,8 @@ LocalPlayer::LocalPlayer(IGameDef *gamedef):
        last_pitch(0),
        last_yaw(0),
        last_keyPressed(0),
+       hotbar_image(""),
+       hotbar_selected_image(""),
        m_sneak_node(32767,32767,32767),
        m_sneak_node_exists(false),
        m_old_node_below(32767,32767,32767),
@@ -73,6 +75,7 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
        if(isAttached)
        {
                setPosition(overridePosition);
+               m_sneak_node_exists = false;
                return;
        }
 
@@ -85,6 +88,7 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
        {
         position += m_speed * dtime;
                setPosition(position);
+               m_sneak_node_exists = false;
                return;
        }
 
@@ -161,7 +165,9 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
                If sneaking, keep in range from the last walked node and don't
                fall off from it
        */
-       if(control.sneak && m_sneak_node_exists && !(fly_allowed && g_settings->getBool("free_move")) && !in_liquid)
+       if(control.sneak && m_sneak_node_exists &&
+                       !(fly_allowed && g_settings->getBool("free_move")) && !in_liquid &&
+                       physics_override_sneak)
        {
                f32 maxd = 0.5*BS + sneak_max;
                v3f lwn_f = intToFloat(m_sneak_node, BS);
@@ -221,7 +227,7 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
                // node.
                m_need_to_get_new_sneak_node = true;
        }
-       if(m_need_to_get_new_sneak_node)
+       if(m_need_to_get_new_sneak_node && physics_override_sneak)
        {
                v3s16 pos_i_bottom = floatToInt(position - v3f(0,BS/2,0), BS);
                v2f player_p2df(position.X, position.Z);
@@ -260,6 +266,10 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
                                // And the node above it has to be nonwalkable
                                if(nodemgr->get(map->getNode(p+v3s16(0,1,0))).walkable == true)
                                        continue;
+                               if (!physics_override_sneak_glitch) {
+                                       if (nodemgr->get(map->getNode(p+v3s16(0,2,0))).walkable)
+                                               continue;
+                               }
                        }
                        catch(InvalidPositionException &e)
                        {
@@ -572,6 +582,6 @@ v3s16 LocalPlayer::getStandingNodePos()
 {
        if(m_sneak_node_exists)
                return m_sneak_node;
-       return floatToInt(getPosition(), BS);
+       return floatToInt(getPosition() - v3f(0, BS, 0), BS);
 }