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

v0.6.1b: fixed rare crashes caused by floating text

Browse Source
This commit is contained in:
Evan Debenham 2017-08-23 03:43:10 -04:00
parent d71559e0cc
commit 70cce2c8b3
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java
View File

@ -42,7 +42,7 @@ public class FloatingText extends RenderedText {
private float cameraZoom = -1; private float cameraZoom = -1;
private static SparseArray<ArrayList<FloatingText>> stacks = new SparseArray<ArrayList<FloatingText>>(); private static final SparseArray<ArrayList<FloatingText>> stacks = new SparseArray<ArrayList<FloatingText>>();
public FloatingText() { public FloatingText() {
speed.y = - DISTANCE / LIFESPAN; speed.y = - DISTANCE / LIFESPAN;
@ -65,7 +65,9 @@ public class FloatingText extends RenderedText {
@Override @Override
public void kill() { public void kill() {
if (key != -1) { if (key != -1) {
stacks.get( key ).remove( this ); synchronized (stacks) {
stacks.get(key).remove(this);
}
key = -1; key = -1;
} }
super.kill(); super.kill();
@ -116,30 +118,32 @@ public class FloatingText extends RenderedText {
private static void push( FloatingText txt, int key ) { private static void push( FloatingText txt, int key ) {
txt.key = key; synchronized (stacks) {
txt.key = key;
ArrayList<FloatingText> stack = stacks.get( key ); ArrayList<FloatingText> stack = stacks.get(key);
if (stack == null) { if (stack == null) {
stack = new ArrayList<FloatingText>(); stack = new ArrayList<FloatingText>();
stacks.put( key, stack ); stacks.put(key, stack);
} }
if (stack.size() > 0) { if (stack.size() > 0) {
FloatingText below = txt; FloatingText below = txt;
int aboveIndex = stack.size() - 1; int aboveIndex = stack.size() - 1;
while (aboveIndex >= 0) { while (aboveIndex >= 0) {
FloatingText above = stack.get( aboveIndex ); FloatingText above = stack.get(aboveIndex);
if (above.y + above.height() > below.y) { if (above.y + above.height() > below.y) {
above.y = below.y - above.height(); above.y = below.y - above.height();
below = above; below = above;
aboveIndex--; aboveIndex--;
} else { } else {
break; break;
}
} }
} }
}
stack.add( txt ); stack.add(txt);
}
} }
} }