summaryrefslogtreecommitdiff
path: root/src/environment.cpp
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-09-23 18:53:54 +0200
committerest31 <MTest31@outlook.com>2015-09-23 19:37:05 +0200
commit596484da4fcd301e597a851a9a54b6dc276a286a (patch)
tree500b4b1c05e38357d583c33ac3910d94ce35bfec /src/environment.cpp
parenta56aedb4eae7d21864ab8dc56a82f644c4639f7a (diff)
downloadminetest-596484da4fcd301e597a851a9a54b6dc276a286a.tar.gz
minetest-596484da4fcd301e597a851a9a54b6dc276a286a.tar.bz2
minetest-596484da4fcd301e597a851a9a54b6dc276a286a.zip
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
Diffstat (limited to 'src/environment.cpp')
-rw-r--r--src/environment.cpp28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index 79540bccf..a29b0aab1 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -85,28 +85,11 @@ void Environment::addPlayer(Player *player)
m_players.push_back(player);
}
-void Environment::removePlayer(u16 peer_id)
-{
- 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)
+void Environment::removePlayer(Player* player)
{
for (std::vector<Player*>::iterator it = m_players.begin();
it != m_players.end(); ++it) {
- if (strcmp((*it)->getName(), name) == 0) {
+ if ((*it) == player) {
delete *it;
m_players.erase(it);
return;
@@ -453,15 +436,12 @@ 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";
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)