adding, removing and chaning fleets now works.

[hbs.git] / bs / planet.cpp

diff --git a/bs/planet.cpp b/bs/planet.cpp
index e0cf514e0c45d7b6054afbaae1c3b3ebc99342a9..81d7daa4f09e66438844be23bc52d6b3f5e65200 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -48,7 +48,7 @@ int Planet::roids(std::string type, int tick = 0) const
 {
        // const... I would like [] as for const types: int ticks = m_Roids[type].size();
        
-       vector<int>const* roids;
+       vector<int>const* roids = 0;
        for (RoidList::const_iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
        {
                if (i->first == type)
@@ -57,6 +57,8 @@ int Planet::roids(std::string type, int tick = 0) const
                        break;
                }
        }
+       if (roids == 0)
+               return 0;
 
        int ticks = roids->size();
 
@@ -76,4 +78,9 @@ void Planet::setRoids(std::string type, int number)
        m_Roids[type][0] = number;
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile)
+{
+}