From 452a0b793b0cdc3b16cfc0738926ade4322bda53 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Tue, 6 Oct 2009 02:24:10 +0000 Subject: 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 --- src/map/pc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/map/pc.c') 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)); } -- cgit v1.2.3-60-g2f50