moving the tick changing to the toolbar instead of CTickView. adding a combobox to...

[hbs.git] / bs / planet.h

diff --git a/bs/planet.h b/bs/planet.h
index c729ebf6d634e781ac76467d1d416e389f6d6dba..486bd60f50191fe185af5e34132bf51ab34e5b63 100644 (file)
--- a/bs/planet.h
+++ b/bs/planet.h
@@ -43,13 +43,19 @@ public:
         * \returns the score as an unsigned int. 
         * \todo add a param to specify what tick to use.
         */
-       unsigned planetScore() const;
+       unsigned planetScore(int tick = 0) const;
 
        /** Sets the score for the current fleet. 
         * \param score this param is a unsigned int holding the score
         * \todo add a param to specify what tick to use.
         */
-       void setPlanetScore(unsigned score);
+       void setPlanetScore(unsigned score, int tick = 0);
+
+       /** Adds score to the current fleet. 
+        * \param score this param is a unsigned int holding the score
+        * \todo add a param to specify what tick to use.
+        */
+       void addPlanetScore(unsigned score, int tick = 0);
 
        /** This function is used to get the number of roids of a specific type.
         * \param type the for this roid (for pa: metal, crystal, eonium, uninit)
@@ -79,6 +85,8 @@ public:
         */
        void runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile);
 
+       void calculateScoreLoss(std::vector<Fleet*> friendly, int tick = 1);
+
 protected:
        /** This function is used to start the calculations of a single tick of the
         * battle on the current planet. It's protected because it's not really meant
@@ -92,7 +100,7 @@ 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;
+       std::vector <unsigned> m_Score;
        RoidList m_Roids;
        
 };