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

v2.2.0: fixed race condition errors in sortMobSprites

Browse Source
This commit is contained in:
Evan Debenham
2023-09-11 10:17:24 -04:00
parent 061d59c61b
commit 121763f7bb
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+13 -10
View File
@@ -881,7 +881,7 @@ public class GameScene extends PixelScene {
} }
} }
private void addMobSprite( Mob mob ) { private synchronized void addMobSprite( Mob mob ) {
CharSprite sprite = mob.sprite(); CharSprite sprite = mob.sprite();
sprite.visible = Dungeon.level.heroFOV[mob.pos]; sprite.visible = Dungeon.level.heroFOV[mob.pos];
mobs.add( sprite ); mobs.add( sprite );
@@ -889,18 +889,21 @@ public class GameScene extends PixelScene {
sortMobSprites(); sortMobSprites();
} }
//ensures that mob sprites are drawn in the correct order, in case of overlap //ensures that mob sprites are drawn from top to bottom, in case of overlap
public static void sortMobSprites(){ public static void sortMobSprites(){
if (scene != null){ if (scene != null){
scene.mobs.sort(new Comparator() { synchronized (scene) {
@Override scene.mobs.sort(new Comparator() {
public int compare(Object a, Object b) { @Override
if (a instanceof CharSprite && b instanceof CharSprite){ public int compare(Object a, Object b) {
return ((CharSprite) a).ch.pos - ((CharSprite) b).ch.pos; if (a instanceof CharSprite && b instanceof CharSprite) {
return (int) Math.signum((((CharSprite) a).y + ((CharSprite) a).height())
- (((CharSprite) b).y + ((CharSprite) b).height()));
}
return 0;
} }
return 0; });
} }
});
} }
} }