From 2b4577e1d38d07265e2e7a56a115d892255b6c75 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Thu, 18 Apr 2002 23:25:28 +0000
Subject: [PATCH] one more evil bug (in th ecapping)

---
 bs/planet.cpp        | 5 +++++
 bs/ui/bsappbase.ui.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 1f904f8..e6fbe51 100644
--- 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 03b081c..0b3b30a 100644
--- 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());
     }
 }
 
-- 
2.39.2