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

v2.5.0: fixed incorrect use of the shadowbox asset in interlevelscene

Browse Source
This commit is contained in:
Evan Debenham
2024-07-03 21:38:14 -04:00
parent 4071a47a56
commit 37ec66254b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
+4 -4
View File
@@ -39,7 +39,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.SpecialRoom
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.ui.GameLog; import com.shatteredpixel.shatteredpixeldungeon.ui.GameLog;
import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock;
import com.watabou.utils.BArray;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndError; import com.shatteredpixel.shatteredpixeldungeon.windows.WndError;
import com.watabou.gltextures.TextureCache; import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Blending; import com.watabou.glwrap.Blending;
@@ -49,6 +48,7 @@ import com.watabou.noosa.Image;
import com.watabou.noosa.NoosaScript; import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.NoosaScriptNoLighting; import com.watabou.noosa.NoosaScriptNoLighting;
import com.watabou.noosa.SkinnedBlock; import com.watabou.noosa.SkinnedBlock;
import com.watabou.utils.BArray;
import com.watabou.utils.DeviceCompat; import com.watabou.utils.DeviceCompat;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@@ -156,8 +156,7 @@ public class InterlevelScene extends PixelScene {
else if (lastRegion == 2) loadingAsset = Assets.Interfaces.LOADING_PRISON; else if (lastRegion == 2) loadingAsset = Assets.Interfaces.LOADING_PRISON;
else if (lastRegion == 3) loadingAsset = Assets.Interfaces.LOADING_CAVES; else if (lastRegion == 3) loadingAsset = Assets.Interfaces.LOADING_CAVES;
else if (lastRegion == 4) loadingAsset = Assets.Interfaces.LOADING_CITY; else if (lastRegion == 4) loadingAsset = Assets.Interfaces.LOADING_CITY;
else if (lastRegion == 5) loadingAsset = Assets.Interfaces.LOADING_HALLS; else loadingAsset = Assets.Interfaces.LOADING_HALLS;
else loadingAsset = Assets.Interfaces.SHADOW;
if (DeviceCompat.isDebug()){ if (DeviceCompat.isDebug()){
fadeTime = 0f; fadeTime = 0f;
@@ -190,7 +189,8 @@ public class InterlevelScene extends PixelScene {
@Override @Override
public void update() { public void update() {
super.update(); super.update();
if (phase == Phase.FADE_IN) aa = Math.max( 0, (timeLeft - (fadeTime - 0.333f))); if (lastRegion == 6) aa = 1;
else if (phase == Phase.FADE_IN) aa = Math.max( 0, (timeLeft - (fadeTime - 0.333f)));
else if (phase == Phase.FADE_OUT) aa = Math.max( 0, (0.333f - timeLeft)); else if (phase == Phase.FADE_OUT) aa = Math.max( 0, (0.333f - timeLeft));
else aa = 0; else aa = 0;
} }