From d20f8fcab4a9d8db03d3f9f1b27630953d6680ea Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Thu, 16 Jan 2020 15:58:45 -0800 Subject: [PATCH] Renamed location methods to store since they are placing items in store locations --- core/src/com/riiablo/save/CharData.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/com/riiablo/save/CharData.java b/core/src/com/riiablo/save/CharData.java index 7bb6621e..b97c6b85 100644 --- a/core/src/com/riiablo/save/CharData.java +++ b/core/src/com/riiablo/save/CharData.java @@ -332,11 +332,11 @@ public class CharData implements ItemData.UpdateListener, Pool.Poolable { item.location = Location.CURSOR; } - public void locationToCursor(int i) { + public void storeToCursor(int i) { itemToCursor(i); } - public void cursorToLocation(StoreLoc storeLoc, int x, int y) { + public void cursorToStore(StoreLoc storeLoc, int x, int y) { assert itemData.cursor != ItemData.INVALID_ITEM; Item item = itemData.getItem(itemData.cursor); item.location = Location.STORED; @@ -346,9 +346,9 @@ public class CharData implements ItemData.UpdateListener, Pool.Poolable { itemData.cursor = ItemData.INVALID_ITEM; } - public void swapLocationItem(int i, StoreLoc storeLoc, int x, int y) { - cursorToLocation(storeLoc, x, y); - locationToCursor(i); + public void swapStoreItem(int i, StoreLoc storeLoc, int x, int y) { + cursorToStore(storeLoc, x, y); + storeToCursor(i); } public void bodyToCursor(BodyLoc bodyLoc) {