diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index e04b03029..0df37f796 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -203,7 +203,6 @@ public class ShatteredPixelDungeon extends Game { public static void scale( int value ) { Preferences.INSTANCE.put( Preferences.KEY_SCALE, value ); - resetScene(); } // *** IMMERSIVE MODE **** diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/OptionSlider.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/OptionSlider.java index af37d516d..053e0bdf4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/OptionSlider.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/OptionSlider.java @@ -63,7 +63,11 @@ public abstract class OptionSlider extends Component { this.minVal = minVal; this.maxVal = maxVal; - if (minVal > maxVal) throw new IllegalArgumentException(); + //really shouldn't display the slider if this happens. + if (minVal > maxVal){ + active = false; + visible = false; + } sliderTicks = new ColorBlock[(maxVal - minVal) + 1]; for (int i = 0; i < sliderTicks.length; i++){ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/WndDisplay.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/WndDisplay.java index 6e72a9694..18b95090e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/WndDisplay.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/WndDisplay.java @@ -46,6 +46,7 @@ public class WndDisplay extends Window { @Override protected void onChange() { ShatteredPixelDungeon.scale(getSelectedValue()); + ShatteredPixelDungeon.resetScene(); } }; scale.setSelectedValue(PixelScene.defaultZoom); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java index 4eb63c1dd..9a7451367 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java @@ -36,8 +36,6 @@ public class WndSettings extends Window { private static final int BTN_HEIGHT = 20; private static final int GAP = 2; - private int setScale = PixelScene.defaultZoom; - public WndSettings() { super(); @@ -77,13 +75,4 @@ public class WndSettings extends Window { private String orientationText() { return ShatteredPixelDungeon.landscape() ? TXT_SWITCH_PORT : TXT_SWITCH_LAND; } - - @Override - public void hide() { - super.hide(); - if (setScale != PixelScene.defaultZoom) { - ShatteredPixelDungeon.scale(setScale); - ShatteredPixelDungeon.switchScene(TitleScene.class); - } - } }