Merge branch 'sb'

This commit is contained in:
yugecin 2016-11-13 01:45:18 +01:00
commit fa47399970
3 changed files with 17 additions and 1 deletions

View File

@ -57,6 +57,7 @@ import com.sun.jna.platform.win32.WinReg;
import yugecin.opsudance.*; import yugecin.opsudance.*;
import yugecin.opsudance.movers.factories.AutoMoverFactory; import yugecin.opsudance.movers.factories.AutoMoverFactory;
import yugecin.opsudance.spinners.Spinner; import yugecin.opsudance.spinners.Spinner;
import yugecin.opsudance.ui.SBOverlay;
/** /**
* Handles all user options. * Handles all user options.
@ -1022,6 +1023,20 @@ public class Options {
} }
}, },
DANCE_ENABLE_SB ("Enable storyboard", "EnableStoryBoard", "Dance storyboard", false) {
@Override
public void click(GameContainer container) {
super.click(container);
SBOverlay.isActive = bool;
}
@Override
public void read(String s) {
super.read(s);
SBOverlay.isActive = bool;
}
},
DANCE_HIDE_WATERMARK ("Hide watermark", "HideWaterMark", "Hide the githublink in the top left corner of the playfield", false) { DANCE_HIDE_WATERMARK ("Hide watermark", "HideWaterMark", "Hide the githublink in the top left corner of the playfield", false) {
@Override @Override
public String getValueString() { public String getValueString() {

View File

@ -134,6 +134,7 @@ public class OptionsMenu extends BasicGameState {
GameOption.DANCE_REMOVE_BG, GameOption.DANCE_REMOVE_BG,
GameOption.DANCE_HIDE_OBJECTS, GameOption.DANCE_HIDE_OBJECTS,
GameOption.DANCE_HIDE_UI, GameOption.DANCE_HIDE_UI,
GameOption.DANCE_ENABLE_SB,
GameOption.DANCE_HIDE_WATERMARK, GameOption.DANCE_HIDE_WATERMARK,
}), }),
PIPPI ("Pippi", new GameOption[] { PIPPI ("Pippi", new GameOption[] {

View File

@ -35,7 +35,7 @@ import java.util.Map;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class SBOverlay { public class SBOverlay {
public static boolean isActive = true; public static boolean isActive = false;
private boolean hide; private boolean hide;
private boolean menu; private boolean menu;