mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-03-04 06:32:37 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed qualification from INVALID_ITEM within ItemData

Browse Source
This commit is contained in:
Collin Smith 2020-05-30 16:22:01 -07:00
parent c6468eb788
commit d910a6026a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/riiablo/save/ItemData.java
View File

@ -66,7 +66,7 @@ public class ItemData {
} }
void preprocessItems() { void preprocessItems() {
cursor = ItemData.INVALID_ITEM; cursor = INVALID_ITEM;
Item[] items = itemData.items; Item[] items = itemData.items;
for (int i = 0, s = itemData.size; i < s; i++) { for (int i = 0, s = itemData.size; i < s; i++) {
Item item = items[i]; Item item = items[i];
@ -117,7 +117,7 @@ public class ItemData {
public Item getSlot(BodyLoc bodyLoc) { public Item getSlot(BodyLoc bodyLoc) {
int i = equipped.get(bodyLoc); int i = equipped.get(bodyLoc);
return i == ItemData.INVALID_ITEM ? null : getItem(i); return i == INVALID_ITEM ? null : getItem(i);
} }
public Item getEquipped(BodyLoc bodyLoc) { public Item getEquipped(BodyLoc bodyLoc) {
@ -213,7 +213,7 @@ public class ItemData {
} }
void storeCursor(StoreLoc storeLoc, int x, int y) { void storeCursor(StoreLoc storeLoc, int x, int y) {
assert cursor != ItemData.INVALID_ITEM; assert cursor != INVALID_ITEM;
store(storeLoc, cursor, x, y); store(storeLoc, cursor, x, y);
cursor = INVALID_ITEM; cursor = INVALID_ITEM;
} }
@ -258,7 +258,7 @@ public class ItemData {
int[] cache = equipped.values(); int[] cache = equipped.values();
for (int i = 0, s = cache.length, j; i < s; i++) { for (int i = 0, s = cache.length, j; i < s; i++) {
j = cache[i]; j = cache[i];
if (j == ItemData.INVALID_ITEM) continue; if (j == INVALID_ITEM) continue;
Item item = itemData.get(j); Item item = itemData.get(j);
if (isActive(item)) { if (isActive(item)) {
item.update(stats, charStats, equippedSets); item.update(stats, charStats, equippedSets);
@ -273,7 +273,7 @@ public class ItemData {
cache = inventoryItems.items; cache = inventoryItems.items;
for (int i = 0, s = cache.length, j; i < s; i++) { for (int i = 0, s = cache.length, j; i < s; i++) {
j = cache[i]; j = cache[i];
if (j == ItemData.INVALID_ITEM) continue; if (j == INVALID_ITEM) continue;
Item item = itemData.get(j); Item item = itemData.get(j);
if (item.type.is(Type.CHAR)) { if (item.type.is(Type.CHAR)) {
item.update(stats, charStats, equippedSets); item.update(stats, charStats, equippedSets);