diff options
| author | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
| commit | feb7de91ec34ef1ca3152270a7bc62b2e308f1bd (patch) | |
| tree | 65c33378bae9b7ac565b979237b6d594b511171f /src/client.cpp | |
| parent | 33052abf42886ef03c4f46196cab6f767259a672 (diff) | |
| parent | 4468ea84e6d0faede5a01e8d97d359c537aa7ec8 (diff) | |
| download | minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.gz minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.bz2 minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/client.cpp b/src/client.cpp index f27f95d98..1d5f8f472 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2501,18 +2501,9 @@ void Client::printDebugInfo(std::ostream &os) <<std::endl;*/ } -std::list<std::wstring> Client::getConnectedPlayerNames() +std::list<std::string> Client::getConnectedPlayerNames() { - std::list<Player*> players = m_env.getPlayers(true); - std::list<std::wstring> playerNames; - for(std::list<Player*>::iterator - i = players.begin(); - i != players.end(); ++i) - { - Player *player = *i; - playerNames.push_back(narrow_to_wide(player->getName())); - } - return playerNames; + return m_env.getPlayerNames(); } float Client::getAnimationTime() |