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

v0.4.2: hero.handle no longer actually acts, just sets up action

Browse Source 
This prevents hero actions from running on the UI thread incorrectly
This commit is contained in:
Evan Debenham 2016-08-28 18:40:33 -04:00 committed by Evan Debenham
parent 1293607b42
commit c29cef8907
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -1126,7 +1126,7 @@ public class Hero extends Char {
}
return act();
return true;
}
public void earnExp( int exp ) {

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
View File

@ -167,7 +167,9 @@ public class AttackIndicator extends Tag {
@Override
protected void onClick() {
if (enabled) {
Dungeon.hero.handle( lastTarget.pos );
if (Dungeon.hero.handle( lastTarget.pos )) {
Dungeon.hero.next();
}
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java
View File

@ -45,7 +45,10 @@ public class LootIndicator extends Tag {
slot = new ItemSlot() {
protected void onClick() {
Dungeon.hero.handle( Dungeon.hero.pos );
if (Dungeon.hero.handle(Dungeon.hero.pos)){
Dungeon.hero.next();
}
};
};
slot.showParams( true, false, false );