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

Merging 1.9.1 source: scene changes

Browse Source
This commit is contained in:
Evan Debenham
2015-11-10 00:48:02 -05:00
parent c36f6d4bcf
commit 46a0f2b319
4 changed files with 116 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
+6 -2
View File
@@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.ui.GameLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndError;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndStory;
import com.watabou.noosa.BitmapText;
@@ -56,7 +57,7 @@ public class InterlevelScene extends PixelScene {
"it may mean this save game is corrupted. Sorry about that.";
public static enum Mode {
DESCEND, ASCEND, CONTINUE, RESURRECT, RETURN, FALL, RESET
DESCEND, ASCEND, CONTINUE, RESURRECT, RETURN, FALL, RESET, NONE
};
public static Mode mode;
@@ -227,6 +228,7 @@ public class InterlevelScene extends PixelScene {
Dungeon.chapters.add( WndStory.ID_SEWERS );
noStory = false;
}
GameLog.wipe();
} else {
Dungeon.saveLevel();
}
@@ -278,7 +280,9 @@ public class InterlevelScene extends PixelScene {
private void restore() throws IOException {
Actor.fixTime();
GameLog.wipe();
Dungeon.loadGame( StartScene.curClass );
if (Dungeon.depth == -1) {
Dungeon.depth = Statistics.deepestFloor;