Merge remote-tracking branch 'chris/master'

2012-10-01 22:23:36 -04:00 · 2012-10-01 22:23:36 -04:00 · 8598c40360
commit 8598c40360
parent b0b8de00fa 8ed2688095
1 changed files with 2 additions and 1 deletions
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@ -198,7 +198,8 @@ void Client::update(double elapsed_time)
                client_packet >> players_port;
                // Should be a much better way of doing this.
                // 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;
                }