v0.2.4: added some safety checks to the quickslot button
This commit is contained in:
@@ -59,6 +59,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.SewerBossLevel;
|
|||||||
import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel;
|
import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
|
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.StartScene;
|
import com.shatteredpixel.shatteredpixeldungeon.scenes.StartScene;
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
|
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
|
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect;
|
import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect;
|
||||||
@@ -71,7 +72,6 @@ import java.io.IOException;
|
|||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
public class Dungeon {
|
public class Dungeon {
|
||||||
@@ -154,6 +154,7 @@ public class Dungeon {
|
|||||||
Journal.reset();
|
Journal.reset();
|
||||||
|
|
||||||
quickslot.reset();
|
quickslot.reset();
|
||||||
|
QuickSlotButton.reset();
|
||||||
|
|
||||||
depth = 0;
|
depth = 0;
|
||||||
gold = 0;
|
gold = 0;
|
||||||
@@ -517,6 +518,7 @@ public class Dungeon {
|
|||||||
Generator.reset();
|
Generator.reset();
|
||||||
|
|
||||||
quickslot.reset();
|
quickslot.reset();
|
||||||
|
QuickSlotButton.reset();
|
||||||
|
|
||||||
Dungeon.challenges = bundle.getInt( CHALLENGES );
|
Dungeon.challenges = bundle.getInt( CHALLENGES );
|
||||||
|
|
||||||
|
|||||||
@@ -57,10 +57,14 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
|
|||||||
public void destroy() {
|
public void destroy() {
|
||||||
super.destroy();
|
super.destroy();
|
||||||
|
|
||||||
instance = new QuickSlotButton[4];
|
reset();
|
||||||
|
|
||||||
lastTarget = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void reset() {
|
||||||
|
instance = new QuickSlotButton[4];
|
||||||
|
|
||||||
|
lastTarget = null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void createChildren() {
|
protected void createChildren() {
|
||||||
|
|||||||
Reference in New Issue
Block a user