From 0255ae074411a15d9ae17dcb9a42bd5ca6ff84fc Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sun, 17 Feb 2013 20:58:31 +0000 Subject: [PATCH] cleanup: remove duplicate definitions of min/max game level i.e. removed Micropolis.MIN_LEVEL and Micropolis.MAX_LEVEL as it was superceded by GameLevel.MIN_LEVEL and GameLevel.MAX_LEVEL git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@540 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/Micropolis.java | 2 -- src/micropolisj/gui/MainWindow.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java index df39cd1..825bf27 100644 --- a/src/micropolisj/engine/Micropolis.java +++ b/src/micropolisj/engine/Micropolis.java @@ -100,8 +100,6 @@ public class Micropolis public Speed simSpeed = Speed.NORMAL; public boolean noDisasters = false; - public static final int MIN_LEVEL = 0; - public static final int MAX_LEVEL = 2; public int gameLevel; boolean autoGo; diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java index 39dde93..4d74d34 100644 --- a/src/micropolisj/gui/MainWindow.java +++ b/src/micropolisj/gui/MainWindow.java @@ -1244,7 +1244,7 @@ public class MainWindow extends JFrame { priorityMenuItems.get(spd).setSelected(getEngine().simSpeed == spd); } - for (int i = Micropolis.MIN_LEVEL; i <= Micropolis.MAX_LEVEL; i++) + for (int i = GameLevel.MIN_LEVEL; i <= GameLevel.MAX_LEVEL; i++) { difficultyMenuItems.get(i).setSelected(getEngine().gameLevel == i); }