X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=26496259ccf77737fc27f9f1fa53343aeefba11a;hb=17ba584fe254eeaee3489cc20e03810a59f3ef9b;hp=40d403952bbbeac0b0c5822d8ef1803212dffc60;hpb=b8343cd11c834fb2613b104418ed08e9fdb1665a;p=dragonfireclient.git

diff --git a/src/player.cpp b/src/player.cpp
index 40d403952..26496259c 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -18,14 +18,21 @@ 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"
 #include "gamedef.h"
 #include "settings.h"
 #include "content_sao.h"
-#include "util/numeric.h"
+#include "filesys.h"
+#include "log.h"
+#include "porting.h"  // strlcpy
 
-Player::Player(IGameDef *gamedef):
+
+Player::Player(IGameDef *gamedef, const char *name):
 	touching_ground(false),
 	in_liquid(false),
 	in_liquid_stable(false),
@@ -33,7 +40,6 @@ 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),
@@ -42,32 +48,30 @@ Player::Player(IGameDef *gamedef):
 	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),
 	m_position(0,0,0),
 	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),
-	m_last_hp(PLAYER_MAX_HP),
-	m_last_inventory(gamedef->idef())
+	m_dirty(false)
 {
-	updateName("<not set>");
+	strlcpy(m_name, name, PLAYERNAME_SIZE);
+
 	inventory.clear();
 	inventory.addList("main", PLAYER_INVENTORY_SIZE);
 	InventoryList *craft = inventory.addList("craft", 9);
 	craft->setWidth(3);
 	inventory.addList("craftpreview", 1);
 	inventory.addList("craftresult", 1);
-	m_last_inventory = inventory;
+	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
@@ -83,6 +87,7 @@ Player::Player(IGameDef *gamedef):
 	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;
@@ -195,35 +200,28 @@ void Player::serialize(std::ostream &os)
 void Player::deSerialize(std::istream &is, std::string playername)
 {
 	Settings args;
-	
-	for(;;)
-	{
-		if(is.eof())
-			throw SerializationError
-					(("Player::deSerialize(): PlayerArgsEnd of player \"" + playername + "\" not found").c_str());
-		std::string line;
-		std::getline(is, line);
-		std::string trimmedline = trim(line);
-		if(trimmedline == "PlayerArgsEnd")
-			break;
-		args.parseConfigLine(line);
+
+	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
+		throw SerializationError("PlayerArgsEnd of player " +
+				playername + " not found!");
 	}
 
+	m_dirty = true;
 	//args.getS32("version"); // Version field value not used
 	std::string name = args.get("name");
-	updateName(name.c_str());
+	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
 	setPitch(args.getFloat("pitch"));
 	setYaw(args.getFloat("yaw"));
 	setPosition(args.getV3F("position"));
 	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);
@@ -241,13 +239,12 @@ void Player::deSerialize(std::istream &is, std::string playername)
 			inventory.getList("craftresult")->changeItem(0, ItemStack());
 		}
 	}
-
-	// Set m_last_*
-	checkModified();
 }
 
 u32 Player::addHud(HudElement *toadd)
 {
+	JMutexAutoLock lock(m_mutex);
+
 	u32 id = getFreeHudID();
 
 	if (id < hud.size())
@@ -260,6 +257,8 @@ u32 Player::addHud(HudElement *toadd)
 
 HudElement* Player::getHud(u32 id)
 {
+	JMutexAutoLock lock(m_mutex);
+
 	if (id < hud.size())
 		return hud[id];
 
@@ -268,6 +267,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];
@@ -278,6 +279,8 @@ HudElement* Player::removeHud(u32 id)
 
 void Player::clearHud()
 {
+	JMutexAutoLock lock(m_mutex);
+
 	while(!hud.empty()) {
 		delete hud.back();
 		hud.pop_back();
@@ -294,7 +297,7 @@ void RemotePlayer::save(std::string savedir)
 	 */
 
 	// A player to deserialize files into to check their names
-	RemotePlayer testplayer(m_gamedef);
+	RemotePlayer testplayer(m_gamedef, "");
 
 	savedir += DIR_DELIM;
 	std::string path = savedir + m_name;
@@ -306,6 +309,7 @@ void RemotePlayer::save(std::string savedir)
 			if (!fs::safeWriteToFile(path, ss.str())) {
 				infostream << "Failed to write " << path << std::endl;
 			}
+			setModified(false);
 			return;
 		}
 		// Open file and deserialize
@@ -323,6 +327,7 @@ void RemotePlayer::save(std::string savedir)
 			if (!fs::safeWriteToFile(path, ss.str())) {
 				infostream << "Failed to write " << path << std::endl;
 			}
+			setModified(false);
 			return;
 		}
 		path = savedir + m_name + itos(i);