*/
#include "player.h"
+
+#include <fstream>
+#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),
is_climbing(false),
swimming_vertical(false),
camera_barely_in_ceiling(false),
- light(0),
inventory(gamedef->idef()),
hp(PLAYER_MAX_HP),
hurt_tilt_timer(0),
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]"
Player::~Player()
{
+ clearHud();
}
// Horizontal acceleration (X and Z), Y direction is ignored
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);
inventory.getList("craftresult")->changeItem(0, ItemStack());
}
}
-
- // Set m_last_*
- checkModified();
}
u32 Player::addHud(HudElement *toadd)
}
-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<fs::DirListNode> 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);
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;
}
/*
projects / oweals / minetest.git / blobdiff