summaryrefslogtreecommitdiff
path: root/src/inventory.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-23 21:59:21 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-23 22:00:09 +0100
commit99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch)
tree03c296d1f89859aae35336dfe2f58df09d256fd3 /src/inventory.h
parentfa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff)
parent347452b9b69ef3af29c577b7751082822e900c01 (diff)
downloadMana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz
Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2
Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz
Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip
Merge branch 'aethyra/master'
Conflicts: Many files.
Diffstat (limited to 'src/inventory.h')
-rw-r--r--src/inventory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/inventory.h b/src/inventory.h
index df2aac38..ee8d072a 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -33,7 +33,7 @@ class Inventory
/**
* Constructor.
*/
- Inventory(int size);
+ Inventory(int size, int offset);
/**
* Destructor.
@@ -111,6 +111,7 @@ class Inventory
protected:
Item **mItems; /**< The holder of items */
int mSize; /**< The max number of inventory items */
+ int mOffset; /**< Offset used by the inventory */
};
#endif