From 95a38334483d5d0c29a7b19201c3c2b4409adfe0 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 23 Jul 2015 17:29:10 -0400 Subject: [PATCH] v0.3.1: the descending gong sound now only plays when actually descending. --- .../shatteredpixeldungeon/scenes/GameScene.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index ed50016b7..75bb6736e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -260,11 +260,13 @@ public class GameScene extends PixelScene { log.setRect( 0, toolbar.top(), attack.left(), 0 ); add( log ); - if (Dungeon.depth < Statistics.deepestFloor) - GLog.i( TXT_WELCOME_BACK, Dungeon.depth ); - else - GLog.i( TXT_WELCOME, Dungeon.depth ); - Sample.INSTANCE.play( Assets.SND_DESCEND ); + if (Dungeon.depth <= Statistics.deepestFloor) { + GLog.i(TXT_WELCOME_BACK, Dungeon.depth); + } else { + GLog.i(TXT_WELCOME, Dungeon.depth); + Sample.INSTANCE.play(Assets.SND_DESCEND); + } + switch (Dungeon.level.feeling) { case CHASM: GLog.w( TXT_CHASM ); @@ -326,6 +328,7 @@ public class GameScene extends PixelScene { break; default: } + InterlevelScene.mode = InterlevelScene.Mode.CONTINUE; ArrayList dropped = Dungeon.droppedItems.get( Dungeon.depth ); if (dropped != null) {