summaryrefslogtreecommitdiff
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-18 23:23:11 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-18 23:23:11 +0300
commit7dc7b217107d18d531c569d2deab6ff1f62552d5 (patch)
tree30753ed34988d26d86733c9d76b97c7b6d24a998 /src/inventory.cpp
parentdc6568962a32ddb6f231c629e7ad3373e9086b6c (diff)
downloadmv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.gz
mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.bz2
mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.xz
mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.zip
fix name conflicts.
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r--src/inventory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index b4477f6d3..53cdeb34c 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -46,12 +46,12 @@ struct SlotUsed final : public std::unary_function<Item*, bool>
}
};
-Inventory::Inventory(const int type, const int size) :
+Inventory::Inventory(const int type, const int size1) :
mInventoryListeners(),
mType(type),
- mSize(size == -1 ? static_cast<unsigned>(
+ mSize(size1 == -1 ? static_cast<unsigned>(
Net::getInventoryHandler()->getSize(type))
- : static_cast<unsigned>(size)),
+ : static_cast<unsigned>(size1)),
mItems(new Item*[mSize]),
mUsed(0)
{