From: <geo...@us...> - 2011-11-24 19:29:45
|
Revision: 4503 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4503&view=rev Author: geoffthemedio Date: 2011-11-24 19:29:39 +0000 (Thu, 24 Nov 2011) Log Message: ----------- Removed mis-copied namespace specifiers from inline Alignment constructor definitions. Modified Paths: -------------- trunk/FreeOrion/Empire/Empire.h Modified: trunk/FreeOrion/Empire/Empire.h =================================================================== --- trunk/FreeOrion/Empire/Empire.h 2011-11-20 08:24:51 UTC (rev 4502) +++ trunk/FreeOrion/Empire/Empire.h 2011-11-24 19:29:39 UTC (rev 4503) @@ -21,12 +21,12 @@ class Alignment { public: - Alignment::Alignment(const std::string& name, const std::string& description, const std::string& graphic) : + Alignment(const std::string& name, const std::string& description, const std::string& graphic) : m_name(name), m_description(description), m_graphic(graphic) {} - Alignment::Alignment() : + Alignment() : m_name(), m_description(), m_graphic() |
From: <geo...@us...> - 2012-05-04 19:09:24
|
Revision: 4872 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4872&view=rev Author: geoffthemedio Date: 2012-05-04 19:09:18 +0000 (Fri, 04 May 2012) Log Message: ----------- Added empire-meter container accessors to Empire. Modified Paths: -------------- trunk/FreeOrion/Empire/Empire.h Modified: trunk/FreeOrion/Empire/Empire.h =================================================================== --- trunk/FreeOrion/Empire/Empire.h 2012-05-04 19:03:38 UTC (rev 4871) +++ trunk/FreeOrion/Empire/Empire.h 2012-05-04 19:09:18 UTC (rev 4872) @@ -299,6 +299,10 @@ const std::set<std::string>& AvailableShipHulls() const; ///< Returns the set of ship hull names that that the empire can currently build const Meter* GetMeter(const std::string& name) const; ///< Returns the alignment meter with the indicated name, if any, or 0 if no such alignment meter exists + std::map<std::string, Meter>::const_iterator + meter_begin() const { return m_meters.begin(); } + std::map<std::string, Meter>::const_iterator + meter_end() const { return m_meters.end(); } bool ResearchableTech(const std::string& name) const; ///< Returns true iff \a name is a tech that has not been researched, and has no unresearched prerequisites. const ResearchQueue& GetResearchQueue() const; ///< Returns the queue of techs being or queued to be researched. |