diff options
| author | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
| commit | 041e0625b543215e8b319fc4ef32fa24cd199656 (patch) | |
| tree | 4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /src/map/storage.c | |
| parent | 5fd40de233d3a897284f771338cbf8e657182261 (diff) | |
| parent | 856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff) | |
| download | hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.gz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.bz2 hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.xz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.zip | |
Merge pull request #586 from hemagx/master
Update UID system to match official and Implement Merger
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index 0a22b9ec6..95194bc47 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -109,7 +109,8 @@ int compare_item(struct item *a, struct item *b) a->refine == b->refine && a->attribute == b->attribute && a->expire_time == b->expire_time && - a->bound == b->bound ) + a->bound == b->bound && + a->unique_id == b->unique_id) { int i; for (i = 0; i < MAX_SLOTS && (a->card[i] == b->card[i]); i++); @@ -155,6 +156,7 @@ int storage_additem(struct map_session_data* sd, struct item* item_data, int amo {// existing items found, stack them if( amount > MAX_AMOUNT - stor->items[i].amount || ( data->stack.storage && amount > data->stack.amount - stor->items[i].amount ) ) return 1; + stor->items[i].amount += amount; clif->storageitemadded(sd,&stor->items[i],i,amount); return 0; |