From: <mar...@us...> - 2014-02-24 16:55:24
|
Revision: 6930 http://sourceforge.net/p/freeorion/code/6930 Author: marcel_metz Date: 2014-02-24 16:55:18 +0000 (Mon, 24 Feb 2014) Log Message: ----------- Made code more palatable for the clang compiler. - Replaced improper 'class' friend tagging for actual structs. - Moved member attribute initialization into correct order. - Removed long time unused variables and functions. - Commented out short time unused variables and functions. Modified Paths: -------------- trunk/FreeOrion/AI/AIInterface.cpp trunk/FreeOrion/Empire/Empire.cpp trunk/FreeOrion/UI/BuildDesignatorWnd.cpp trunk/FreeOrion/UI/DesignWnd.cpp trunk/FreeOrion/UI/EntityRenderer.cpp trunk/FreeOrion/UI/FieldIcon.cpp trunk/FreeOrion/UI/FleetWnd.cpp trunk/FreeOrion/UI/InfoPanels.cpp trunk/FreeOrion/UI/MapWnd.h trunk/FreeOrion/UI/ObjectListWnd.cpp trunk/FreeOrion/UI/PlayerListWnd.cpp trunk/FreeOrion/UI/ProductionWnd.cpp trunk/FreeOrion/UI/ResearchWnd.cpp trunk/FreeOrion/UI/SidePanel.cpp trunk/FreeOrion/UI/SitRepPanel.cpp trunk/FreeOrion/server/SaveLoad.h trunk/FreeOrion/server/ServerApp.cpp trunk/FreeOrion/server/ServerFSM.cpp trunk/FreeOrion/universe/PythonUniverseGenerator.cpp trunk/FreeOrion/universe/ShipDesign.cpp trunk/FreeOrion/universe/UniverseGenerator.cpp trunk/FreeOrion/universe/ValueRef.cpp trunk/FreeOrion/util/Order.cpp Modified: trunk/FreeOrion/AI/AIInterface.cpp =================================================================== --- trunk/FreeOrion/AI/AIInterface.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/AI/AIInterface.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -74,24 +74,6 @@ Universe& universe = AIClientApp::GetApp()->GetUniverse(); universe.InitMeterEstimatesAndDiscrepancies(); } - - // start of turn initialization for Empire ResourcePools. determines where supplies can be delivered, and - // between which systems resources can be exchanged (which is necessary to know before resource pools can be - // updated - // ** not used currently because this info is all provided by Server, and having client recalculate it simply - // risks overwriting with inaccurate information - void InitResourcePoolsAndSupply() { - EmpireManager& manager = AIClientApp::GetApp()->Empires(); - - // determine systems where fleets can delivery supply, and groups of systems that can exchange resources - for (EmpireManager::iterator it = manager.begin(); it != manager.end(); ++it) { - Empire* empire = it->second; - empire->UpdateSupplyUnobstructedSystems(); - empire->UpdateSystemSupplyRanges(); - empire->UpdateSupply(); - empire->InitResourcePools(); - } - } } namespace AIInterface { @@ -181,7 +163,6 @@ InitMeterEstimatesAndDiscrepancies(); UpdateMeterEstimates(); - //InitResourcePoolsAndSupply(); //unneeded & was overwriting/erasing info provided by Server UpdateResourcePools(); Logger().debugStream() << "AIInterface::InitTurn time: " << (turn_init_timer.elapsed() * 1000.0); Modified: trunk/FreeOrion/Empire/Empire.cpp =================================================================== --- trunk/FreeOrion/Empire/Empire.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/Empire/Empire.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -557,8 +557,8 @@ ProductionQueue::Element::Element(ProductionItem item_, int empire_id_, int ordered_, int remaining_, int location_) : + item(item_), empire_id(empire_id_), - item(item_), ordered(ordered_), blocksize(1), remaining(remaining_), @@ -573,8 +573,8 @@ ProductionQueue::Element::Element(BuildType build_type, std::string name, int empire_id_, int ordered_, int remaining_, int location_) : + item(build_type, name), empire_id(empire_id_), - item(build_type, name), ordered(ordered_), blocksize(1), remaining(remaining_), @@ -589,8 +589,8 @@ ProductionQueue::Element::Element(BuildType build_type, int design_id, int empire_id_, int ordered_, int remaining_, int location_) : + item(build_type, design_id), empire_id(empire_id_), - item(build_type, design_id), ordered(ordered_), blocksize(1), remaining(remaining_), Modified: trunk/FreeOrion/UI/BuildDesignatorWnd.cpp =================================================================== --- trunk/FreeOrion/UI/BuildDesignatorWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/BuildDesignatorWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -68,7 +68,6 @@ if (!m_initialized) return; - const GG::Y ICON_HEIGHT(ClientHeight()); const GG::X ICON_WIDTH(Value(ClientHeight())); const GG::X ITEM_NAME_WIDTH(ClientUI::Pts() * 16); const GG::X COST_WIDTH(ClientUI::Pts() * 4); @@ -76,7 +75,6 @@ const GG::X DESC_WIDTH(ClientUI::Pts() * 18); GG::X left(GG::X0); - GG::Y top(GG::Y0); GG::Y bottom(ClientHeight()); m_icon->SizeMove(GG::Pt(left, GG::Y0), GG::Pt(left + ICON_WIDTH, bottom)); Modified: trunk/FreeOrion/UI/DesignWnd.cpp =================================================================== --- trunk/FreeOrion/UI/DesignWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/DesignWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -1364,8 +1364,6 @@ void DoLayout(); void WndSelected(std::size_t index); - int m_empire_id; - GG::TabWnd* m_tabs; BasesListBox* m_hulls_list; // empty hulls on which a new design can be based BasesListBox* m_designs_list; // designs this empire has created or learned how to make @@ -1374,7 +1372,6 @@ DesignWnd::BaseSelector::BaseSelector(GG::X w, GG::Y h) : CUIWnd(UserString("DESIGN_WND_STARTS"), GG::X0, GG::Y0, w, h, GG::INTERACTIVE | GG::RESIZABLE | GG::ONTOP | GG::DRAGABLE), - m_empire_id(ALL_EMPIRES), m_tabs(0), m_hulls_list(0), m_designs_list(0) @@ -2027,7 +2024,7 @@ void DesignWnd::MainPanel::SetPart(const PartType* part, unsigned int slot) { //Logger().debugStream() << "DesignWnd::MainPanel::SetPart(" << (part ? part->Name() : "no part") << ", slot " << slot << ")"; - if (slot < 0 || slot > m_slots.size()) { + if (slot > m_slots.size()) { Logger().errorStream() << "DesignWnd::MainPanel::SetPart specified nonexistant slot"; return; } Modified: trunk/FreeOrion/UI/EntityRenderer.cpp =================================================================== --- trunk/FreeOrion/UI/EntityRenderer.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/EntityRenderer.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -40,22 +40,6 @@ entityKey << "-" << entity->getSubEntity(i)->getMaterialName(); return entityKey.str(); } - - std::string removeInvalidCharacters(std::string s) { - Ogre::StringUtil::StrStreamType s2; - - for (std::size_t i = 0; i < s.size(); ++i) { - char c = s[i]; - if (c == '/' || c == '\\' || c == ':' || c == '*' || c == '?' || - c == '\"' || c == '<' || c == '>' || c == '|') { - s2 << '-'; - } else { - s2 << c; - } - } - - return s2.str(); - } } //////////////////////////////////////////////////////////// Modified: trunk/FreeOrion/UI/FieldIcon.cpp =================================================================== --- trunk/FreeOrion/UI/FieldIcon.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/FieldIcon.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -12,14 +12,6 @@ #include <GG/WndEvent.h> #include <GG/Menu.h> -namespace { - const std::vector<boost::shared_ptr<GG::Texture> >& GetSelectionIndicatorTextures() { - static std::vector<boost::shared_ptr<GG::Texture> > normal_textures = - ClientUI::GetClientUI()->GetPrefixedTextures(ClientUI::ArtDir() / "misc" / "system_selection", "system_selection", true); - return normal_textures; - } -} - //////////////////////////////////////////////// // FieldIcon //////////////////////////////////////////////// @@ -31,25 +23,6 @@ m_selected(false), m_name(0) { - //// selection indicator graphic - //const std::vector<boost::shared_ptr<GG::Texture> >& textures = GetSelectionIndicatorTextures(); - //GG::X texture_width = textures.at(0)->DefaultWidth(); - //GG::Y texture_height = textures.at(0)->DefaultHeight(); - //m_selection_indicator = new GG::DynamicGraphic(GG::X0, GG::Y0, - // texture_width, texture_height, true, - // texture_width, texture_height, 0, textures, - // GG::GRAPHIC_FITGRAPHIC | GG::GRAPHIC_PROPSCALE); - //m_selection_indicator->SetFPS(ClientUI::SystemSelectionIndicatorFPS()); - //AttachChild(m_selection_indicator); - //m_selection_indicator->Play(); - - //// mouseover indicator graphic - //boost::shared_ptr<GG::Texture> mouseover_texture = ClientUI::GetTexture(ClientUI::ArtDir() / "misc" / "system_mouseover.png"); - //texture_width = mouseover_texture->DefaultWidth(); - //texture_height = mouseover_texture->DefaultHeight(); - //m_mouseover_indicator = new GG::StaticGraphic(GG::X0, GG::Y0, texture_width, texture_height, - // mouseover_texture, GG::GRAPHIC_FITGRAPHIC | GG::GRAPHIC_PROPSCALE); - Refresh(); } Modified: trunk/FreeOrion/UI/FleetWnd.cpp =================================================================== --- trunk/FreeOrion/UI/FleetWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/FleetWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -2784,7 +2784,6 @@ const GG::Y FLEET_STAT_HEIGHT(StatIconSize().y + PAD); const GG::Y AVAILABLE_HEIGHT(TOTAL_HEIGHT - GG::Y(INNER_BORDER_ANGLE_OFFSET+PAD) - FLEET_STAT_HEIGHT ); GG::Y top( GG::Y0 + GG::Y(PAD) ); - const GG::Y BOTTOM(TOTAL_HEIGHT - GG::Y(INNER_BORDER_ANGLE_OFFSET)); const GG::Y ROW_HEIGHT(m_fleets_lb->ListRowSize().y); // position fleet aggregate stat icons Modified: trunk/FreeOrion/UI/InfoPanels.cpp =================================================================== --- trunk/FreeOrion/UI/InfoPanels.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/InfoPanels.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -236,9 +236,6 @@ GG::TextControl* m_summary_title; - GG::TextControl* m_sum_label; - GG::TextControl* m_sum_value; - std::vector<std::pair<GG::TextControl*, GG::TextControl*> > m_effect_labels_and_values; @@ -2158,7 +2155,6 @@ const GG::X SPECIES_CENSUS_WIDTH(ClientUI::Pts() * 5); GG::X left(GG::X0); - GG::Y top(GG::Y0); GG::Y bottom(MeterIconSize().y - GG::Y(EDGE_PAD)); if (m_show_icon) @@ -3048,8 +3044,6 @@ m_meter_type(meter_type), m_source_object_id(object_id), m_summary_title(0), - m_sum_label(0), - m_sum_value(0), m_row_height(1), m_initialized(false) {} Modified: trunk/FreeOrion/UI/MapWnd.h =================================================================== --- trunk/FreeOrion/UI/MapWnd.h 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/MapWnd.h 2014-02-24 16:55:18 UTC (rev 6930) @@ -439,10 +439,10 @@ std::set<int> m_fleets_exploring; - friend class IntroMenu; - friend class WaitingForGameStart; - friend class PlayingTurn; - friend class PlayingGame; + friend struct IntroMenu; + friend struct WaitingForGameStart; + friend struct PlayingTurn; + friend struct PlayingGame; }; Modified: trunk/FreeOrion/UI/ObjectListWnd.cpp =================================================================== --- trunk/FreeOrion/UI/ObjectListWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/ObjectListWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -55,25 +55,6 @@ const std::string STARTYPE_CONDITION(UserStringNop("CONDITION_STARTYPE")); const std::string METERVALUE_CONDITION(UserStringNop("CONDITION_METERVALUE")); - ValueRef::ValueRefBase<std::string>* CopyStringValueRef(const ValueRef::ValueRefBase<std::string>* const value_ref) { - if (const ValueRef::Constant<std::string>* constant = - dynamic_cast<const ValueRef::Constant<std::string>*>(value_ref)) - { return new ValueRef::Constant<std::string>(constant->Value()); } - return new ValueRef::Constant<std::string>(""); - } - ValueRef::ValueRefBase<int>* CopyIntValueRef(const ValueRef::ValueRefBase<int>* const value_ref) { - if (const ValueRef::Constant<int>* constant = - dynamic_cast<const ValueRef::Constant<int>*>(value_ref)) - { return new ValueRef::Constant<int>(constant->Value()); } - return new ValueRef::Constant<int>(0); - } - ValueRef::ValueRefBase<double>* CopyDoubleValueRef(const ValueRef::ValueRefBase<double>* const value_ref) { - if (const ValueRef::Constant<double>* constant = - dynamic_cast<const ValueRef::Constant<double>*>(value_ref)) - { return new ValueRef::Constant<double>(constant->Value()); } - return new ValueRef::Constant<double>(0.0); - } - template <class enumT> ValueRef::ValueRefBase<enumT>* CopyEnumValueRef(const ValueRef::ValueRefBase<enumT>* const value_ref) { if (const ValueRef::Constant<enumT>* constant = @@ -758,7 +739,6 @@ const UniverseObjectType& uot = uot_it->first; const std::string& uot_label = " " + UserString(EnumToString(uot)) + " "; const std::set<VIS_DISPLAY>& vis_display = uot_it->second; - GG::Clr text_color = ClientUI::TextColor(); m_filters_layout->SetColumnStretch(col, 1.0); @@ -1081,7 +1061,6 @@ if (!m_initialized) return; - const GG::Y ICON_HEIGHT(ClientHeight()); const GG::X ICON_WIDTH(Value(ClientHeight())); GG::X indent(ICON_WIDTH * m_indent); Modified: trunk/FreeOrion/UI/PlayerListWnd.cpp =================================================================== --- trunk/FreeOrion/UI/PlayerListWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/PlayerListWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -29,7 +29,6 @@ boost::shared_ptr<GG::Texture> CombatIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "combat.png"); } boost::shared_ptr<GG::Texture> WarIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "war.png"); } boost::shared_ptr<GG::Texture> PeaceIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "peace.png"); } - boost::shared_ptr<GG::Texture> DeadIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "sitrep" / "empire_eliminated.png"); } boost::shared_ptr<GG::Texture> UnknownIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "unknown.png"); } boost::shared_ptr<GG::Texture> ShipIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "sitrep" / "fleet_arrived.png"); } boost::shared_ptr<GG::Texture> ProductionIcon() { return ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "meter" / "industry.png"); } Modified: trunk/FreeOrion/UI/ProductionWnd.cpp =================================================================== --- trunk/FreeOrion/UI/ProductionWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/ProductionWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -304,7 +304,7 @@ // ProductionItemBrowseWnd // ///////////////////////////// boost::shared_ptr<GG::BrowseInfoWnd> ProductionItemBrowseWnd(const ProductionQueue::Element& elem) { - const Empire* empire = Empires().Lookup(elem.empire_id); + //const Empire* empire = Empires().Lookup(elem.empire_id); std::string main_text; std::string item_name; Modified: trunk/FreeOrion/UI/ResearchWnd.cpp =================================================================== --- trunk/FreeOrion/UI/ResearchWnd.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/ResearchWnd.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -56,7 +56,6 @@ MultiTurnProgressBar* m_progress_bar; bool m_in_progress; int m_total_turns; - double m_turns_completed; int m_empire_id; }; @@ -98,7 +97,6 @@ m_tech_name(tech_name), m_in_progress(turn_spending), m_total_turns(1), - m_turns_completed(turns_completed), m_empire_id(empire_id) { const int MARGIN = 2; Modified: trunk/FreeOrion/UI/SidePanel.cpp =================================================================== --- trunk/FreeOrion/UI/SidePanel.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/SidePanel.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -49,12 +49,6 @@ std::map<std::pair<std::string,int>,float> species_colony_projections; void PlaySidePanelOpenSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.sidepanel-open"), true);} - void PlayFarmingFocusClickSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.farming-focus"), true);} - void PlayIndustryFocusClickSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.industry-focus"), true);} - void PlayResearchFocusClickSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.research-focus"), true);} - void PlayMiningFocusClickSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.mining-focus"), true);} - void PlayTradeFocusClickSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.trade-focus"), true);} - void PlayBalancedFocusClickSound() {Sound::GetSound().PlaySound(GetOptionsDB().Get<std::string>("UI.sound.balanced-focus"), true);} struct RotatingPlanetData { RotatingPlanetData(const XMLElement& elem) { @@ -447,21 +441,6 @@ return retval; } - /** Returns map from object ID to issued colonize orders affecting it. */ - std::map<int, int> PendingScrapOrders() { - std::map<int, int> retval; - const ClientApp* app = ClientApp::GetApp(); - if (!app) - return retval; - const OrderSet& orders = app->Orders(); - for (OrderSet::const_iterator it = orders.begin(); it != orders.end(); ++it) { - if (boost::shared_ptr<ScrapOrder> order = boost::dynamic_pointer_cast<ScrapOrder>(it->second)) { - retval[order->ObjectID()] = it->first; - } - } - return retval; - } - bool ClientPlayerIsModerator() { return HumanClientApp::GetApp()->GetClientType() == Networking::CLIENT_TYPE_HUMAN_MODERATOR; } } @@ -747,17 +726,6 @@ int m_system_id; }; - XMLElement GetXMLChild(XMLElement &node,const std::string &child_path) { - int index; - - if (-1 == (index=child_path.find_first_of('.'))) - return node.ContainsChild(child_path)?node.Child(child_path):XMLElement(); - else - return node.ContainsChild(child_path.substr(0,index)) ? - GetXMLChild(node.Child(child_path.substr(0, index)), child_path.substr(index + 1, child_path.length() - index - 1)) - : XMLElement(); - } - const std::vector<boost::shared_ptr<GG::Texture> >& GetAsteroidTextures() { static std::vector<boost::shared_ptr<GG::Texture> > retval; if (retval.empty()) { @@ -1205,25 +1173,6 @@ return retval; } - - bool OwnedColonyShipsInSystem(int empire_id, int system_id) { - if (!GetSystem(system_id)) - return false; - - const ObjectMap& objects = Objects(); - std::vector<TemporaryPtr<const Ship> > ships = objects.FindObjects<Ship>(); - for (std::vector<TemporaryPtr<const Ship> >::const_iterator it = ships.begin(); it != ships.end(); ++it) { - TemporaryPtr<const Ship> ship = *it; - if (ship->SystemID() == system_id && - ship->OwnedBy(empire_id) && - ship->CanColonize()) - { - return true; - break; - } - } - return false; - } } TemporaryPtr<const Ship> ValidSelectedColonyShip(int system_id) { @@ -2817,7 +2766,6 @@ // get info with which to repopulate - int app_empire_id = HumanClientApp::GetApp()->EmpireID(); TemporaryPtr<const System> system = GetSystem(s_system_id); // if no system object, there is nothing to populate with. early abort. if (!system) Modified: trunk/FreeOrion/UI/SitRepPanel.cpp =================================================================== --- trunk/FreeOrion/UI/SitRepPanel.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/UI/SitRepPanel.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -138,11 +138,9 @@ void DoLayout() { if (!m_initialized) return; - const GG::Y ICON_HEIGHT(ClientHeight()); const GG::X ICON_WIDTH(Value(ClientHeight())); GG::X left(GG::X0); - GG::Y top(GG::Y0); GG::Y bottom(ClientHeight()); m_icon->SizeMove(GG::Pt(left, GG::Y0), GG::Pt(left + ICON_WIDTH, bottom)); Modified: trunk/FreeOrion/server/SaveLoad.h =================================================================== --- trunk/FreeOrion/server/SaveLoad.h 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/server/SaveLoad.h 2014-02-24 16:55:18 UTC (rev 6930) @@ -6,14 +6,14 @@ #include <map> #include <string> +class CombatLogManager; +class EmpireManager; +class SpeciesManager; +class Universe; +struct GalaxySetupData; struct PlayerSaveGameData; +struct SaveGameEmpireData; struct ServerSaveGameData; -struct SaveGameEmpireData; -class Universe; -class EmpireManager; -class SpeciesManager; -class CombatLogManager; -class GalaxySetupData; /** Saves the provided data to savefile \a filename. */ void SaveGame(const std::string& filename, Modified: trunk/FreeOrion/server/ServerApp.cpp =================================================================== --- trunk/FreeOrion/server/ServerApp.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/server/ServerApp.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -1198,10 +1198,10 @@ /** Returns true if \a empire has been eliminated by the applicable * definition of elimination. As of this writing, elimination means * having no ships and no fleets. */ - bool EmpireEliminated(int empire_id) { - return (Objects().FindObjects(OwnedVisitor<Planet>(empire_id)).empty() && // no planets - Objects().FindObjects(OwnedVisitor<Fleet>(empire_id)).empty()); // no fleets - } + //bool EmpireEliminated(int empire_id) { + // return (Objects().FindObjects(OwnedVisitor<Planet>(empire_id)).empty() && // no planets + // Objects().FindObjects(OwnedVisitor<Fleet>(empire_id)).empty()); // no fleets + //} /** Compiles and return set of ids of empires that are controlled by a * human player.*/ Modified: trunk/FreeOrion/server/ServerFSM.cpp =================================================================== --- trunk/FreeOrion/server/ServerFSM.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/server/ServerFSM.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -140,11 +140,6 @@ return UserString("EMPIRE"); } } - - std::string GenerateEmpireName() { - std::list<std::pair<int, PlayerSetupData> > empty_data; - return GenerateEmpireName(empty_data); - } } Modified: trunk/FreeOrion/universe/PythonUniverseGenerator.cpp =================================================================== --- trunk/FreeOrion/universe/PythonUniverseGenerator.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/universe/PythonUniverseGenerator.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -785,12 +785,6 @@ return planet->Colonize(empire_id, species, population); } - - // Misc. helper functions/wrappers - // - // Wrapper function for i18n::RomanNumber - object RomanNumberWrapper(unsigned int n) - { return object(RomanNumber(n)); } } // Python module for logging functions Modified: trunk/FreeOrion/universe/ShipDesign.cpp =================================================================== --- trunk/FreeOrion/universe/ShipDesign.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/universe/ShipDesign.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -619,7 +619,7 @@ TemporaryPtr<const UniverseObject> source = SourceForEmpire(empire_id); if (!source && !m_production_time->SourceInvariant()) - return 999999.9f; + return 999999; ScriptingContext context(source, location); Modified: trunk/FreeOrion/universe/UniverseGenerator.cpp =================================================================== --- trunk/FreeOrion/universe/UniverseGenerator.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/universe/UniverseGenerator.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -676,10 +676,6 @@ delete *it; m_plans.clear(); } - - /** returns the singleton fleet plan manager */ - const FleetPlanManager& GetFleetPlanManager() - { return FleetPlanManager::GetFleetPlanManager(); } }; ///////////////////////////// @@ -790,10 +786,6 @@ for (iterator it = begin(); it != end(); ++it) empire->UnlockItem(*it); } - - /** returns the singleton item spec manager */ - const ItemSpecManager& GetItemSpecManager() - { return ItemSpecManager::GetItemSpecManager(); } }; namespace { @@ -1140,189 +1132,6 @@ lanesToRemoveIter++; } } - - /** Grows trees to connect stars... takes an array of sets of potential - * starlanes for each star, and puts the starlanes of the tree into - * another set. */ - void GrowSpanningTrees(std::vector<int> roots, std::vector<std::set<int> >& potentialLaneSetArray, - std::vector<std::set<int> >& laneSetArray) - { - // array to keep track of whether a given system (index #) has been connected to by growing tree algorithm - std::vector<int> treeOfSystemArray; // which growing tree a particular system has been assigned to - - // map index by tree number, containing a list for each tree, each of which contains the systems in a particular tree - std::map<int, std::list<int> > treeSysListsMap; - std::map<int, std::list<int> >::iterator treeSysListsMapIter, treeSysListsMapEnd; - std::pair<int, std::list<int> > mapInsertable; - std::list<int> treeSysList, *pTreeSysList, *pTreeToMergeSysList; - std::list<int>::iterator sysListIter; - std::set<int>::iterator lanesSetIter, lanesSetEnd; - - int n, q, d, curTree, destTree, curSys, destSys, mergeSys; - - int numSys = potentialLaneSetArray.size(); - int numTrees = roots.size(); - - // number of new connections to make from each connected node that is processed. - // could be made a parameter, possibly a function of the starlane frequency - - // make sure data is consistent - if (static_cast<int>(laneSetArray.size()) != numSys) { - Logger().errorStream() << "GrowSpanningTrees got different size vectors of potential lane set(s) and systems. Doing nothing."; - return; - } - if ((numTrees < 1) || (numTrees > numSys)) { - Logger().errorStream() << "GrowSpanningTrees was asked to grow too many or too few trees simultaneously. Doing nothing."; - return; - } - if (static_cast<int>(roots.size()) > numSys) { - Logger().errorStream() << "GrowSpanningTrees was asked to grow more separate trees than there are systems to grow from. Doing nothing."; - return; - } - - laneSetArray.resize(numSys); - - // set up data structures... - treeOfSystemArray.resize(numSys); - for (n = 0; n < numSys; n++) - treeOfSystemArray[n] = -1; // sentinel value for not connected to any tree - - treeSysListsMap.clear(); - for (n = 0; n < numTrees; n++) { - // check that next root is within valid range... - q = roots[n]; - if ((q >= numSys) || (q < 0)) { - //Logger().debugStream() << "GrowSpanningTrees was asked to grow to grow a tree from a system that doesn't exist."; - return; - } - - // make new tree to put into map - treeSysList.clear(); - treeSysList.push_front(q); - - // put new list into into map (for tree n), indexed by tree number - mapInsertable = std::pair<int, std::list<int> >(n, treeSysList); - treeSysListsMap.insert(mapInsertable); - - // record the tree to which root system of tree n, roots[n], belongs (tree n) - treeOfSystemArray[q] = n; - } - - //Logger().debugStream() << "Growing Trees Algorithm Starting..."; - - // loop through map (indexed by tree number) of lists of systems, until map (and all lists) are empty... - treeSysListsMapIter = treeSysListsMap.begin(); - treeSysListsMapEnd = treeSysListsMap.end(); - while (treeSysListsMapIter != treeSysListsMapEnd) { - // extract number and list of tree - curTree = treeSysListsMapIter->first; - pTreeSysList = &(treeSysListsMapIter->second); - - if (pTreeSysList->empty()) { - // no systems left for tree to grow. Remove it from map of growing trees. - treeSysListsMap.erase(curTree); - //Logger().debugStream() << "Tree " << curTree << " was empty, so was removed from map of trees."; - - // check if set is empty... - if (treeSysListsMap.empty()) break; // and stop loop if it is - // (iterator invalidated by erasing, so set to first tree remaining in map) - treeSysListsMapIter = treeSysListsMap.begin(); - } - else { - //Logger().debugStream() << "Tree " << curTree << " contains " << pTreeSysList->size() << " systems."; - // tree has systems left to grow. - - // extract and remove a random system from the list - - // iterate to the position of the random system - sysListIter = pTreeSysList->begin(); - for (d = RandSmallInt(0, pTreeSysList->size() - 1); d > 0; --d) // RandSmallInt(int min, int max); - sysListIter++; - - curSys = *sysListIter; // extract - pTreeSysList->erase(sysListIter); // erase - - //Logger().debugStream() << "Processing system " << curSys << " from tree " << curTree; - - // iterate through list of potential lanes for current system - lanesSetIter = potentialLaneSetArray[curSys].begin(); - lanesSetEnd = potentialLaneSetArray[curSys].end(); - while (lanesSetIter != lanesSetEnd) { - // get destination system of potential lane - destSys = *lanesSetIter; - - // get which, if any, tree the destination system belongs to currently - destTree = treeOfSystemArray[destSys]; - - //Logger().debugStream() << "Considering lane from system " << curSys << " to system " << destSys << " of tree " << destTree; - - // check if the destination system already belongs to the current tree. - if (curTree != destTree) { - // destination system is either in no tree, or is in a tree other than the current tree - - // add lane between current and destination systems - laneSetArray[curSys].insert(destSys); - laneSetArray[destSys].insert(curSys); - - // mark destination system as part of this tree - treeOfSystemArray[destSys] = curTree; - - //Logger().debugStream() << "Added lane from " << curSys << " to " << destSys << ", and added " << destSys << " to list of systems to process in tree " << curTree; - } - //else - // Logger().debugStream() << "Both systems were already part of the same tree, so no lane was added"; - - // check what, if any, tree the destination system was before being added to the current tree - if (-1 == destTree) { - // destination system was not yet part of any tree. - // add system to list of systems to consider for this tree in future - pTreeSysList->push_back(destSys); - - //Logger().debugStream() << "System was not yet part of an tree, so was added to the list of systems to process for tree " << curTree; - } - else if (destTree != curTree) { - // tree was already part of another tree - // merge the two trees. - - //Logger().debugStream() << "Merging tree " << destTree << " into current tree " << curTree; - - pTreeToMergeSysList = &((treeSysListsMap.find(destTree))->second); - - //Logger().debugStream() << "...got pointer to systems list for tree to merge into current tree"; - //Logger().debugStream() << "...list to merge has " << pTreeToMergeSysList->size() << " systems."; - - // extract systems from tree to be merged into current tree - while (!pTreeToMergeSysList->empty()) { - // get system from list - mergeSys = pTreeToMergeSysList->front(); - pTreeToMergeSysList->pop_front(); - // add to current list - pTreeSysList->push_back(mergeSys); - - //Logger().debugStream() << "Adding system " << mergeSys << " to current tree " << curTree << " from old tree " << destTree; - } - - // reassign all systems from destination tree to current tree (gets systems even after they're removed - // from the list of systems for the dest tree) - for (q = 0; q < numSys; q++) - if (treeOfSystemArray[q] == destTree) - treeOfSystemArray[q] = curTree; - - treeSysListsMap.erase(destTree); - } - - lanesSetIter++; - } - } - - //Logger().debugStream() << "Moving to next tree..."; - - treeSysListsMapIter++; - treeSysListsMapEnd = treeSysListsMap.end(); // incase deleting or merging trees messed things up - if (treeSysListsMapIter == treeSysListsMapEnd) - treeSysListsMapIter = treeSysListsMap.begin(); - } - } } void SetActiveMetersToTargetMaxCurrentValues(ObjectMap& object_map) { @@ -1811,54 +1620,6 @@ Logger().debugStream() << "Initializing System Graph"; GetUniverse().InitializeSystemGraph(); - - - //for (n = 0; n < numSys; n++) - // laneSetArray[n].clear(); - - //// array of indices of systems from which to start growing spanning tree(s). This can later be replaced with - //// some sort of user input. It can also be ommited entirely, so just the ConnectedWithin loop below is used. - //std::vector<int> roots(4); - //roots[0] = 0; roots[1] = 1; roots[2] = 2; roots[3] = 3; - //GrowSpanningTrees(roots, potentialLaneSetArray, laneSetArray); - ////Logger().debugStream() << "Constructed initial spanning trees."; - - //// add starlanes of spanning tree to stars - //for (n = 0; n < numSys; n++) { - // laneSetIter = laneSetArray[n].begin(); - // laneSetEnd = laneSetArray[n].end(); - // while (laneSetIter != laneSetEnd) { - // s1 = *laneSetIter; - // // add the starlane to the stars - // sys_vec[n]->AddStarlane(s1); - // sys_vec[s1]->AddStarlane(n); - // laneSetIter++; - // } // end while - //} // end for n - - - //// loop through stars, seeing if any are too far away from stars they could be connected to by a - //// potential starlane. If so, add the potential starlane to the stars to directly connect them - //for (n = 0; n < numSys; n++) { - // laneSetIter = potentialLaneSetArray[n].begin(); - // laneSetEnd = potentialLaneSetArray[n].end(); - - // while (laneSetIter != laneSetEnd) { - // s1 = *laneSetIter; - - // if (!ConnectedWithin(n, s1, maxJumpsBetweenSystems, laneSetArray)) { - - // // add the starlane to the sets of starlanes for each star - // laneSetArray[n].insert(s1); - // laneSetArray[s1].insert(n); - // // add the starlane to the stars - // sys_vec[n]->AddStarlane(s1); - // sys_vec[s1]->AddStarlane(n); - // } - - // laneSetIter++; - // } // end while - //} // end for n } void GenerateHomeworlds(Universe& universe, int players, std::vector<int>& homeworld_planet_ids) { @@ -1979,29 +1740,6 @@ //Insert(field); } -namespace { - /** Reads list of strings from file, surrounded by enclosing quotes. */ - void LoadNames(std::vector<std::string>& names, const std::string& file_name) { - names.clear(); - std::string input; - boost::filesystem::ifstream ifs(GetResourceDir() / file_name); - if (ifs) { - std::getline(ifs, input, '\0'); - ifs.close(); - } else { - Logger().errorStream() << "Unable to open data file " << file_name; - } - using namespace boost::algorithm; - split(names, input, is_any_of("\"\n"), token_compress_on); - for (std::size_t i = 0; i < names.size(); ) { - if (names[i].empty()) - names.erase(names.begin() + i); - else - ++i; - } - } -}; - bool SetEmpireHomeworld(Empire* empire, int planet_id, std::string species_name) { // get home planet and system, check if they exist TemporaryPtr<Planet> home_planet = GetPlanet(planet_id); Modified: trunk/FreeOrion/universe/ValueRef.cpp =================================================================== --- trunk/FreeOrion/universe/ValueRef.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/universe/ValueRef.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -810,42 +810,36 @@ template <> PlanetSize ComplexVariable<PlanetSize>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return INVALID_PLANET_SIZE; } template <> PlanetType ComplexVariable<PlanetType>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return INVALID_PLANET_TYPE; } template <> PlanetEnvironment ComplexVariable<PlanetEnvironment>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return INVALID_PLANET_ENVIRONMENT; } template <> UniverseObjectType ComplexVariable<UniverseObjectType>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return INVALID_UNIVERSE_OBJECT_TYPE; } template <> StarType ComplexVariable<StarType>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return INVALID_STAR_TYPE; } template <> double ComplexVariable<double>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return 0.0; } @@ -891,7 +885,6 @@ template <> std::string ComplexVariable<std::string>::Eval(const ScriptingContext& context) const { - const std::string& variable_name = m_property_name.back(); return ""; } Modified: trunk/FreeOrion/util/Order.cpp =================================================================== --- trunk/FreeOrion/util/Order.cpp 2014-02-24 09:03:07 UTC (rev 6929) +++ trunk/FreeOrion/util/Order.cpp 2014-02-24 16:55:18 UTC (rev 6930) @@ -1014,9 +1014,9 @@ ShipDesignOrder::ShipDesignOrder(int empire, int existing_design_id_to_remember) : Order(empire), m_design_id(existing_design_id_to_remember), + m_update_name_or_description(false), m_delete_design_from_empire(false), m_create_new_design(false), - m_update_name_or_description(false), m_designed_on_turn(0), m_is_monster(false), m_name_desc_in_stringtable(false) @@ -1025,9 +1025,9 @@ ShipDesignOrder::ShipDesignOrder(int empire, int design_id_to_erase, bool dummy) : Order(empire), m_design_id(design_id_to_erase), + m_update_name_or_description(false), m_delete_design_from_empire(true), m_create_new_design(false), - m_update_name_or_description(false), m_designed_on_turn(0), m_is_monster(false), m_name_desc_in_stringtable(false) @@ -1036,9 +1036,9 @@ ShipDesignOrder::ShipDesignOrder(int empire, int new_design_id, const ShipDesign& ship_design) : Order(empire), m_design_id(new_design_id), + m_update_name_or_description(false), m_delete_design_from_empire(false), m_create_new_design(true), - m_update_name_or_description(false), m_name(ship_design.Name()), m_description(ship_design.Description()), m_designed_on_turn(ship_design.DesignedOnTurn()), @@ -1053,9 +1053,9 @@ ShipDesignOrder::ShipDesignOrder(int empire, int existing_design_id, const std::string& new_name/* = ""*/, const std::string& new_description/* = ""*/) : Order(empire), m_design_id(existing_design_id), + m_update_name_or_description(true), m_delete_design_from_empire(false), m_create_new_design(false), - m_update_name_or_description(true), m_name(new_name), m_description(new_description), m_designed_on_turn(0), |