diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
| commit | de51eaa43e05c2126fc1eef2a7e115843f972547 (patch) | |
| tree | 286a05a069e048247f90c7595f1b8939be784608 /src/inventory.h | |
| parent | d4c08d3bf69410a35a50875de50cc6fe74b3bf3e (diff) | |
| parent | 8627c7745f47492ab349da6a74e98e3d5813418f (diff) | |
| download | plus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.gz plus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.bz2 plus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.xz plus-de51eaa43e05c2126fc1eef2a7e115843f972547.zip | |
Merge branch 'coloritems'
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/inventory.h b/src/inventory.h index e53052f2b..1e2d8a2bc 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -91,13 +91,14 @@ class Inventory /** * Adds a new item in a free slot. */ - void addItem(int id, int quantity, int refine, bool equipment = false); + void addItem(int id, int quantity, int refine, unsigned char color, + bool equipment = false); /** * Sets the item at the given position. */ void setItem(int index, int id, int quantity, int refine, - bool equipment = false); + unsigned char color, bool equipment = false); /** * Remove a item from the inventory. |