diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-12 16:45:04 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-12 16:45:04 +0000 |
| commit | a8b33d03051b6efdd46be7641f252bd2711f3707 (patch) | |
| tree | f4d4eed8cb3ad016f487b74001f4b6a77f53d71d /src | |
| parent | 87fb5efc4190c46ae9e4786d1ca3289af92b6882 (diff) | |
| download | hercules-a8b33d03051b6efdd46be7641f252bd2711f3707.tar.gz hercules-a8b33d03051b6efdd46be7641f252bd2711f3707.tar.bz2 hercules-a8b33d03051b6efdd46be7641f252bd2711f3707.tar.xz hercules-a8b33d03051b6efdd46be7641f252bd2711f3707.zip | |
item_trade nodrop/notrade flags no longer share no mail and no auction flags, credit to kenpachi for his item_trade update, for more info check tid:58847
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15569 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/mail.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index f5a165fe2..f38ce5ef2 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -14003,7 +14003,7 @@ void clif_parse_Auction_setitem(int fd, struct map_session_data *sd) return; } - if( !pc_candrop(sd, &sd->status.inventory[idx]) || + if( !pc_can_give_items(pc_isGM(sd)) || sd->status.inventory[idx].expire_time || !sd->status.inventory[idx].identify || !itemdb_canauction(&sd->status.inventory[idx],pc_isGM(sd)) ) { // Quest Item or something else clif_Auction_setitem(sd->fd, idx, true); diff --git a/src/map/mail.c b/src/map/mail.c index ad0b3c917..7c1b9be21 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -82,7 +82,8 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) return 1; if( amount < 0 || amount > sd->status.inventory[idx].amount ) return 1; - if( !pc_candrop(sd, &sd->status.inventory[idx]) || !itemdb_canmail(&sd->status.inventory[idx],pc_isGM(sd)) ) + if( !pc_can_give_items(pc_isGM(sd)) || sd->status.inventory[idx].expire_time || + !itemdb_canmail(&sd->status.inventory[idx],pc_isGM(sd)) ) return 1; sd->mail.index = idx; |