Fix some "Conditional jump or move depends on uninitialised value(s)" valgrind detections

[minetest.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 3846cd8f9e676c2324b9d24ddb2f9a6f78f8a648..6a774251cc110289edc22137c4a976b1760080f0 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -22,17 +22,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "connection.h"
 #include "constants.h"
 #include "utility.h"
-
+#ifndef SERVER
+#include <ITextSceneNode.h>
+#endif
+#include "settings.h"
 
 Player::Player():
        touching_ground(false),
        in_water(false),
        in_water_stable(false),
+       is_climbing(false),
        swimming_up(false),
+       is_frozen(false),
        inventory_backup(NULL),
        craftresult_is_preview(true),
        hp(20),
        peer_id(PEER_ID_INEXISTENT),
+       m_selected_item(0),
        m_pitch(0),
        m_yaw(0),
        m_speed(0,0,0),
@@ -47,6 +53,11 @@ Player::~Player()
        delete inventory_backup;
 }
 
+void Player::wieldItem(u16 item)
+{
+       m_selected_item = item;
+}
+
 void Player::resetInventory()
 {
        inventory.clear();
@@ -324,10 +335,21 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        /*
                Calculate new position
        */
-       position += m_speed * dtime;
+       if(is_frozen) {
+               // Still move very slowly so as not to feel all completely stuck
+               position += m_speed * dtime * 0.001;
+       }
+       else {
+               position += m_speed * dtime;
+       }
+       
+       /*
+               If the player enters an unloaded chunk this is set to true.
+       */
+       is_frozen = false;
 
        // Skip collision detection if a special movement mode is used
-       bool free_move = g_settings.getBool("free_move");
+       bool free_move = g_settings->getBool("free_move");
        if(free_move)
        {
                setPosition(position);
@@ -382,8 +404,8 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        try {
                v3s16 pp = floatToInt(position + v3f(0,0.5*BS,0), BS);
                v3s16 pp2 = floatToInt(position + v3f(0,-0.2*BS,0), BS);
-               is_climbing = (content_features(map.getNode(pp).d).climbable ||
-                              content_features(map.getNode(pp2).d).climbable);
+               is_climbing = ((content_features(map.getNode(pp).getContent()).climbable ||
+                               content_features(map.getNode(pp2).getContent()).climbable) && !free_move);
        }
        catch(InvalidPositionException &e)
        {
@@ -497,8 +519,11 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                }
                catch(InvalidPositionException &e)
                {
-                       // Doing nothing here will block the player from
-                       // walking over map borders
+                       if(!is_frozen) {
+                               // freeze when entering unloaded areas
+                               is_frozen = true;
+                       }
+                       continue;
                }
 
                core::aabbox3d<f32> nodebox = getNodeBox(v3s16(x,y,z), BS);
@@ -734,11 +759,11 @@ void LocalPlayer::applyControl(float dtime)
        
        v3f speed = v3f(0,0,0);
 
-       bool free_move = g_settings.getBool("free_move");
-       bool fast_move = g_settings.getBool("fast_move");
-       bool continuous_forward = g_settings.getBool("continuous_forward");
+       bool free_move = g_settings->getBool("free_move");
+       bool fast_move = g_settings->getBool("fast_move");
+       bool continuous_forward = g_settings->getBool("continuous_forward");
 
-       if(free_move)
+       if(free_move || is_climbing)
        {
                v3f speed = getSpeed();
                speed.Y = 0;
@@ -765,6 +790,12 @@ void LocalPlayer::applyControl(float dtime)
                                speed.Y = -walkspeed_max;
                        setSpeed(speed);
                }
+               else if(is_climbing)
+               {
+                       v3f speed = getSpeed();
+                       speed.Y = -3*BS;
+                       setSpeed(speed);
+               }
                else
                {
                        // If not free movement but fast is allowed, aux1 is
@@ -827,17 +858,10 @@ void LocalPlayer::applyControl(float dtime)
                        setSpeed(speed);
                        swimming_up = true;
                }
-       }
-
-       if (is_climbing) {
-               if (control.up || control.left || control.right || control.down) {
-                       v3f speed = getSpeed();
-                       speed.Y = 2*BS;
-                       setSpeed(speed);
-               }
-               else {
-                       v3f speed = getSpeed();
-                       speed.Y = -2*BS;
+               else if(is_climbing)
+               {
+                       v3f speed = getSpeed();
+                       speed.Y = 3*BS;
                        setSpeed(speed);
                }
        }