Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision cd80d63161a8c652a82fffce708e97ba9dd639a0)
+++ client/Client/main.cpp	(revision cbc70ebba9601e9297b1c38c555649503e4dc839)
@@ -417,10 +417,5 @@
                map<unsigned int, Player*>::iterator it;
 
-               Player* curPlayer;
-               for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
-               {
-                  if (it->second->id == curPlayerId)
-                     curPlayer = it->second;
-               }
+               Player* curPlayer = mapPlayers[curPlayerId];;
 
                cout << "Got current player" << endl;