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

v0.6.1: fixed quickslots not updating properly when item glow changes

Browse Source
This commit is contained in:
Evan Debenham 2017-08-04 23:23:00 -04:00
parent 2dabf54a5d
commit 0588036643
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java
View File

@ -195,9 +195,7 @@ public class ItemSprite extends MovieClip {
if (this.emitter != null) this.emitter.killAndErase(); if (this.emitter != null) this.emitter.killAndErase();
emitter = null; emitter = null;
frame( image ); frame( image );
if ((this.glowing = glowing) == null) { glow( glowing );
resetColor();
}
return this; return this;
} }
@ -211,6 +209,11 @@ public class ItemSprite extends MovieClip {
} }
} }
public void glow( Glowing glowing ){
this.glowing = glowing;
if (glowing == null) resetColor();
}
@Override @Override
public void kill() { public void kill() {
super.kill(); super.kill();

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

@ -154,7 +154,10 @@ public class ItemSlot extends Button {
public void item( Item item ) { public void item( Item item ) {
if (this.item == item) { if (this.item == item) {
if (item != null) icon.frame(item.image()); if (item != null) {
icon.frame(item.image());
icon.glow(item.glowing());
}
updateText(); updateText();
return; return;
} }