diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-07-17 23:10:05 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-07-18 11:45:33 -0600 |
| commit | 81d8168bb5796ccb1704bcce9f5327c35e55d281 (patch) | |
| tree | 3e7e111eb956757f49579bb4366c24c94712387d /src/net/manaserv/inventoryhandler.cpp | |
| parent | 2ae96bdc5517b2147662f19ff6d700657c0d0d42 (diff) | |
| download | mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.tar.gz mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.tar.bz2 mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.tar.xz mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.zip | |
Move more from LocalPlayer to PlayerInfo
Also cleanup PlayerInfo a bit.
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/net/manaserv/inventoryhandler.cpp')
| -rw-r--r-- | src/net/manaserv/inventoryhandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp index bf5682c7..3f8aa8b5 100644 --- a/src/net/manaserv/inventoryhandler.cpp +++ b/src/net/manaserv/inventoryhandler.cpp @@ -61,8 +61,8 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case GPMSG_INVENTORY_FULL: - player_node->clearInventory(); - player_node->mEquipment->setBackend(&mEquips); + PlayerInfo::clearInventory(); + PlayerInfo::getEquipment()->setBackend(&mEquips); // no break! case GPMSG_INVENTORY: @@ -83,7 +83,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg) else if (slot >= 32 && slot < 32 + getSize(Inventory::INVENTORY)) { int amount = id ? msg.readInt8() : 0; - player_node->setInvItem(slot - 32, id, amount); + PlayerInfo::setInventoryItem(slot - 32, id, amount); } }; break; @@ -131,7 +131,7 @@ bool InventoryHandler::canSplit(const Item *item) void InventoryHandler::splitItem(const Item *item, int amount) { - int newIndex = player_node->getInventory()->getFreeSlot(); + int newIndex = PlayerInfo::getInventory()->getFreeSlot(); if (newIndex > Inventory::NO_SLOT_INDEX) { MessageOut msg(PGMSG_MOVE_ITEM); @@ -150,7 +150,7 @@ void InventoryHandler::moveItem(int oldIndex, int newIndex) MessageOut msg(PGMSG_MOVE_ITEM); msg.writeInt8(oldIndex); msg.writeInt8(newIndex); - msg.writeInt8(player_node->getInventory()->getItem(oldIndex) + msg.writeInt8(PlayerInfo::getInventory()->getItem(oldIndex) ->getQuantity()); gameServerConnection->send(msg); } |