some changes

diff --git a/bs/fleet.h b/bs/fleet.h
index b90b15ef0549b96d6b7f6bd6f7e51eec797d956b..9a0995a23127e7d2f359580309f1c791245285f7 100644 (file)
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -85,7 +85,7 @@ public:
         * \param tick tells the function what tick you want the score from. 0 is 
         * initial score before the fleet has landed.
         */
-       virtual unsigned score(int tick = 0) const;
+       unsigned score(int tick = 0) const;
 
        void setFleet(std::string unittype, int number);
        int      fleet(std::string unittype, int tick = 0);

diff --git a/bs/planet.cpp b/bs/planet.cpp
index e8954e16e32700fcff56cdcd50c6c168c21bfeb0..4fa69786a009e426ae8dd666724965d3aa89465c 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -26,12 +26,39 @@ Planet::Planet()
 Planet::~Planet(){
 }
 
-unsigned Planet::score(int tick = 0)
+//////////////////////////////////////////////////////////////////////////
+//
+unsigned Planet::planetScore() const
 {
        return m_iScore;
 }
 
-void Planet::setScore(unsigned i)
+//////////////////////////////////////////////////////////////////////////
+//
+void Planet::setPlanetScore(unsigned i)
 {
        m_iScore = i;
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+int roids(std::string type, int tick = 0) const
+{
+       ticks = m_Roids[type].size();
+       if( ticks == 0)
+               return 0;
+       if (ticks < tick)
+               return m_Roids[type][ticks];
+       return m_Roids[type][tick];
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void setRoids(std::string type, int number)
+{
+       if (m_Roids[type].size() == 0)
+               m_Roids.push_back(number);
+       m_Roids[type][0] = number;
+}
+
+

diff --git a/bs/planet.h b/bs/planet.h
index ccb2ee40f4b5bb7a18ff3ac38bd5699be8680a0b..5e2b13a40f6e6fc53a3427fa0d55b73ef188b643 100644 (file)
--- a/bs/planet.h
+++ b/bs/planet.h
@@ -36,8 +36,11 @@ public:
        Planet();
        virtual ~Planet();
 
-       unsigned score(int tick = 0);
-       void setScore(unsigned i);
+       unsigned planetScore() const;
+       void setPlanetScore(unsigned i);
+
+       int roids(std::string type, int tick = 0) const;
+       void setRoids(std::string type, int number);
 
 protected:
        unsigned m_iScore;

diff --git a/bs/ui/roidseditview.ui b/bs/ui/roidseditview.ui
index 5e7afcd30f77940ae313b3ca55f66b9bc0b397fc..cc4857985b12bba5f217833e24857ebfc88ee42b 100644 (file)
--- a/bs/ui/roidseditview.ui
+++ b/bs/ui/roidseditview.ui
@@ -9,7 +9,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>227</width>
+            <width>236</width>
             <height>115</height>
         </rect>
     </property>
@@ -45,12 +45,12 @@
         </widget>
         <widget class="QLineEdit" row="1" column="3">
             <property name="name">
-                <cstring>LineEdit31</cstring>
+                <cstring>EoniumEdit</cstring>
             </property>
         </widget>
         <widget class="QLineEdit" row="1" column="4">
             <property name="name">
-                <cstring>LineEdit32</cstring>
+                <cstring>UninitEdit</cstring>
             </property>
         </widget>
         <widget class="QLabel" row="0" column="2">
@@ -63,12 +63,12 @@
         </widget>
         <widget class="QLineEdit" row="1" column="1">
             <property name="name">
-                <cstring>LineEdit26</cstring>
+                <cstring>MetalEdit</cstring>
             </property>
         </widget>
         <widget class="QLineEdit" row="2" column="1">
             <property name="name">
-                <cstring>LineEdit27</cstring>
+                <cstring>MetalLostEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -95,12 +95,12 @@
         </widget>
         <widget class="QLineEdit" row="1" column="2">
             <property name="name">
-                <cstring>LineEdit29</cstring>
+                <cstring>CrystalEdit</cstring>
             </property>
         </widget>
         <widget class="QLineEdit" row="2" column="2">
             <property name="name">
-                <cstring>LineEdit28</cstring>
+                <cstring>CrystalLostEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -119,7 +119,7 @@
         </widget>
         <widget class="QLineEdit" row="2" column="3">
             <property name="name">
-                <cstring>LineEdit30</cstring>
+                <cstring>EoniumLostEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -130,7 +130,7 @@
         </widget>
         <widget class="QLineEdit" row="2" column="4">
             <property name="name">
-                <cstring>LineEdit33</cstring>
+                <cstring>UninitLostEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -166,14 +166,17 @@
     </grid>
 </widget>
 <tabstops>
-    <tabstop>LineEdit26</tabstop>
-    <tabstop>LineEdit29</tabstop>
-    <tabstop>LineEdit31</tabstop>
-    <tabstop>LineEdit32</tabstop>
+    <tabstop>MetalEdit</tabstop>
+    <tabstop>CrystalEdit</tabstop>
+    <tabstop>EoniumEdit</tabstop>
+    <tabstop>UninitEdit</tabstop>
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">roidseditview.ui.h</include>
 </includes>
+<signals>
+    <signal>changed(const QString&amp;, int)</signal>
+</signals>
 <pixmapinproject/>
 <layoutdefaults spacing="0" margin="2"/>
 </UI>