Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shortcut to reload skin

Browse Source
This commit is contained in:
yugecin 2017-01-21 15:18:04 +01:00
parent 6c461fa645
commit a489ee24d6
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/itdelatrisu/opsu/Options.java
View File

@ -377,9 +377,7 @@ public class Options {
@Override @Override
public void clickListItem(int index) { public void clickListItem(int index) {
skinName = skinDirs[index]; skinName = skinDirs[index];
loadSkin(); reloadSkin();
SoundController.init();
EventBus.instance.post(new ResolutionChangedEvent(DisplayContainer.instance.width, DisplayContainer.instance.height));
} }
@Override @Override
@ -1872,6 +1870,12 @@ public class Options {
return skinRootDir; 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. * Loads the skin given by the current skin directory.
* If the directory is invalid, the default skin will be loaded. * If the directory is invalid, the default skin will be loaded.

5
src/yugecin/opsudance/core/state/BaseOpsuState.java
View File

@ -19,6 +19,7 @@ package yugecin.opsudance.core.state;
import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.Utils; import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.states.Game;
import org.newdawn.slick.Graphics; import org.newdawn.slick.Graphics;
import org.newdawn.slick.Input; import org.newdawn.slick.Input;
import yugecin.opsudance.core.DisplayContainer; import yugecin.opsudance.core.DisplayContainer;
@ -104,6 +105,10 @@ public abstract class BaseOpsuState implements OpsuState, EventListener<Resoluti
Utils.takeScreenShot(); Utils.takeScreenShot();
return true; return true;
} }
Input input = displayContainer.input;
if (key == Input.KEY_S && input.isKeyDown(Input.KEY_LMENU) && input.isKeyDown(Input.KEY_LSHIFT) &&input.isKeyDown(Input.KEY_LCONTROL) && !displayContainer.isInState(Game.class)) {
Options.reloadSkin();
}
return false; return false;
} }