diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-17 06:44:35 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-17 06:44:35 +0000 |
| commit | b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea (patch) | |
| tree | e7ff5ed861ac7c6d660527d172b1731095d88128 /src/map/storage.c | |
| parent | 98add4b57c4f0d4fdf21ec34ebfd3ea05c640fbf (diff) | |
| download | hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.tar.gz hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.tar.bz2 hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.tar.xz hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.zip | |
* Merged changes up to eAthena 15057.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15475 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index a7aab8d79..f802dabe4 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -104,7 +104,7 @@ int storage_storageopen(struct map_session_data *sd) sd->state.storage_flag = 1; storage_sortitem(sd->status.storage.items, ARRAYLENGTH(sd->status.storage.items)); clif_storagelist(sd, sd->status.storage.items, ARRAYLENGTH(sd->status.storage.items)); - clif_updatestorageamount(sd,sd->status.storage.storage_amount); + clif_updatestorageamount(sd, sd->status.storage.storage_amount, MAX_STORAGE); return 0; } @@ -169,7 +169,7 @@ static int storage_additem(struct map_session_data* sd, struct item* item_data, stor->storage_amount++; stor->items[i].amount = amount; clif_storageitemadded(sd,&stor->items[i],i,amount); - clif_updatestorageamount(sd,stor->storage_amount); + clif_updatestorageamount(sd, stor->storage_amount, MAX_STORAGE); return 0; } @@ -187,7 +187,7 @@ int storage_delitem(struct map_session_data* sd, int n, int amount) { memset(&sd->status.storage.items[n],0,sizeof(sd->status.storage.items[0])); sd->status.storage.storage_amount--; - if( sd->state.storage_flag == 1 ) clif_updatestorageamount(sd,sd->status.storage.storage_amount); + if( sd->state.storage_flag == 1 ) clif_updatestorageamount(sd, sd->status.storage.storage_amount, MAX_STORAGE); } if( sd->state.storage_flag == 1 ) clif_storageitemremoved(sd,n,amount); return 0; @@ -373,7 +373,7 @@ int storage_guild_storageopen(struct map_session_data* sd) sd->state.storage_flag = 2; storage_sortitem(gstor->items, ARRAYLENGTH(gstor->items)); clif_storagelist(sd, gstor->items, ARRAYLENGTH(gstor->items)); - clif_updateguildstorageamount(sd,gstor->storage_amount); + clif_updatestorageamount(sd, gstor->storage_amount, MAX_GUILD_STORAGE); return 0; } @@ -419,7 +419,7 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto stor->items[i].amount=amount; stor->storage_amount++; clif_storageitemadded(sd,&stor->items[i],i,amount); - clif_updateguildstorageamount(sd,stor->storage_amount); + clif_updatestorageamount(sd, stor->storage_amount, MAX_GUILD_STORAGE); stor->dirty = 1; return 0; } @@ -436,7 +436,7 @@ int guild_storage_delitem(struct map_session_data* sd, struct guild_storage* sto if(stor->items[n].amount==0){ memset(&stor->items[n],0,sizeof(stor->items[0])); stor->storage_amount--; - clif_updateguildstorageamount(sd,stor->storage_amount); + clif_updatestorageamount(sd, stor->storage_amount, MAX_GUILD_STORAGE); } clif_storageitemremoved(sd,n,amount); stor->dirty = 1; |