make formspec textarea wordwrap

[dragonfireclient.git] / src / localplayer.cpp

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 48e6592c19e5252e557b935c75240da985a0c8ec..a7a105fc5c8e09791bdc7cffd7cfa1d2d8bf825f 100644 (file)
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -43,6 +43,10 @@ LocalPlayer::LocalPlayer(IGameDef *gamedef):
        last_pitch(0),
        last_yaw(0),
        last_keyPressed(0),
+       camera_mode(0),
+       eye_offset_first(v3f(0,0,0)),
+       eye_offset_third(v3f(0,0,0)),
+       last_animation(NO_ANIM),
        hotbar_image(""),
        hotbar_selected_image(""),
        m_sneak_node(32767,32767,32767),
@@ -61,7 +65,7 @@ LocalPlayer::~LocalPlayer()
 {
 }
 
-void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
+void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
                std::list<CollisionInfo> *collision_info)
 {
        Map *map = &env->getMap();
@@ -165,7 +169,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);
@@ -225,7 +231,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);
@@ -262,8 +268,13 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
                                if(nodemgr->get(map->getNode(p)).walkable == false)
                                        continue;
                                // And the node above it has to be nonwalkable
-                               if(nodemgr->get(map->getNode(p+v3s16(0,1,0))).walkable == true)
+                               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)
                        {
@@ -350,7 +361,7 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
                m_can_jump = false;
 }
 
-void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d)
+void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d)
 {
        move(dtime, env, pos_max_d, NULL);
 }
@@ -576,6 +587,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);
 }