diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-06 02:24:10 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-06 02:24:10 +0000 |
| commit | 452a0b793b0cdc3b16cfc0738926ade4322bda53 (patch) | |
| tree | 287e6faff29b4f02b80bf176b43991f43e7b41c0 /src/map/storage.c | |
| parent | 37a78d0554f4a66793aa2f20694b8716a56b3c25 (diff) | |
| download | hercules-452a0b793b0cdc3b16cfc0738926ade4322bda53.tar.gz hercules-452a0b793b0cdc3b16cfc0738926ade4322bda53.tar.bz2 hercules-452a0b793b0cdc3b16cfc0738926ade4322bda53.tar.xz hercules-452a0b793b0cdc3b16cfc0738926ade4322bda53.zip | |
Fixed rental items can be moved into guild storage from cart.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14083 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index 670069915..305d90d69 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -398,7 +398,7 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto if(item_data->nameid <= 0 || amount <= 0) return 1; - if (!itemdb_canguildstore(item_data, pc_isGM(sd))) + if( !itemdb_canguildstore(item_data, pc_isGM(sd)) || item_data->expire_time ) { //Check if item is storable. [Skotlex] clif_displaymessage (sd->fd, msg_txt(264)); return 1; @@ -475,9 +475,6 @@ int storage_guild_storageadd(struct map_session_data* sd, int index, int amount) if( amount < 1 || amount > sd->status.inventory[index].amount ) return 0; - if( sd->status.inventory[index].expire_time ) - return 0; - // log_tostorage(sd, index, 1); if(guild_storage_additem(sd,stor,&sd->status.inventory[index],amount)==0) pc_delitem(sd,index,amount,0); @@ -533,9 +530,6 @@ int storage_guild_storageaddfromcart(struct map_session_data* sd, int index, int if( amount < 1 || amount > sd->status.cart[index].amount ) return 0; - if( sd->status.inventory[index].expire_time ) - return 0; - if(guild_storage_additem(sd,stor,&sd->status.cart[index],amount)==0) pc_cart_delitem(sd,index,amount,0); |