Merge branch 'inv_possessions_rework' of https://github.com/EQEmu/Server into inv_possessions_rework

This commit is contained in:
Uleat
2018-09-03 20:58:47 -04:00
9 changed files with 1017 additions and 983 deletions
+2 -2
View File
@@ -38,10 +38,10 @@ int Lua_Inventory::PushCursor(Lua_ItemInst item) {
return self->PushCursor(*inst);
}
bool Lua_Inventory::SwapItem(int slot_a, int slot_b) {
bool Lua_Inventory::SwapItem(int source_slot, int destination_slot) {
Lua_Safe_Call_Bool();
EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid;
return self->SwapItem(slot_a, slot_b, fail_state);
return self->SwapItem(source_slot, destination_slot, fail_state);
}
bool Lua_Inventory::DeleteItem(int slot_id) {
+1 -1
View File
@@ -39,7 +39,7 @@ public:
Lua_ItemInst GetItem(int slot_id, int bag_slot);
int PutItem(int slot_id, Lua_ItemInst item);
int PushCursor(Lua_ItemInst item);
bool SwapItem(int slot_a, int slot_b);
bool SwapItem(int source_slot, int destination_slot);
bool DeleteItem(int slot_id);
bool DeleteItem(int slot_id, int quantity);
bool CheckNoDrop(int slot_id);