From: <geo...@us...> - 2012-11-19 09:20:39
|
Revision: 5439 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5439&view=rev Author: geoffthemedio Date: 2012-11-19 09:20:28 +0000 (Mon, 19 Nov 2012) Log Message: ----------- grooming Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp trunk/FreeOrion/parse/EffectParser.cpp trunk/FreeOrion/parse/EffectParser4.cpp trunk/FreeOrion/universe/Universe.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2012-11-19 01:36:58 UTC (rev 5438) +++ trunk/FreeOrion/UI/MapWnd.cpp 2012-11-19 09:20:28 UTC (rev 5439) @@ -1748,11 +1748,6 @@ //Logger().debugStream() << "Visible UniverseObjects: "; //objects.Dump(); - const ObjectMap& known_objects = universe.EmpireKnownObjects(HumanClientApp::GetApp()->EmpireID()); - //Logger().debugStream() << "Latest Known UniverseObjects: "; - //known_objects.Dump(); - - EmpireManager& manager = HumanClientApp::GetApp()->Empires(); //// DEBUG //for (EmpireManager::const_iterator empire_it = manager.begin(); empire_it != manager.end(); ++empire_it) @@ -1784,14 +1779,14 @@ // get ids of not-destroyed systems known to this empire. std::set<int> this_client_known_systems; - std::vector<int> all_system_ids = known_objects.FindObjectIDs<System>(); + std::vector<int> all_system_ids = Objects().FindObjectIDs<System>(); for (std::vector<int>::const_iterator it = all_system_ids.begin(); it != all_system_ids.end(); ++it) if (this_client_known_destroyed_objects.find(*it) == this_client_known_destroyed_objects.end()) this_client_known_systems.insert(*it); // get ids of all not-destroyed objects known to this empire. std::set<int> this_client_known_objects; - std::vector<int> all_object_ids = known_objects.FindObjectIDs(); + std::vector<int> all_object_ids = Objects().FindObjectIDs(); for (std::vector<int>::const_iterator it = all_object_ids.begin(); it != all_object_ids.end(); ++it) if (this_client_known_destroyed_objects.find(*it) == this_client_known_destroyed_objects.end()) this_client_known_objects.insert(*it); Modified: trunk/FreeOrion/parse/EffectParser.cpp =================================================================== --- trunk/FreeOrion/parse/EffectParser.cpp 2012-11-19 01:36:58 UTC (rev 5438) +++ trunk/FreeOrion/parse/EffectParser.cpp 2012-11-19 09:20:28 UTC (rev 5439) @@ -10,7 +10,7 @@ static bool once = true; if (once) { detail::effect_parser - %= detail::effect_parser_1() + = detail::effect_parser_1() | detail::effect_parser_2() | detail::effect_parser_3() | detail::effect_parser_4() Modified: trunk/FreeOrion/parse/EffectParser4.cpp =================================================================== --- trunk/FreeOrion/parse/EffectParser4.cpp 2012-11-19 01:36:58 UTC (rev 5438) +++ trunk/FreeOrion/parse/EffectParser4.cpp 2012-11-19 09:20:28 UTC (rev 5439) @@ -102,7 +102,7 @@ ; start - %= create_planet + = create_planet | create_building | create_ship_1 | create_ship_2 Modified: trunk/FreeOrion/universe/Universe.cpp =================================================================== --- trunk/FreeOrion/universe/Universe.cpp 2012-11-19 01:36:58 UTC (rev 5438) +++ trunk/FreeOrion/universe/Universe.cpp 2012-11-19 09:20:28 UTC (rev 5439) @@ -435,9 +435,8 @@ return m_objects; EmpireObjectMap::const_iterator it = m_empire_latest_known_objects.find(empire_id); - if (it != m_empire_latest_known_objects.end()) { + if (it != m_empire_latest_known_objects.end()) return it->second; - } static const ObjectMap const_empty_map; return const_empty_map; |