diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 04:30:17 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 04:30:17 +0000 |
| commit | f3bad5a9c57a123b9ae3f3070ef4edaa2f08698b (patch) | |
| tree | bb06a71e560aa0bec4f505c9c7fad48ecf28f8b3 | |
| parent | 0cda5758665c392494f70495b9f6a636b2d73675 (diff) | |
| download | hercules-f3bad5a9c57a123b9ae3f3070ef4edaa2f08698b.tar.gz hercules-f3bad5a9c57a123b9ae3f3070ef4edaa2f08698b.tar.bz2 hercules-f3bad5a9c57a123b9ae3f3070ef4edaa2f08698b.tar.xz hercules-f3bad5a9c57a123b9ae3f3070ef4edaa2f08698b.zip | |
* Merged changes up to eAthena 15082. (skipped 15081)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15771 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/pc.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 81b10b7e2..3ecb8acba 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2220,12 +2220,6 @@ void clif_delitem(struct map_session_data *sd,int n,int amount, short reason) nullpo_retv(sd); - if (reason == 7) - { - clif_dropitem(sd,n,amount); - return; - } - fd=sd->fd; WFIFOHEAD(fd, packet_len(0x7fa)); diff --git a/src/map/pc.c b/src/map/pc.c index 138efc636..ca9fbf4f2 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3745,7 +3745,8 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount) if (!map_addflooritem(&sd->status.inventory[n], amount, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 2)) return 0; - pc_delitem(sd, n, amount, 0, 7, LOG_TYPE_PICKDROP_PLAYER); + pc_delitem(sd, n, amount, 1, 0, LOG_TYPE_PICKDROP_PLAYER); + clif_dropitem(sd, n, amount); return 1; } |