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

v0.7.5e: fixed toasts being destroyed in the actor thread

Browse Source
This commit is contained in:
Evan Debenham 2019-10-22 20:19:23 -04:00
parent 53907d8b7a
commit 4dd73f025c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -99,6 +99,7 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndTradeItem;
import com.watabou.glwrap.Blending; import com.watabou.glwrap.Blending;
import com.watabou.noosa.Camera; import com.watabou.noosa.Camera;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.Gizmo;
import com.watabou.noosa.Group; import com.watabou.noosa.Group;
import com.watabou.noosa.NoosaScript; import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.NoosaScriptNoLighting; import com.watabou.noosa.NoosaScriptNoLighting;
@ -522,6 +523,10 @@ public class GameScene extends PixelScene {
} }
}; };
//sometimes UI changes can be prompted by the actor thread.
// We queue any removed element destruction, rather than destroying them in the actor thread.
private ArrayList<Gizmo> toDestroy = new ArrayList<>();
@Override @Override
public synchronized void update() { public synchronized void update() {
if (Dungeon.hero == null || scene == null) { if (Dungeon.hero == null || scene == null) {
@ -574,6 +579,11 @@ public class GameScene extends PixelScene {
} }
cellSelector.enable(Dungeon.hero.ready); cellSelector.enable(Dungeon.hero.ready);
for (Gizmo g : toDestroy){
g.destroy();
}
toDestroy.clear();
} }
private boolean tagAttack = false; private boolean tagAttack = false;
@ -680,7 +690,7 @@ public class GameScene extends PixelScene {
if (prompt != null) { if (prompt != null) {
prompt.killAndErase(); prompt.killAndErase();
prompt.destroy(); toDestroy.add(prompt);
prompt = null; prompt = null;
} }