From: <geo...@us...> - 2011-10-10 17:20:21
|
Revision: 4380 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4380&view=rev Author: geoffthemedio Date: 2011-10-10 17:20:15 +0000 (Mon, 10 Oct 2011) Log Message: ----------- Grooming Modified Paths: -------------- trunk/FreeOrion/universe/ResourceCenter.cpp Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2011-10-10 17:19:54 UTC (rev 4379) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2011-10-10 17:20:15 UTC (rev 4380) @@ -19,9 +19,7 @@ ResourceCenter::ResourceCenter() : m_focus("") -{ - //Logger().debugStream() << "ResourceCenter::ResourceCenter()"; -} +{} ResourceCenter::~ResourceCenter() {} @@ -63,19 +61,13 @@ } const std::string& ResourceCenter::Focus() const -{ - return m_focus; -} +{ return m_focus; } std::vector<std::string> ResourceCenter::AvailableFoci() const -{ - return std::vector<std::string>(); -} +{ return std::vector<std::string>(); } const std::string& ResourceCenter::FocusIcon(const std::string& focus_name) const -{ - return EMPTY_STRING; -} +{ return EMPTY_STRING; } std::string ResourceCenter::Dump() const { |
From: <geo...@us...> - 2012-12-04 14:55:51
|
Revision: 5511 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5511&view=rev Author: geoffthemedio Date: 2012-12-04 14:55:40 +0000 (Tue, 04 Dec 2012) Log Message: ----------- Modified patch by Dilvish to check focus availability before setting in ResourceCenter::SetFocus. Modified Paths: -------------- trunk/FreeOrion/universe/ResourceCenter.cpp Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2012-12-04 14:45:02 UTC (rev 5510) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2012-12-04 14:55:40 UTC (rev 5511) @@ -109,9 +109,13 @@ } void ResourceCenter::SetFocus(const std::string& focus) { - // TODO: verify validity of focus? - m_focus = focus; - ResourceCenterChangedSignal(); + std::vector<std::string> avail_foci = AvailableFoci(); + if (std::find(avail_foci.begin(), avail_foci.end(), focus) != avail_foci.end()) { + m_focus = focus; + ResourceCenterChangedSignal(); + return; + } + Logger().errorStream() << "ResourceCenter::SetFocus Exploiter!-- unavailable focus " << focus << "attempted to be set for object w/ dump string: " << Dump(); } void ResourceCenter::ResourceCenterResetTargetMaxUnpairedMeters() { |
From: <geo...@us...> - 2013-04-01 08:06:12
|
Revision: 5933 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5933&view=rev Author: geoffthemedio Date: 2013-04-01 08:06:04 +0000 (Mon, 01 Apr 2013) Log Message: ----------- Made focus visible on detected planets a player doesn't control. Modified Paths: -------------- trunk/FreeOrion/universe/ResourceCenter.cpp Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2013-04-01 07:56:10 UTC (rev 5932) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2013-04-01 08:06:04 UTC (rev 5933) @@ -36,7 +36,7 @@ return; } - if (vis == VIS_FULL_VISIBILITY) { + if (vis >= VIS_PARTIAL_VISIBILITY) { this->m_focus = copied_object->m_focus; } } |
From: <geo...@us...> - 2013-07-27 10:16:58
|
Revision: 6269 http://sourceforge.net/p/freeorion/code/6269 Author: geoffthemedio Date: 2013-07-27 10:16:54 +0000 (Sat, 27 Jul 2013) Log Message: ----------- Modified ResourceCenter::SetFocus to allow setting focus to a blank string. Modified Paths: -------------- trunk/FreeOrion/universe/ResourceCenter.cpp Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2013-07-27 04:22:39 UTC (rev 6268) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2013-07-27 10:16:54 UTC (rev 6269) @@ -108,6 +108,11 @@ } void ResourceCenter::SetFocus(const std::string& focus) { + if (focus.empty()) { + m_focus.clear(); + ResourceCenterChangedSignal(); + return; + } std::vector<std::string> avail_foci = AvailableFoci(); if (std::find(avail_foci.begin(), avail_foci.end(), focus) != avail_foci.end()) { m_focus = focus; |
From: <geo...@us...> - 2013-10-27 01:07:11
|
Revision: 6477 http://sourceforge.net/p/freeorion/code/6477 Author: geoffthemedio Date: 2013-10-27 01:07:08 +0000 (Sun, 27 Oct 2013) Log Message: ----------- Fixed assign vs. comparison typo in ResourceCenter::TurnsSinceFocusChange. Modified Paths: -------------- trunk/FreeOrion/universe/ResourceCenter.cpp Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2013-10-26 14:13:00 UTC (rev 6476) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2013-10-27 01:07:08 UTC (rev 6477) @@ -64,7 +64,7 @@ if (m_last_turn_focus_changed == INVALID_GAME_TURN) return 0; int current_turn = CurrentTurn(); - if (current_turn = INVALID_GAME_TURN) + if (current_turn == INVALID_GAME_TURN) return 0; return current_turn - m_last_turn_focus_changed; } |