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/inventoryhandler.h | |
| parent | 8dea62750ab3a44e0f35f2543bbb6ccf2a9470ce (diff) | |
| parent | 193ea898e5f549c14c0e4cd0d060785de4fb4bcf (diff) | |
| download | plus-502a0a0163e702af7334979a2eabfc4826a94091.tar.gz plus-502a0a0163e702af7334979a2eabfc4826a94091.tar.bz2 plus-502a0a0163e702af7334979a2eabfc4826a94091.tar.xz plus-502a0a0163e702af7334979a2eabfc4826a94091.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/net/inventoryhandler.h')
| -rw-r--r-- | src/net/inventoryhandler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index ec2f3db47..642d6f1c1 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -57,8 +57,8 @@ class InventoryHandler //void changeCart() = 0; - virtual void moveItem(int source, int slot, int amount, - int destination) = 0; + virtual void moveItem2(int source, int slot, int amount, + int destination) = 0; // TODO: fix/remove me virtual size_t getSize(int type) const = 0; |