X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fplanet.h;h=e5c173e0cda880cf44b39c4e9134dcc6ddcbb39a;hb=f96bf3d395f79ce76f36b0f7003ca4e743b6019f;hp=5e2b13a40f6e6fc53a3427fa0d55b73ef188b643;hpb=595e711e719a6e6b675b1f40e3e141cd9b770fd9;p=hbs.git

diff --git a/bs/planet.h b/bs/planet.h
index 5e2b13a..e5c173e 100644
--- 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
   */
 
@@ -40,9 +43,14 @@ public:
 	void setPlanetScore(unsigned i);
 
 	int roids(std::string type, int tick = 0) const;
-	void setRoids(std::string type, int number);
+	void setRoids(std::string type, int number, int tick = 0);
+	void takeRoids(std::string type, int number, int tick = 0);
+
+	void runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile);
 
 protected:
+	void calcOneTick(Planet* friendly, Fleet* Hostile, std::map<std::string, std::map<std::string, int> >& stealfriendly, std::map<std::string, std::map<std::string, int> >&  stealhostile, int tick = 0);
+
 	unsigned m_iScore;
 	RoidList m_Roids;