archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simspeed: no matter speed, always two animation cycles per sim step

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@614 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-04-29 22:02:29 +00:00
parent d17084261d
commit 9c045da206
4 changed files with 27 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/micropolisj/gui/MainWindow.java
View file

@ -1069,7 +1069,6 @@ public class MainWindow extends JFrame
private void startTimer()
{
final Micropolis engine = getEngine();
final int updateCycle = engine.simSpeed.aniFramesPerStep;
final int count = engine.simSpeed.simStepsPerUpdate;
assert !isTimerActive();
@ -1096,23 +1095,18 @@ public class MainWindow extends JFrame
ActionListener taskPerformer = new ActionListener() {
public void actionPerformed(ActionEvent evt)
{
engine.acycle = (engine.acycle+1) % 960;
if (engine.acycle % updateCycle == 0)
for (int i = 0; i < count; i++)
{
for (int i = 0; i < count; i++)
engine.animate();
if (!engine.autoBudget && engine.isBudgetTime())
{
if (!engine.autoBudget && engine.isBudgetTime())
{
stopTimer(); //redundant
showBudgetWindow(true);
return;
}
engine.step();
dirty2 = true;
stopTimer(); //redundant
showBudgetWindow(true);
return;
}
}
engine.animate();
updateDateLabel();
dirty2 = true;
}};
assert simTimer == null;
@ -1308,11 +1302,6 @@ public class MainWindow extends JFrame
BudgetDialog dlg = new BudgetDialog(this, getEngine());
dlg.setModal(true);
dlg.setVisible(true);
if (isEndOfYear) {
getEngine().step();
}
startTimer();
}