one more evil bug (in th ecapping)

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 1f904f82685ff101d4d392c644a6f269801089c4..e6fbe51c006ccb0e87f773b8b5112be6f0a60e08 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -171,6 +171,11 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 
                map<string, map<string, int> > stealfriendly;
                map<string, map<string, int> > stealhostile;
+
+               //Reset roids
+               for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid)
+                       setRoids(roid->first, roids(roid->first, tick-1), tick);
+               
                
                calcOneTick(&allFriends, &allHostiles, stealfriendly, stealhostile, tick );
 

diff --git a/bs/ui/bsappbase.ui.h b/bs/ui/bsappbase.ui.h
index 03b081c8eeeb79aa0ba438906a3273ca73791dd9..0b3b30a46c20c15fa612e4339f3b52b7b0339248 100644 (file)
--- a/bs/ui/bsappbase.ui.h
+++ b/bs/ui/bsappbase.ui.h
@@ -118,6 +118,7 @@ void BSAppBase::oneTickCheck_toggled( bool b)
        maxTickSpin->setMinValue(0);
        minTickSpin->setDisabled(true);
        minTickSpin->setMaxValue(99);
+       emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value());
     }
     else
     {
@@ -130,6 +131,7 @@ void BSAppBase::oneTickCheck_toggled( bool b)
                maxTickSpin->setMinValue( maxTickSpin->value());
                minTickSpin->setValue(maxTickSpin->value());
        }
+       emit ticksChanged( minTickSpin->value(), maxTickSpin->value());
     }
 }