From: <geo...@us...> - 2014-02-14 07:13:42
|
Revision: 6898 http://sourceforge.net/p/freeorion/code/6898 Author: geoffthemedio Date: 2014-02-14 07:13:36 +0000 (Fri, 14 Feb 2014) Log Message: ----------- Removed player status clearing from human client on turn update, and added it to AI game start response. Modified Paths: -------------- trunk/FreeOrion/client/AI/AIClientApp.cpp trunk/FreeOrion/client/human/HumanClientFSM.cpp Modified: trunk/FreeOrion/client/AI/AIClientApp.cpp =================================================================== --- trunk/FreeOrion/client/AI/AIClientApp.cpp 2014-02-14 07:03:36 UTC (rev 6897) +++ trunk/FreeOrion/client/AI/AIClientApp.cpp 2014-02-14 07:13:36 UTC (rev 6898) @@ -151,6 +151,7 @@ SaveGameUIData ui_data; // ignored bool state_string_available; // ignored, as save_state_string is sent even if not set by ExtractMessageData std::string save_state_string; + m_player_status.clear(); ExtractMessageData(msg, single_player_game, m_empire_id, m_current_turn, m_empires, m_universe, Modified: trunk/FreeOrion/client/human/HumanClientFSM.cpp =================================================================== --- trunk/FreeOrion/client/human/HumanClientFSM.cpp 2014-02-14 07:03:36 UTC (rev 6897) +++ trunk/FreeOrion/client/human/HumanClientFSM.cpp 2014-02-14 07:13:36 UTC (rev 6898) @@ -582,7 +582,6 @@ if (TRACE_EXECUTION) Logger().debugStream() << "(HumanClientFSM) PlayingGame.TurnUpdate"; int current_turn = INVALID_GAME_TURN; - Client().PlayerStatus().clear(); try { ExtractMessageData(msg.m_message, Client().EmpireID(), current_turn, |