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

v0.7.5b: fixed additional cases where text was being rendered from the actor thread

Browse Source
This commit is contained in:
Evan Debenham 2019-10-13 01:05:23 -04:00
parent 023f580e01
commit eab000266f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
View File

@ -157,7 +157,12 @@ public class Blacksmith extends NPC {
} }
private void tell( String text ) { private void tell( String text ) {
GameScene.show( new WndQuest( this, text ) ); Game.runOnRenderThread(new Callback() {
@Override
public void call() {
GameScene.show( new WndQuest( Blacksmith.this, text ) );
}
});
} }
public static String verify( Item item1, Item item2 ) { public static String verify( Item item1, Item item2 ) {

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -63,8 +63,10 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndBlacksmith; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBlacksmith;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndItem; import com.shatteredpixel.shatteredpixeldungeon.windows.WndItem;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest;
import com.watabou.noosa.Game;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
import com.watabou.utils.Callback;
import com.watabou.utils.PathFinder; import com.watabou.utils.PathFinder;
import com.watabou.utils.Random; import com.watabou.utils.Random;
@ -697,7 +699,12 @@ public class DriedRose extends Artifact {
updateRose(); updateRose();
if (rose != null && !rose.talkedTo){ if (rose != null && !rose.talkedTo){
rose.talkedTo = true; rose.talkedTo = true;
GameScene.show(new WndQuest(this, Messages.get(this, "introduce") )); Game.runOnRenderThread(new Callback() {
@Override
public void call() {
GameScene.show(new WndQuest(GhostHero.this, Messages.get(GhostHero.this, "introduce") ));
}
});
return false; return false;
} else { } else {
return super.interact(); return super.interact();