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

v1.3.0: fixed crash bugs with InterlevelScene

Browse Source
This commit is contained in:
Evan Debenham
2022-07-05 11:14:36 -04:00
parent dba3c7d49d
commit f106cf41a2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
+5 -3
View File
@@ -126,8 +126,9 @@ public class InterlevelScene extends PixelScene {
loadingDepth = 1; loadingDepth = 1;
fadeTime = SLOW_FADE; fadeTime = SLOW_FADE;
} else { } else {
loadingDepth = curTransition.destDepth; if (curTransition != null) loadingDepth = curTransition.destDepth;
if (!(Statistics.deepestFloor < loadingDepth)) { else loadingDepth = Dungeon.depth+1;
if (Statistics.deepestFloor >= loadingDepth) {
fadeTime = FAST_FADE; fadeTime = FAST_FADE;
} else if (loadingDepth == 6 || loadingDepth == 11 } else if (loadingDepth == 6 || loadingDepth == 11
|| loadingDepth == 16 || loadingDepth == 21) { || loadingDepth == 16 || loadingDepth == 21) {
@@ -142,7 +143,8 @@ public class InterlevelScene extends PixelScene {
break; break;
case ASCEND: case ASCEND:
fadeTime = FAST_FADE; fadeTime = FAST_FADE;
loadingDepth = curTransition.destDepth; if (curTransition != null) loadingDepth = curTransition.destDepth;
else loadingDepth = Dungeon.depth-1;
scrollSpeed = -5; scrollSpeed = -5;
break; break;
case RETURN: case RETURN: