Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15569 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-02-12 16:45:04 +00:00
parent 1e0eff0f1e
commit b38bf06327
4 changed files with 2327 additions and 3001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2633
db/pre-re/item_trade.txt
View File

File diff suppressed because it is too large Load Diff

2690
db/re/item_trade.txt
View File

File diff suppressed because it is too large Load Diff

2
src/map/clif.c
View File

@ -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);

3
src/map/mail.c
View File

@ -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;