X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=26496259ccf77737fc27f9f1fa53343aeefba11a;hb=17ba584fe254eeaee3489cc20e03810a59f3ef9b;hp=78ba17e8992ef9e1986d6b7613c40d2c02340d63;hpb=7e6db1b80344a519e53a9967a159c8d3585a9b9d;p=dragonfireclient.git diff --git a/src/player.cpp b/src/player.cpp index 78ba17e89..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 +#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(""); + 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; @@ -100,6 +105,7 @@ Player::Player(IGameDef *gamedef): Player::~Player() { + clearHud(); } // Horizontal acceleration (X and Z), Y direction is ignored @@ -194,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); @@ -240,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()) @@ -259,6 +257,8 @@ u32 Player::addHud(HudElement *toadd) HudElement* Player::getHud(u32 id) { + JMutexAutoLock lock(m_mutex); + if (id < hud.size()) return hud[id]; @@ -267,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]; @@ -277,6 +279,8 @@ HudElement* Player::removeHud(u32 id) void Player::clearHud() { + JMutexAutoLock lock(m_mutex); + while(!hud.empty()) { delete hud.back(); hud.pop_back(); @@ -284,35 +288,38 @@ void Player::clearHud() } -void RemotePlayer::save(const std::string &savedir) +void RemotePlayer::save(std::string savedir) { - bool newplayer = true; - - /* We have to iterate through all files in the players directory + /* + * We have to open all possible player files in the players directory * and check their player names because some file systems are not * case-sensitive and player names are case-sensitive. */ // A player to deserialize files into to check their names - RemotePlayer testplayer(m_gamedef); + RemotePlayer testplayer(m_gamedef, ""); - std::vector player_files = fs::GetDirListing(savedir); - for(u32 i = 0; i < player_files.size(); i++) { - if (player_files[i].dir || player_files[i].name[0] == '.') { - continue; + savedir += DIR_DELIM; + std::string path = savedir + m_name; + for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) { + if (!fs::PathExists(path)) { + // Open file and serialize + std::ostringstream ss(std::ios_base::binary); + serialize(ss); + if (!fs::safeWriteToFile(path, ss.str())) { + infostream << "Failed to write " << path << std::endl; + } + setModified(false); + return; } - - // Full path to this file - std::string path = savedir + "/" + player_files[i].name; - // Open file and deserialize std::ifstream is(path.c_str(), std::ios_base::binary); if (!is.good()) { - infostream << "Failed to read " << path << std::endl; - continue; + infostream << "Failed to open " << path << std::endl; + return; } - testplayer.deSerialize(is, player_files[i].name); - + testplayer.deSerialize(is, path); + is.close(); if (strcmp(testplayer.getName(), m_name) == 0) { // Open file and serialize std::ostringstream ss(std::ios_base::binary); @@ -320,33 +327,14 @@ void RemotePlayer::save(const std::string &savedir) if (!fs::safeWriteToFile(path, ss.str())) { infostream << "Failed to write " << path << std::endl; } - newplayer = false; - break; - } - } - - if (newplayer) { - bool found = false; - std::string path = savedir + "/" + m_name; - for (u32 i = 0; i < 1000; i++) { - if (!fs::PathExists(path)) { - found = true; - break; - } - path = savedir + "/" + m_name + itos(i); - } - if (!found) { - infostream << "Didn't find free file for player " << m_name << std::endl; + setModified(false); return; } - - // Open file and serialize - std::ostringstream ss(std::ios_base::binary); - serialize(ss); - if (!fs::safeWriteToFile(path, ss.str())) { - infostream << "Failed to write " << path << std::endl; - } + path = savedir + m_name + itos(i); } + + infostream << "Didn't find free file for player " << m_name << std::endl; + return; } /*