From 2c69407d47e76e369857e995cafba6d41a6b2650 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sat, 23 Mar 2013 15:46:05 +0000 Subject: [PATCH] CityBudget: do not change funds when generating a map initial funds are now set when player clicks Play button git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@602 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MapGenerator.java | 2 -- src/micropolisj/engine/Micropolis.java | 5 +++++ src/micropolisj/gui/NewCityDialog.java | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/micropolisj/engine/MapGenerator.java b/src/micropolisj/engine/MapGenerator.java index 063f9c2..e5351dc 100644 --- a/src/micropolisj/engine/MapGenerator.java +++ b/src/micropolisj/engine/MapGenerator.java @@ -60,8 +60,6 @@ public class MapGenerator public void generateSomeCity(long r) { - //FIXME- initial funds should be set by caller - engine.budget.totalFunds = GameLevel.getStartingFunds(engine.gameLevel); generateMap(r); engine.fireWholeMapChanged(); } diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java index ff38e1d..6a7d0af 100644 --- a/src/micropolisj/engine/Micropolis.java +++ b/src/micropolisj/engine/Micropolis.java @@ -2613,4 +2613,9 @@ public class Micropolis spend(delta); } } + + public void setFunds(int totalFunds) + { + budget.totalFunds = totalFunds; + } } diff --git a/src/micropolisj/gui/NewCityDialog.java b/src/micropolisj/gui/NewCityDialog.java index e731650..ad3ae7d 100644 --- a/src/micropolisj/gui/NewCityDialog.java +++ b/src/micropolisj/gui/NewCityDialog.java @@ -192,6 +192,7 @@ public class NewCityDialog extends JDialog private void onPlayClicked() { engine.setGameLevel(getSelectedGameLevel()); + engine.setFunds(GameLevel.getStartingFunds(engine.gameLevel)); startPlaying(engine, null); }