src/environment.cpp: Fix NULL pointer dereference

[dragonfireclient.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index a8f95bb99bb58e5095585efab884bac22c6dad9c..0e8fd86d2245c3445ccad7f669cb7aa59acc14ce 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 
 #include <fstream>
+#include "jthread/jmutexautolock.h"
 #include "util/numeric.h"
 #include "hud.h"
 #include "constants.h"
@@ -39,16 +40,16 @@ Player::Player(IGameDef *gamedef, const char *name):
        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),
+       protocol_version(0),
        peer_id(PEER_ID_INEXISTENT),
        keyPressed(0),
 // protected
        m_gamedef(gamedef),
-       m_breath(-1),
+       m_breath(PLAYER_MAX_BREATH),
        m_pitch(0),
        m_yaw(0),
        m_speed(0,0,0),
@@ -64,12 +65,14 @@ Player::Player(IGameDef *gamedef, const char *name):
        craft->setWidth(3);
        inventory.addList("craftpreview", 1);
        inventory.addList("craftresult", 1);
+       inventory.setModified(false);
 
        // Can be redefined via Lua
        inventory_formspec = "size[8,7.5]"
                //"image[1,0.6;1,2;player.png]"
                "list[current_player;main;0,3.5;8,4;]"
                "list[current_player;craft;3,0;3,3;]"
+               "listring[]"
                "list[current_player;craftpreview;7,1;1,1;]";
 
        // Initialize movement settings at default values, so movement can work if the server fails to send them
@@ -85,6 +88,7 @@ Player::Player(IGameDef *gamedef, const char *name):
        movement_liquid_fluidity_smooth = 0.5  * BS;
        movement_liquid_sink            = 10   * BS;
        movement_gravity                = 9.81 * BS;
+       local_animation_speed           = 0.0;
 
        // Movement overrides are multipliers and must be 1 by default
        physics_override_speed        = 1;
@@ -116,31 +120,12 @@ void Player::accelerateHorizontal(v3f target_speed, f32 max_increase)
        f32 dl = d_wanted.getLength();
        if(dl > max_increase)
                dl = max_increase;
-       
+
        v3f d = d_wanted.normalize() * dl;
 
        m_speed.X += d.X;
        m_speed.Z += d.Z;
 
-#if 0 // old code
-       if(m_speed.X < target_speed.X - max_increase)
-               m_speed.X += max_increase;
-       else if(m_speed.X > target_speed.X + max_increase)
-               m_speed.X -= max_increase;
-       else if(m_speed.X < target_speed.X)
-               m_speed.X = target_speed.X;
-       else if(m_speed.X > target_speed.X)
-               m_speed.X = target_speed.X;
-
-       if(m_speed.Z < target_speed.Z - max_increase)
-               m_speed.Z += max_increase;
-       else if(m_speed.Z > target_speed.Z + max_increase)
-               m_speed.Z -= max_increase;
-       else if(m_speed.Z < target_speed.Z)
-               m_speed.Z = target_speed.Z;
-       else if(m_speed.Z > target_speed.Z)
-               m_speed.Z = target_speed.Z;
-#endif
 }
 
 // Vertical acceleration (Y), X and Z directions are ignored
@@ -157,16 +142,6 @@ void Player::accelerateVertical(v3f target_speed, f32 max_increase)
 
        m_speed.Y += d_wanted;
 
-#if 0 // old code
-       if(m_speed.Y < target_speed.Y - max_increase)
-               m_speed.Y += max_increase;
-       else if(m_speed.Y > target_speed.Y + max_increase)
-               m_speed.Y -= max_increase;
-       else if(m_speed.Y < target_speed.Y)
-               m_speed.Y = target_speed.Y;
-       else if(m_speed.Y > target_speed.Y)
-               m_speed.Y = target_speed.Y;
-#endif
 }
 
 v3s16 Player::getLightPosition() const
@@ -203,6 +178,7 @@ void Player::deSerialize(std::istream &is, std::string playername)
                                playername + " not found!");
        }
 
+       m_dirty = true;
        //args.getS32("version"); // Version field value not used
        std::string name = args.get("name");
        strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
@@ -212,12 +188,12 @@ void Player::deSerialize(std::istream &is, std::string playername)
        try{
                hp = args.getS32("hp");
        }catch(SettingNotFoundException &e) {
-               hp = 20;
+               hp = PLAYER_MAX_HP;
        }
        try{
                m_breath = args.getS32("breath");
        }catch(SettingNotFoundException &e) {
-               m_breath = 11;
+               m_breath = PLAYER_MAX_BREATH;
        }
 
        inventory.deSerialize(is);
@@ -235,12 +211,12 @@ void Player::deSerialize(std::istream &is, std::string playername)
                        inventory.getList("craftresult")->changeItem(0, ItemStack());
                }
        }
-
-       m_dirty = false;
 }
 
 u32 Player::addHud(HudElement *toadd)
 {
+       JMutexAutoLock lock(m_mutex);
+
        u32 id = getFreeHudID();
 
        if (id < hud.size())
@@ -253,6 +229,8 @@ u32 Player::addHud(HudElement *toadd)
 
 HudElement* Player::getHud(u32 id)
 {
+       JMutexAutoLock lock(m_mutex);
+
        if (id < hud.size())
                return hud[id];
 
@@ -261,6 +239,8 @@ HudElement* Player::getHud(u32 id)
 
 HudElement* Player::removeHud(u32 id)
 {
+       JMutexAutoLock lock(m_mutex);
+
        HudElement* retval = NULL;
        if (id < hud.size()) {
                retval = hud[id];
@@ -271,6 +251,8 @@ HudElement* Player::removeHud(u32 id)
 
 void Player::clearHud()
 {
+       JMutexAutoLock lock(m_mutex);
+
        while(!hud.empty()) {
                delete hud.back();
                hud.pop_back();
@@ -299,7 +281,7 @@ void RemotePlayer::save(std::string savedir)
                        if (!fs::safeWriteToFile(path, ss.str())) {
                                infostream << "Failed to write " << path << std::endl;
                        }
-                       m_dirty = false;
+                       setModified(false);
                        return;
                }
                // Open file and deserialize
@@ -317,7 +299,7 @@ void RemotePlayer::save(std::string savedir)
                        if (!fs::safeWriteToFile(path, ss.str())) {
                                infostream << "Failed to write " << path << std::endl;
                        }
-                       m_dirty = false;
+                       setModified(false);
                        return;
                }
                path = savedir + m_name + itos(i);