diff options
| author | Reid <reidyaro@gmail.com> | 2012-01-30 15:27:30 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-01-30 15:27:30 +0100 |
| commit | 502a0a0163e702af7334979a2eabfc4826a94091 (patch) | |
| tree | 5e80ef76585b1718d7e74a411117c725fe3cb0e9 /src/net/tmwa/inventoryhandler.cpp | |
| parent | 8dea62750ab3a44e0f35f2543bbb6ccf2a9470ce (diff) | |
| parent | 193ea898e5f549c14c0e4cd0d060785de4fb4bcf (diff) | |
| download | mv-502a0a0163e702af7334979a2eabfc4826a94091.tar.gz mv-502a0a0163e702af7334979a2eabfc4826a94091.tar.bz2 mv-502a0a0163e702af7334979a2eabfc4826a94091.tar.xz mv-502a0a0163e702af7334979a2eabfc4826a94091.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/net/tmwa/inventoryhandler.cpp')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 7fa26f5ed..db670a17b 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -186,8 +186,8 @@ void InventoryHandler::closeStorage(int type A_UNUSED) MessageOut outMsg(CMSG_CLOSE_STORAGE); } -void InventoryHandler::moveItem(int source, int slot, int amount, - int destination) +void InventoryHandler::moveItem2(int source, int slot, int amount, + int destination) { if (source == Inventory::INVENTORY && destination == Inventory::STORAGE) { |