From 504b692b4d9457f3be2318fad711e392a7cbc25b Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 24 Jun 2022 11:03:03 -0400 Subject: [PATCH] v1.3.0: fixed Dungeon.daily not being properly set in many cases --- .../shatteredpixeldungeon/scenes/HeroSelectScene.java | 1 + .../shatteredpixeldungeon/windows/WndGameInProgress.java | 1 + .../shatteredpixeldungeon/windows/WndStartGame.java | 1 + 3 files changed, 3 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java index 4b82a3475..d1dcbeafc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java @@ -121,6 +121,7 @@ public class HeroSelectScene extends PixelScene { if (GamesInProgress.selectedClass == null) return; Dungeon.hero = null; + Dungeon.daily = false; ActionIndicator.action = null; InterlevelScene.mode = InterlevelScene.Mode.DESCEND; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java index a7fb0a366..7b4a65fec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java @@ -121,6 +121,7 @@ public class WndGameInProgress extends Window { GamesInProgress.curSlot = slot; Dungeon.hero = null; + Dungeon.daily = false; ActionIndicator.action = null; InterlevelScene.mode = InterlevelScene.Mode.CONTINUE; ShatteredPixelDungeon.switchScene(InterlevelScene.class); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java index 79f928e72..e41854788 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStartGame.java @@ -94,6 +94,7 @@ public class WndStartGame extends Window { GamesInProgress.curSlot = slot; Dungeon.hero = null; + Dungeon.daily = false; ActionIndicator.action = null; InterlevelScene.mode = InterlevelScene.Mode.DESCEND;