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

v0.6.1a: fully fixed emoIcon handling (I hope)

Browse Source
This commit is contained in:
Evan Debenham 2017-08-16 21:21:06 -04:00
parent 720ec67a15
commit 7027c19b5f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
View File

@ -391,7 +391,8 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
} }
@Override @Override
public void update() { //syncronized due to EmoIcon handling
public synchronized void update() {
super.update(); super.update();
@ -428,11 +429,11 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
} }
} }
public void showSleep() { public synchronized void showSleep() {
if (emo instanceof EmoIcon.Sleep && emo.alive) { if (emo instanceof EmoIcon.Sleep) {
} else { } else {
if (emo != null && emo.alive) { if (emo != null) {
emo.killAndErase(); emo.killAndErase();
} }
emo = new EmoIcon.Sleep( this ); emo = new EmoIcon.Sleep( this );
@ -441,17 +442,18 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
idle(); idle();
} }
public void hideSleep() { public synchronized void hideSleep() {
if (emo instanceof EmoIcon.Sleep) { if (emo instanceof EmoIcon.Sleep) {
emo.killAndErase(); emo.killAndErase();
emo = null;
} }
} }
public void showAlert() { public synchronized void showAlert() {
if (emo instanceof EmoIcon.Alert && emo.alive) { if (emo instanceof EmoIcon.Alert) {
} else { } else {
if (emo != null && emo.alive) { if (emo != null) {
emo.killAndErase(); emo.killAndErase();
} }
emo = new EmoIcon.Alert( this ); emo = new EmoIcon.Alert( this );
@ -459,9 +461,10 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
} }
} }
public void hideAlert() { public synchronized void hideAlert() {
if (emo instanceof EmoIcon.Alert) { if (emo instanceof EmoIcon.Alert) {
emo.killAndErase(); emo.killAndErase();
emo = null;
} }
} }