From: <geo...@us...> - 2011-07-10 03:52:04
|
Revision: 4031 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4031&view=rev Author: geoffthemedio Date: 2011-07-10 03:51:58 +0000 (Sun, 10 Jul 2011) Log Message: ----------- (Hopefully) fixed some OSX compile errors. Modified Paths: -------------- trunk/FreeOrion/server/ServerFSM.cpp Modified: trunk/FreeOrion/server/ServerFSM.cpp =================================================================== --- trunk/FreeOrion/server/ServerFSM.cpp 2011-07-10 03:40:17 UTC (rev 4030) +++ trunk/FreeOrion/server/ServerFSM.cpp 2011-07-10 03:51:58 UTC (rev 4031) @@ -316,7 +316,7 @@ // if player is in lobby, need to remove it int id = player_connection->PlayerID(); bool player_was_in_lobby = false; - for (std::list<std::pair<int, PlayerSetupData> >::const_iterator it = m_lobby_data->m_players.begin(); + for (std::list<std::pair<int, PlayerSetupData> >::iterator it = m_lobby_data->m_players.begin(); it != m_lobby_data->m_players.end(); ++it) { if (it->first == id) { @@ -394,7 +394,7 @@ player_connection->SendMessage(JoinAckMessage(player_id)); // inform player of host - player_connection->SendMessageA(HostIDMessage(server.m_networking.HostPlayerID())); + player_connection->SendMessage(HostIDMessage(server.m_networking.HostPlayerID())); // assign player info from defaults or from connection to lobby data players list PlayerSetupData player_setup_data; @@ -502,7 +502,7 @@ // update player connection types according to modified lobby selections, // while recording connections that are to be dropped std::vector<PlayerConnectionPtr> player_connections_to_drop; - for (ServerNetworking::const_established_iterator player_connection_it = server.m_networking.established_begin(); + for (ServerNetworking::established_iterator player_connection_it = server.m_networking.established_begin(); player_connection_it != server.m_networking.established_end(); ++player_connection_it) { PlayerConnectionPtr player_connection = *player_connection_it; |