From: <geo...@us...> - 2013-06-27 08:16:14
|
Revision: 6203 http://sourceforge.net/p/freeorion/code/6203 Author: geoffthemedio Date: 2013-06-27 08:16:10 +0000 (Thu, 27 Jun 2013) Log Message: ----------- Patch by adrian_broher removing some unused variables. Modified Paths: -------------- trunk/FreeOrion/UI/ClientUI.cpp trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp trunk/FreeOrion/UI/TechTreeWnd.cpp trunk/FreeOrion/client/human/HumanClientApp.cpp trunk/FreeOrion/combat/CombatSystem.cpp Modified: trunk/FreeOrion/UI/ClientUI.cpp =================================================================== --- trunk/FreeOrion/UI/ClientUI.cpp 2013-06-27 04:41:30 UTC (rev 6202) +++ trunk/FreeOrion/UI/ClientUI.cpp 2013-06-27 08:16:10 UTC (rev 6203) @@ -584,7 +584,7 @@ } bool ClientUI::ZoomToPlanetPedia(int id) { - if (const Planet* planet = GetPlanet(id)) + if (GetPlanet(id)) m_map_wnd->ShowPlanet(id); return false; } Modified: trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp =================================================================== --- trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp 2013-06-27 04:41:30 UTC (rev 6202) +++ trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp 2013-06-27 08:16:10 UTC (rev 6203) @@ -1065,7 +1065,6 @@ // Building types name = UserString(m_items_it->second); texture = ClientUI::FieldTexture(m_items_it->second); - int default_location_id = DefaultLocationForEmpire(client_empire_id); general_type = UserString("ENC_FIELD_TYPE"); detailed_description += UserString(field_type->Description()); Modified: trunk/FreeOrion/UI/TechTreeWnd.cpp =================================================================== --- trunk/FreeOrion/UI/TechTreeWnd.cpp 2013-06-27 04:41:30 UTC (rev 6202) +++ trunk/FreeOrion/UI/TechTreeWnd.cpp 2013-06-27 08:16:10 UTC (rev 6203) @@ -991,8 +991,6 @@ m_hscroll->SizeMove(hscroll_ul, hscroll_lr); const int ZBOFFSET = ClientUI::ScrollWidth() / 2; - const GG::Y TOP = UpperLeft().y; - const GG::X LEFT = UpperLeft().x; GG::Pt button_ul = GG::Pt(Width() - m_zoom_in_button->Width() - ZBOFFSET - SCRLWDTH, GG::Y(ZBOFFSET)); m_zoom_in_button->MoveTo(button_ul); @@ -1192,8 +1190,6 @@ static_cast<int>(HEIGHT + NODE_SEP), static_cast<int>(X_MARGIN)); - const Empire* empire = Empires().Lookup(HumanClientApp::GetApp()->EmpireID()); - Logger().debugStream() << "Tech Tree Layout Creating Panels"; // create new tech panels and new dependency arcs Modified: trunk/FreeOrion/client/human/HumanClientApp.cpp =================================================================== --- trunk/FreeOrion/client/human/HumanClientApp.cpp 2013-06-27 04:41:30 UTC (rev 6202) +++ trunk/FreeOrion/client/human/HumanClientApp.cpp 2013-06-27 08:16:10 UTC (rev 6203) @@ -576,7 +576,6 @@ { return m_viewport; } std::pair<int, int> HumanClientApp::GetWindowLeftTop() { - bool fullscreen = GetOptionsDB().Get<bool>("fullscreen"); int left(0), top(0); left = GetOptionsDB().Get<int>("app-left-windowed"); Modified: trunk/FreeOrion/combat/CombatSystem.cpp =================================================================== --- trunk/FreeOrion/combat/CombatSystem.cpp 2013-06-27 04:41:30 UTC (rev 6202) +++ trunk/FreeOrion/combat/CombatSystem.cpp 2013-06-27 08:16:10 UTC (rev 6203) @@ -367,8 +367,6 @@ if (attacker_damage) damage = attacker_damage->Current(); // planet "Defense" meter is actually its attack power - std::set<int>& damaged_object_ids = combat_info.damaged_object_ids; - Meter* target_structure = target->UniverseObject::GetMeter(METER_STRUCTURE); if (!target_structure) { Logger().errorStream() << "couldn't get target structure or shield meter"; |