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/pc.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/pc.c')
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 27e8576aa..4a1ecafbe 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3334,7 +3334,7 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount) return 0; //Can't drop items in nodrop mapflag maps. } - if( !pc_candrop(sd,&sd->status.inventory[n]) || sd->status.inventory[n].expire_time ) + if( !pc_candrop(sd,&sd->status.inventory[n]) ) { clif_displaymessage (sd->fd, msg_txt(263)); return 0; @@ -6377,7 +6377,9 @@ int pc_setriding(TBL_PC* sd, int flag) int pc_candrop(struct map_session_data *sd,struct item *item) { int level = pc_isGM(sd); - if ( !pc_can_give_items(level) ) //check if this GM level can drop items + if( item && item->expire_time ) + return 0; + if( !pc_can_give_items(level) ) //check if this GM level can drop items return 0; return (itemdb_isdropable(item, level)); } |