From a489ee24d623c1471f173a8a5de610a00be2935f Mon Sep 17 00:00:00 2001 From: yugecin Date: Sat, 21 Jan 2017 15:18:04 +0100 Subject: [PATCH] shortcut to reload skin --- src/itdelatrisu/opsu/Options.java | 10 +++++++--- src/yugecin/opsudance/core/state/BaseOpsuState.java | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index c3733612..d44564c6 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -377,9 +377,7 @@ public class Options { @Override public void clickListItem(int index) { skinName = skinDirs[index]; - loadSkin(); - SoundController.init(); - EventBus.instance.post(new ResolutionChangedEvent(DisplayContainer.instance.width, DisplayContainer.instance.height)); + reloadSkin(); } @Override @@ -1872,6 +1870,12 @@ public class Options { return skinRootDir; } + public static void reloadSkin() { + loadSkin(); + SoundController.init(); + EventBus.instance.post(new ResolutionChangedEvent(DisplayContainer.instance.width, DisplayContainer.instance.height)); + } + /** * Loads the skin given by the current skin directory. * If the directory is invalid, the default skin will be loaded. diff --git a/src/yugecin/opsudance/core/state/BaseOpsuState.java b/src/yugecin/opsudance/core/state/BaseOpsuState.java index 86bdfb9c..1820fdd7 100644 --- a/src/yugecin/opsudance/core/state/BaseOpsuState.java +++ b/src/yugecin/opsudance/core/state/BaseOpsuState.java @@ -19,6 +19,7 @@ package yugecin.opsudance.core.state; import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Utils; +import itdelatrisu.opsu.states.Game; import org.newdawn.slick.Graphics; import org.newdawn.slick.Input; import yugecin.opsudance.core.DisplayContainer; @@ -104,6 +105,10 @@ public abstract class BaseOpsuState implements OpsuState, EventListener