X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Ffleet.cpp;h=a46a50a2ad51944c28a979e45992f99748deecfa;hp=a7ebe5cf0f7b610550b6c759ab1a0ea66aabe350;hb=56b09bf912d2965744e2e78a30fc68d73ebe401c;hpb=dc90594097a886eee49e9bfe45da6d4f9765179a

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index a7ebe5c..a46a50a 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -41,7 +41,7 @@ void Fleet::setName(string sName)
 
 //////////////////////////////////////////////////////////////////////////
 //
-string Fleet::Name()
+string Fleet::Name() const
 {
 	return m_sName;
 }
@@ -52,7 +52,7 @@ string Fleet::Name()
  * s_Races and checks if it finds the race it returns true, if it reaches
  * the end without finding it it returns false.
  */
-bool Fleet::setRace(std::string sRace)
+bool Fleet::setRace(string sRace)
 {
 	m_sRace = sRace;
 	for (map<string, vector<int> >::iterator i = s_Races.begin(); i != s_Races.end(); i++)
@@ -65,7 +65,7 @@ bool Fleet::setRace(std::string sRace)
 
 //////////////////////////////////////////////////////////////////////////
 //
-string Fleet::Race()
+string Fleet::Race() const
 {
 	return m_sRace;
 }
@@ -75,13 +75,13 @@ string Fleet::Race()
 /** This function iterates through m_Fleet and adds all numbers together to
  * produce a total.
  */
-int Fleet::NumberOfShips()
+int Fleet::NumberOfShips() const
 {
 	int total = 0;
 
-	for (map<string, vector<int> >::iterator i = m_Fleet.begin(); i != m_Fleet.end(); i++)
+	for (map<string, vector<int> >::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i)
 	{
-		total += m_Fleet[(*i).first][0];
+		total += i->second[0];
 	}
 
 	return total;
@@ -96,27 +96,27 @@ void Fleet::setETA(int eta)
 
 //////////////////////////////////////////////////////////////////////////
 //
-int  Fleet::ETA()
+int  Fleet::ETA() const
 {
 	return m_iETA;
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Fleet::setRaces(std::map<std::string, std::vector<int> >& races)
+void Fleet::setRaces(map<string, vector<int> >& races)
 {
 	s_Races = races;
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Fleet::setUnits(map<std::string, UnitType>& units)
+void Fleet::setUnits(map<string, UnitType>& units)
 {
 	s_Units = units;
 
 	for (map<string, UnitType >::iterator i = s_Units.begin(); i != s_Units.end(); i++)
 	{
-		cerr << s_Units[(*i).first].Name() << "\t"
+		cerr << s_Units[(*i).first].Name() << "\t\t"
 			<< s_Units[(*i).first].Race() <<"\t"
 			<< s_Units[(*i).first].Class() << "\t"
 			<< s_Units[(*i).first].Target(0) << "\t"
@@ -136,3 +136,19 @@ void Fleet::setUnits(map<std::string, UnitType>& units)
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+const map<string, vector<int> >& Fleet::Races()
+{
+	return s_Races;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+const map<string, UnitType>& Fleet::Units()
+{
+	return s_Units;
+}
+
+
+