diff --git a/SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java b/SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java index f278a667a..d7936d646 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java +++ b/SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java @@ -26,6 +26,7 @@ import android.net.Uri; import android.os.Build; import android.util.Log; +import com.watabou.BuildConfig; import com.watabou.noosa.Game; public class DeviceCompat { @@ -46,6 +47,10 @@ public class DeviceCompat { return Build.VERSION.SDK_INT == Build.VERSION_CODES.FROYO; } + public static boolean isDebug(){ + return BuildConfig.DEBUG; + } + public static void openURI( String URI ){ Intent intent = new Intent( Intent.ACTION_VIEW, Uri.parse( URI ) ); Game.instance.startActivity( intent ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index 7a2ce2dd2..b288d0407 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -54,6 +54,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingKn import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingStone; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.utils.Bundle; +import com.watabou.utils.DeviceCompat; public enum HeroClass { @@ -254,7 +255,7 @@ public enum HeroClass { public boolean isUnlocked(){ //always unlock on debug builds - if (BuildConfig.DEBUG) return true; + if (DeviceCompat.isDebug()) return true; switch (this){ case WARRIOR: default: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java index 8a3d74ef0..a67865261 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java @@ -46,6 +46,7 @@ import com.watabou.noosa.NoosaScriptNoLighting; import com.watabou.noosa.RenderedText; import com.watabou.noosa.SkinnedBlock; import com.watabou.noosa.audio.Sample; +import com.watabou.utils.DeviceCompat; import java.io.FileNotFoundException; import java.io.IOException; @@ -138,6 +139,11 @@ public class InterlevelScene extends PixelScene { else if (loadingDepth <= 25) loadingAsset = Assets.LOADING_HALLS; else loadingAsset = Assets.SHADOW; + //speed up transition when debugging + if (DeviceCompat.isDebug()){ + fadeTime /= 2; + } + SkinnedBlock bg = new SkinnedBlock(Camera.main.width, Camera.main.height, loadingAsset ){ @Override protected NoosaScript script() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 5d1910267..6dc932dd7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.BuildConfig; import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; @@ -127,7 +126,7 @@ public class TitleScene extends PixelScene { @Override protected boolean onLongClick() { //making it easier to start runs quickly while debugging - if (BuildConfig.DEBUG) { + if (DeviceCompat.isDebug()) { TitleScene.this.add( new WndStartGame(1) ); return true; }