From 7dc7b217107d18d531c569d2deab6ff1f62552d5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 18 Sep 2013 23:23:11 +0300
Subject: fix name conflicts.

---
 src/inventory.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/inventory.cpp')

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)
 {
-- 
cgit v1.2.3-60-g2f50