lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save and remove player by pointer 

Why doing things simple ? Use pointer instead of strings to save players and remove them.
Saving players by name does a lookup to find pointer we already have ! Idem with removePlayer
Also remove unused removePlayer(peer_id), it's never called
master
Loic Blot 2015-09-23 18:53:54 +02:00 committed by est31
parent a56aedb4ea
commit 596484da4f
3 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content_sao.cpp
View File

@ -821,8 +821,8 @@ void PlayerSAO::removingFromEnvironment()
{ {
m_player->setPlayerSAO(NULL); m_player->setPlayerSAO(NULL);
m_player->peer_id = 0; m_player->peer_id = 0;
m_env->savePlayer(m_player->getName()); m_env->savePlayer((RemotePlayer*)m_player);
m_env->removePlayer(m_player->getName()); m_env->removePlayer(m_player);
} }
} }

26
src/environment.cpp
View File

@ -85,28 +85,11 @@ void Environment::addPlayer(Player *player)
m_players.push_back(player); m_players.push_back(player);
} }
void Environment::removePlayer(u16 peer_id) void Environment::removePlayer(Player* player)
{
DSTACK(__FUNCTION_NAME);
for(std::vector<Player*>::iterator i = m_players.begin();
i != m_players.end();)
{
Player *player = *i;
if(player->peer_id == peer_id) {
delete player;
i = m_players.erase(i);
} else {
++i;
}
}
}
void Environment::removePlayer(const char *name)
{ {
for (std::vector<Player*>::iterator it = m_players.begin(); for (std::vector<Player*>::iterator it = m_players.begin();
it != m_players.end(); ++it) { it != m_players.end(); ++it) {
if (strcmp((*it)->getName(), name) == 0) { if ((*it) == player) {
delete *it; delete *it;
m_players.erase(it); m_players.erase(it);
return; return;
@ -453,16 +436,13 @@ void ServerEnvironment::saveLoadedPlayers()
} }
} }
void ServerEnvironment::savePlayer(const std::string &playername) void ServerEnvironment::savePlayer(RemotePlayer *player)
{ {
std::string players_path = m_path_world + DIR_DELIM "players"; std::string players_path = m_path_world + DIR_DELIM "players";
fs::CreateDir(players_path); fs::CreateDir(players_path);
RemotePlayer *player = static_cast<RemotePlayer*>(getPlayer(playername.c_str()));
if (player) {
player->save(players_path); player->save(players_path);
} }
}
Player *ServerEnvironment::loadPlayer(const std::string &playername) Player *ServerEnvironment::loadPlayer(const std::string &playername)
{ {

6
src/environment.h
View File

@ -52,6 +52,7 @@ class ServerMap;
class ClientMap; class ClientMap;
class GameScripting; class GameScripting;
class Player; class Player;
class RemotePlayer;
class Environment class Environment
{ {
@ -71,8 +72,7 @@ public:
virtual Map & getMap() = 0; virtual Map & getMap() = 0;
virtual void addPlayer(Player *player); virtual void addPlayer(Player *player);
void removePlayer(u16 peer_id); void removePlayer(Player *player);
void removePlayer(const char *name);
Player * getPlayer(u16 peer_id); Player * getPlayer(u16 peer_id);
Player * getPlayer(const char *name); Player * getPlayer(const char *name);
Player * getRandomConnectedPlayer(); Player * getRandomConnectedPlayer();
@ -226,7 +226,7 @@ public:
const std::string &str_reason, bool reconnect); const std::string &str_reason, bool reconnect);
// Save players // Save players
void saveLoadedPlayers(); void saveLoadedPlayers();
void savePlayer(const std::string &playername); void savePlayer(RemotePlayer *player);
Player *loadPlayer(const std::string &playername); Player *loadPlayer(const std::string &playername);
/* /*