Merge remote-tracking branch 'chris/master'

This commit is contained in:
Josh Holtrop 2012-10-01 22:23:36 -04:00
commit 8598c40360

View File

@ -198,7 +198,8 @@ void Client::update(double elapsed_time)
client_packet >> players_port; client_packet >> players_port;
// Should be a much better way of doing this. // Should be a much better way of doing this.
// Perhaps generate a random number // Perhaps generate a random number
if(name == m_current_player_name) if((name == m_current_player_name) &&
(players_port == m_net_client->getLocalPort()))
{ {
m_current_player = pindex; m_current_player = pindex;
} }