diff --git a/core/src/main/assets/messages/windows/windows.properties b/core/src/main/assets/messages/windows/windows.properties index 934c7156..f085eafe 100644 --- a/core/src/main/assets/messages/windows/windows.properties +++ b/core/src/main/assets/messages/windows/windows.properties @@ -218,7 +218,7 @@ windows.wndsettings$displaytab.dark=Dark windows.wndsettings$displaytab.bright=Bright windows.wndsettings$displaytab.visual_grid=Visual Grid windows.wndsettings$displaytab.cutscenes=Rewatch Cutscenes -windows.wndsettings$displaytab.fast=Fast interlevel scene +windows.wndsettings$displaytab.fast=Faster transitions windows.wndsettings$displaytab.off=Off windows.wndsettings$displaytab.high=High windows.wndsettings$displaytab.particles=Particles diff --git a/core/src/main/java/com/shatteredpixel/yasd/general/CPDSettings.java b/core/src/main/java/com/shatteredpixel/yasd/general/CPDSettings.java index e299783d..bd8dde97 100644 --- a/core/src/main/java/com/shatteredpixel/yasd/general/CPDSettings.java +++ b/core/src/main/java/com/shatteredpixel/yasd/general/CPDSettings.java @@ -159,11 +159,11 @@ public static boolean watchedCutscene(String sceneID) { return getBoolean(Messages.format(KEY_CUTSCENE, sceneID), false ); } - public static void fastInterlevelScene( boolean value ){ + public static void fasterLoading(boolean value ){ put( KEY_FAST_INTERLEVEL_SCENE, value ); } - public static boolean fastInterlevelScene() { + public static boolean fasterLoading() { return getBoolean( KEY_FAST_INTERLEVEL_SCENE, false ); } diff --git a/core/src/main/java/com/shatteredpixel/yasd/general/LevelHandler.java b/core/src/main/java/com/shatteredpixel/yasd/general/LevelHandler.java index 3a7301cd..d9da9d49 100644 --- a/core/src/main/java/com/shatteredpixel/yasd/general/LevelHandler.java +++ b/core/src/main/java/com/shatteredpixel/yasd/general/LevelHandler.java @@ -212,7 +212,7 @@ public static void doRestore() { public void call() { CPDGame.switchScene(GameScene.class); } - }, getThread(), CPDSettings.fastInterlevelScene(), false); + }, getThread(), CPDSettings.fasterLoading(), false); } public static void doInit() { @@ -234,7 +234,7 @@ public void run() { throw new RuntimeException(e); } } - }, CPDSettings.fastInterlevelScene(), false); + }, CPDSettings.fasterLoading(), false); } public static void move(String key, String msg, Mode mode, int depth, int pos) { @@ -247,7 +247,7 @@ public static void move(String key, String msg, Mode mode, int depth, int pos) { public void call() { CPDGame.switchScene(GameScene.class); } - }, getThread(), CPDSettings.fastInterlevelScene(), false); + }, getThread(), CPDSettings.fasterLoading(), false); } public static void resetMode() { diff --git a/core/src/main/java/com/shatteredpixel/yasd/general/scenes/PixelScene.java b/core/src/main/java/com/shatteredpixel/yasd/general/scenes/PixelScene.java index cf574cb5..c937ff41 100644 --- a/core/src/main/java/com/shatteredpixel/yasd/general/scenes/PixelScene.java +++ b/core/src/main/java/com/shatteredpixel/yasd/general/scenes/PixelScene.java @@ -225,7 +225,9 @@ protected void fadeIn( int color, boolean light, float time ) { } protected void fadeIn( int color, boolean light ) { - fadeIn(color, light, DEFAULT_FADE_TIME); + float fadeTime = DEFAULT_FADE_TIME; + if (CPDSettings.fasterLoading()) fadeTime /=3; + fadeIn(color, light, fadeTime); } public static void showBadge( Badges.Badge badge ) { diff --git a/core/src/main/java/com/shatteredpixel/yasd/general/windows/WndSettings.java b/core/src/main/java/com/shatteredpixel/yasd/general/windows/WndSettings.java index 8f249e81..2d75198e 100644 --- a/core/src/main/java/com/shatteredpixel/yasd/general/windows/WndSettings.java +++ b/core/src/main/java/com/shatteredpixel/yasd/general/windows/WndSettings.java @@ -236,7 +236,7 @@ private static class DisplayTab extends Component { OptionSlider optBrightness; OptionSlider optVisGrid; CheckBox chkCutscenes; - CheckBox chkInterlevelScene; + CheckBox chkFastLoad; OptionSlider particles; @Override @@ -341,15 +341,15 @@ protected void onClick() { chkCutscenes.checked(CPDSettings.cutscenes()); add(chkCutscenes); - chkInterlevelScene = new CheckBox( Messages.get(this, "fast") ) { + chkFastLoad = new CheckBox( Messages.get(this, "fast") ) { @Override protected void onClick() { super.onClick(); - CPDSettings.fastInterlevelScene(checked()); + CPDSettings.fasterLoading(checked()); } }; - chkInterlevelScene.checked(CPDSettings.fastInterlevelScene()); - add(chkInterlevelScene); + chkFastLoad.checked(CPDSettings.fasterLoading()); + add(chkFastLoad); particles = new OptionSlider(Messages.get(this, "particles"), "1", "6", 1, 6) { @Override @@ -409,13 +409,13 @@ protected void layout() { if (width > 200){ chkCutscenes.setRect(0, bottom + GAP, width/2-GAP/2, SLIDER_HEIGHT); - chkInterlevelScene.setRect(chkCutscenes.right() + GAP, chkCutscenes.top(), width/2-GAP/2, SLIDER_HEIGHT); + chkFastLoad.setRect(chkCutscenes.right() + GAP, chkCutscenes.top(), width/2-GAP/2, SLIDER_HEIGHT); } else { chkCutscenes.setRect(0, bottom + GAP, width, SLIDER_HEIGHT); - chkInterlevelScene.setRect(0, chkCutscenes.bottom() + GAP, width, SLIDER_HEIGHT); + chkFastLoad.setRect(0, chkCutscenes.bottom() + GAP, width, SLIDER_HEIGHT); } - bottom = chkInterlevelScene.bottom() + 1; + bottom = chkFastLoad.bottom() + 1; particles.setRect(0, bottom, width, SLIDER_HEIGHT); height = particles.bottom();