The work on the combat algorithm is going forward, nothing worth compiling yet though.

[hbs.git] / bs / planet.h

diff --git a/bs/planet.h b/bs/planet.h
index 5e2b13a40f6e6fc53a3427fa0d55b73ef188b643..a19a858c0e032ad4654a8939adf9f9dbd9b752fb 100644 (file)
--- a/bs/planet.h
+++ b/bs/planet.h
@@ -20,7 +20,7 @@
 
 #include "fleet.h"
 
-typedef std::map<std::string, int> RoidList;
+typedef std::map<std::string, std::vector<int> > RoidList;
 
 /**This class is the implementation of a planet.
  *
@@ -28,6 +28,9 @@ typedef std::map<std::string, int> RoidList;
  * real life, it's a game engine, and in this engine a planet got all the 
  * attributes that a fleet got + some additions, so I think the inheritance
  * is fully legal from a OOP standpoint. If it isn't, then please correct me ;)
+ *
+ * This class is doing the actual battle simulation (since battles without 
+ * planets aren't available in this game).
   *@author Michael Andreen
   */
 
@@ -42,7 +45,11 @@ public:
        int roids(std::string type, int tick = 0) const;
        void setRoids(std::string type, int number);
 
+       void runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile);
+
 protected:
+       void calcOneTick(Planet* friendly, Fleet* Hostile);
+
        unsigned m_iScore;
        RoidList m_Roids;