minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

fixed erroneus handling of many players with no peer existing at same time

pull/1/head
Perttu Ahola 2011-01-18 00:27:14 +02:00
parent 1986326731
commit b6787a2b58
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/environment.cpp
View File

@ -194,7 +194,8 @@ void Environment::addPlayer(Player *player)
#ifndef SERVER #ifndef SERVER
assert(player->isLocal() == false || getLocalPlayer() == NULL); assert(player->isLocal() == false || getLocalPlayer() == NULL);
#endif #endif
assert(getPlayer(player->peer_id) == NULL); if(player->peer_id != 0)
assert(getPlayer(player->peer_id) == NULL);
m_players.push_back(player); m_players.push_back(player);
} }

2
src/environment.h
View File

@ -73,6 +73,8 @@ public:
private: private:
Map *m_map; Map *m_map;
// peer_ids in here should be unique, except that there may be
// many 0s
core::list<Player*> m_players; core::list<Player*> m_players;
// Debug output goes here // Debug output goes here
std::ostream &m_dout; std::ostream &m_dout;