From d898e29fdbbe745f7ee7b95d4aa9579b769f2e6c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 11 Sep 2017 23:09:47 -0400 Subject: [PATCH] v0.6.2: action indicator now persists between floors (but not games) --- .../shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java | 2 ++ .../shatteredpixeldungeon/ui/ActionIndicator.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java index 8dd169773..abbd701bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java @@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites.Type; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.journal.Journal; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; +import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; @@ -217,6 +218,7 @@ public class StartScene extends PixelScene { add( btnExit ); curClass = null; + ActionIndicator.action = null; updateClass( HeroClass.values()[ShatteredPixelDungeon.lastClass()] ); fadeIn(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java index 789a5cc5a..7adbd09f9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java @@ -45,7 +45,6 @@ public class ActionIndicator extends Tag { public void destroy() { super.destroy(); instance = null; - action = null; } @Override