some modifications

diff --git a/bs/bsconf.cpp b/bs/bsconf.cpp
index 1ee7da5ca02c4f65ca7d02aa24a6c3d51fd8710b..97e3c7ccd4ba1c709d1eda4353e0daf52dc4ff9b 100644 (file)
--- a/bs/bsconf.cpp
+++ b/bs/bsconf.cpp
@@ -62,7 +62,7 @@ bool BSConf::save()
 //
 bool BSConf::loadStats()
 {
-       std::map<std::string, UnitType> units;
+       UnitList units;
        QFile f(m_sStatsFilename);
 
        if ( f.open(IO_ReadOnly) )

diff --git a/bs/bsdoc.cpp b/bs/bsdoc.cpp
index c65903bc728a5644013f85cd464d275bef764c22..1c6e60bf24f4f31cfe50e29bbb66e983ecc77ba8 100644 (file)
--- a/bs/bsdoc.cpp
+++ b/bs/bsdoc.cpp
@@ -97,6 +97,7 @@ Fleet BSDoc::specificFleet(QString battle, QString group, QString fleet) const
                        }
                }
        }
+       return Fleet();
 }
 
 

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 117ce39cb74e61b5b7e233cdc8db991f5b85b622..f086833c0b3266e9f7fa02ff5c2353cc281f5db6 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 //Static variables
 map<string, vector<int> > Fleet::s_Races;
-map<string, UnitType > Fleet::s_Units;
+UnitList Fleet::s_Units;
 
 Fleet::Fleet()
 {
@@ -110,11 +110,11 @@ void Fleet::setRaces(map<string, vector<int> >& races)
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Fleet::setUnits(map<string, UnitType>& units)
+void Fleet::setUnits(UnitList& units)
 {
        s_Units = units;
 
-       for (map<string, UnitType >::iterator i = s_Units.begin(); i != s_Units.end(); i++)
+       for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); i++)
        {
                cerr << s_Units[(*i).first].Name() << "\t\t"
                        << s_Units[(*i).first].Race() <<"\t"
@@ -145,7 +145,7 @@ const map<string, vector<int> >& Fleet::Races()
 
 //////////////////////////////////////////////////////////////////////////
 //
-const map<string, UnitType>& Fleet::Units()
+const UnitList& Fleet::Units()
 {
        return s_Units;
 }

diff --git a/bs/fleet.h b/bs/fleet.h
index 047fc131844588dc03c3f2b97ec56073f1abb5e7..ca2fddfdc616dde9be124c5932b1c6e77c559df2 100644 (file)
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -19,11 +19,14 @@
 #define FLEET_H
 
 #include <map>
+#include <ext/hash_map>
 #include <string>
 #include <vector>
 
 #include "unittype.h"
+ template<typename T> class MyComp { public: bool operator()(T,T) { return false; } };
 
+typedef std::map<std::string, UnitType>        UnitList;
 //!This is the engine for the whole battlesystem.
 /**This is the engine for the whole battlesystem.
   *    One of the few parts that I plan make fully portable.
@@ -76,10 +79,10 @@ public:
        int  ETA() const;
 
        static void setRaces(std::map<std::string, std::vector<int> >& races);
-       static void setUnits(std::map<std::string, UnitType>& units);
+       static void setUnits(UnitList& units);
 
        static const std::map<std::string, std::vector<int> >& Races();
-       static const std::map<std::string, UnitType>& Units();
+       static const UnitList& Units();
 
 protected:
        std::string     m_sName;
@@ -87,7 +90,7 @@ protected:
        int         m_iETA;
        std::map<std::string, std::vector<int> >        m_Fleet;
 
-       static std::map<std::string, UnitType>  s_Units;
+       static UnitList s_Units;
        static std::map<std::string, std::vector<int> > s_Races;
 };