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

Moved ItemData#drop and added ItemManager#dropCursor

Browse Source
This commit is contained in:
Collin Smith 2020-05-30 16:35:37 -07:00
parent 6280e89d8b
commit 7336c2a3b0
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/riiablo/engine/server/ItemManager.java
View File

@ -14,6 +14,10 @@ public class ItemManager extends PassiveSystem {
protected ComponentMapper<Player> mPlayer;
public void dropCursor(int entityId) {
mPlayer.get(entityId).data.dropCursor();
}
public void storeToCursor(int entityId, int i) {
mPlayer.get(entityId).data.storeToCursor(i);
}

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

@ -204,14 +204,6 @@ public class ItemData {
return copy;
}
void pickup(int i) {
assert cursor == INVALID_ITEM;
Item item = itemData.get(i);
if (item.location == Location.STORED) notifyStoreRemoved(item);
cursor = i;
setLocation(item, Location.CURSOR);
}
// TODO: should item location change if the item is dropped? is this what UNK3 and UNK5 represent?
void drop() {
assert cursor != INVALID_ITEM;
@ -220,6 +212,14 @@ public class ItemData {
setLocation(item, null);
}
void pickup(int i) {
assert cursor == INVALID_ITEM;
Item item = itemData.get(i);
if (item.location == Location.STORED) notifyStoreRemoved(item);
cursor = i;
setLocation(item, Location.CURSOR);
}
void storeCursor(StoreLoc storeLoc, int x, int y) {
assert cursor != INVALID_ITEM;
store(storeLoc, cursor, x, y);