diff --git a/SPD-classes/src/main/java/com/watabou/utils/SparseArray.java b/SPD-classes/src/main/java/com/watabou/utils/SparseArray.java index f28e9767a..676a8f715 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/SparseArray.java +++ b/SPD-classes/src/main/java/com/watabou/utils/SparseArray.java @@ -32,10 +32,6 @@ public class SparseArray extends IntMap { return keys().toArray().toArray(); } - public T[] valueArray(){ - return values().toArray().toArray(); - } - public List valueList() { return Arrays.asList(values().toArray().toArray()); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index 5c314f17d..ff89f5094 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -772,7 +772,7 @@ public class Dungeon { } if (hero.buff(Awareness.class) != null){ - for (Heap h : level.heaps.valueArray()){ + for (Heap h : level.heaps.valueList()){ BArray.or( level.visited, level.heroFOV, h.pos - 1 - level.width(), 3, level.visited ); BArray.or( level.visited, level.heroFOV, h.pos - 1, 3, level.visited ); BArray.or( level.visited, level.heroFOV, h.pos - 1 + level.width(), 3, level.visited ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java index 819350cc0..f305960d9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java @@ -50,7 +50,7 @@ public class ImpShopkeeper extends Shopkeeper { @Override public void flee() { - for (Heap heap: Dungeon.level.heaps.valueArray()) { + for (Heap heap: Dungeon.level.heaps.valueList()) { if (heap.type == Heap.Type.FOR_SALE) { CellEmitter.get( heap.pos ).burst( ElmoParticle.FACTORY, 4 ); heap.destroy(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java index 26583351a..5e09a8175 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java @@ -71,7 +71,7 @@ public class Shopkeeper extends NPC { @Override public void destroy() { super.destroy(); - for (Heap heap: Dungeon.level.heaps.valueArray()) { + for (Heap heap: Dungeon.level.heaps.valueList()) { if (heap.type == Heap.Type.FOR_SALE) { CellEmitter.get( heap.pos ).burst( ElmoParticle.FACTORY, 4 ); heap.destroy(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java index b2d692b82..e73cff3e0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java @@ -273,7 +273,7 @@ public class Bomb extends Item { } //look for our bomb, remove it from its heap, and blow it up. - for (Heap heap : Dungeon.level.heaps.valueArray()) { + for (Heap heap : Dungeon.level.heaps.valueList()) { if (heap.items.contains(bomb)) { //FIXME this is a bit hacky, might want to generalize the functionality diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java index 6194661eb..09f35a7a4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java @@ -52,7 +52,7 @@ public class Noisemaker extends Bomb { mob.beckon( cell ); } - for (Heap heap : Dungeon.level.heaps.valueArray()) { + for (Heap heap : Dungeon.level.heaps.valueList()) { if (heap.type == Heap.Type.MIMIC) { Mimic m = Mimic.spawnAt( heap.pos, heap.items ); if (m != null) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index 80df648ae..9f972bd79 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java @@ -51,7 +51,7 @@ public class ScrollOfRage extends Scroll { } } - for (Heap heap : Dungeon.level.heaps.valueArray()) { + for (Heap heap : Dungeon.level.heaps.valueList()) { if (heap.type == Heap.Type.MIMIC) { Mimic m = Mimic.spawnAt( heap.pos, heap.items ); if (m != null) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 74b30607f..213261df5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -980,7 +980,7 @@ public abstract class Level implements Bundlable { } if (c.buff( Awareness.class ) != null) { - for (Heap heap : heaps.valueArray()) { + for (Heap heap : heaps.valueList()) { int p = heap.pos; for (int i : PathFinder.NEIGHBOURS9) fieldOfView[p+i] = true; @@ -1005,7 +1005,7 @@ public abstract class Level implements Bundlable { } if (c == Dungeon.hero) { - for (Heap heap : heaps.valueArray()) + for (Heap heap : heaps.valueList()) if (!heap.seen && fieldOfView[heap.pos]) heap.seen = true; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java index 5720f4ecd..8509231d7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java @@ -65,7 +65,7 @@ public class CellSelector extends PointerArea { } } - for (Heap heap : Dungeon.level.heaps.valueArray()){ + for (Heap heap : Dungeon.level.heaps.valueList()){ if (heap.sprite != null && heap.sprite.overlapsPoint( p.x, p.y)){ select( heap.pos ); return; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index 50843a2bc..6bc056680 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -229,7 +229,7 @@ public class GameScene extends PixelScene { heaps = new Group(); add( heaps ); - for ( Heap heap : Dungeon.level.heaps.valueArray() ) { + for ( Heap heap : Dungeon.level.heaps.valueList() ) { addHeapSprite( heap ); }