LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.2.1: fixed fader effects stacking (e.g. when taking damage)

Browse Source
This commit is contained in:
Evan Debenham 2022-03-31 01:32:09 -04:00
parent 172781f75f
commit 4fc020d6e3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java
View File

@ -310,6 +310,8 @@ public class PixelScene extends Scene {
private boolean light; private boolean light;
private float time; private float time;
private static Fader INSTANCE;
public Fader( int color, boolean light ) { public Fader( int color, boolean light ) {
super( uiCamera.width, uiCamera.height, color ); super( uiCamera.width, uiCamera.height, color );
@ -320,6 +322,11 @@ public class PixelScene extends Scene {
alpha( 1f ); alpha( 1f );
time = FADE_TIME; time = FADE_TIME;
if (INSTANCE != null){
INSTANCE.killAndErase();
}
INSTANCE = this;
} }
@Override @Override
@ -331,6 +338,9 @@ public class PixelScene extends Scene {
alpha( 0f ); alpha( 0f );
parent.remove( this ); parent.remove( this );
destroy(); destroy();
if (INSTANCE == this) {
INSTANCE = null;
}
} else { } else {
alpha( time / FADE_TIME ); alpha( time / FADE_TIME );
} }