Skip to content
Permalink
Browse files

Store the maximum player file tries in a constant

  • Loading branch information...
ShadowNinja committed Jun 23, 2014
1 parent e491f8c commit 089fc010abe439aea154813e3e31bc9477a84308
Showing with 7 additions and 2 deletions.
  1. +5 −0 src/constants.h
  2. +1 −1 src/environment.cpp
  3. +1 −1 src/player.cpp
@@ -89,6 +89,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// Maximum hit points of a player
#define PLAYER_MAX_HP 20

// Number of different files to try to save a player to if the first fails
// (because of a case-insensitive filesystem)
// TODO: Use case-insensitive player names instead of this hack.
#define PLAYER_FILE_ALTERNATE_TRIES 1000

/*
* GUI related things
*/
@@ -455,7 +455,7 @@ Player *ServerEnvironment::loadPlayer(const std::string &playername)

RemotePlayer testplayer(m_gamedef);
std::string path = players_path + playername;
for (u32 i = 0; i < 1000; i++) {
for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
// Open file and deserialize
std::ifstream is(path.c_str(), std::ios_base::binary);
if (!is.good()) {
@@ -297,7 +297,7 @@ void RemotePlayer::save(std::string savedir)

savedir += DIR_DELIM;
std::string path = savedir + m_name;
for (u32 i = 0; i < 1000; i++) {
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);

0 comments on commit 089fc01

Please sign in to comment.
You can’t perform that action at this time.