konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.7.0: fixed the action indicator being preserved in rare cases

Browse Source
This commit is contained in:
Evan Debenham
2018-06-17 02:18:20 -04:00
parent fb21ae70a3
commit 37b02d8baf
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java
-2
View File
@@ -29,7 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.journal.Journal; import com.shatteredpixel.shatteredpixeldungeon.journal.Journal;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs;
import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton; import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
@@ -106,7 +105,6 @@ public class StartScene extends PixelScene {
} }
GamesInProgress.curSlot = 0; GamesInProgress.curSlot = 0;
ActionIndicator.action = null;
fadeIn(); fadeIn();
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java
+2
View File
@@ -31,6 +31,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.StartScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.StartScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window; import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
@@ -105,6 +106,7 @@ public class WndGameInProgress extends Window {
GamesInProgress.curSlot = slot; GamesInProgress.curSlot = slot;
Dungeon.hero = null; Dungeon.hero = null;
ActionIndicator.action = null;
InterlevelScene.mode = InterlevelScene.Mode.CONTINUE; InterlevelScene.mode = InterlevelScene.Mode.CONTINUE;
ShatteredPixelDungeon.switchScene(InterlevelScene.class); ShatteredPixelDungeon.switchScene(InterlevelScene.class);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java
+2
View File
@@ -36,6 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.IntroScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.IconButton; import com.shatteredpixel.shatteredpixeldungeon.ui.IconButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
@@ -92,6 +93,7 @@ public class WndStartGame extends Window {
GamesInProgress.curSlot = slot; GamesInProgress.curSlot = slot;
Dungeon.hero = null; Dungeon.hero = null;
ActionIndicator.action = null;
InterlevelScene.mode = InterlevelScene.Mode.DESCEND; InterlevelScene.mode = InterlevelScene.Mode.DESCEND;
if (SPDSettings.intro()) { if (SPDSettings.intro()) {