diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-19 00:12:35 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-19 00:12:35 +0000 |
| commit | 38825fa2ef87c024f88cf0ac139a02ef7fd5f40d (patch) | |
| tree | 4aa62b912811a0b2921fedb759b39620b08431e2 /src/map/clif.c | |
| parent | e92f5bc08714b2832c6393e3d9f652d75e69a568 (diff) | |
| download | hercules-38825fa2ef87c024f88cf0ac139a02ef7fd5f40d.tar.gz hercules-38825fa2ef87c024f88cf0ac139a02ef7fd5f40d.tar.bz2 hercules-38825fa2ef87c024f88cf0ac139a02ef7fd5f40d.tar.xz hercules-38825fa2ef87c024f88cf0ac139a02ef7fd5f40d.zip | |
- The last bug in Adoption system.
- Fixed a bug on trade, if you received a trade without accept it do logout... the other player cannot trade anymore 'til restart.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12396 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index b8b3c8b13..1c9eee4fb 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12043,7 +12043,7 @@ void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *sr { int fd = sd->fd; - WFIFOSET(fd,34); + WFIFOHEAD(fd,34); WFIFOW(fd,0) = 0x01f6; WFIFOL(fd,2) = src->status.account_id; WFIFOL(fd,6) = p_id; @@ -12055,7 +12055,7 @@ void clif_parse_Adopt_request(int fd, struct map_session_data *sd) { struct map_session_data *tsd = map_id2sd(RFIFOL(fd,2)), *p_sd = map_charid2sd(sd->status.partner_id); - if( pc_can_Adopt(sd, tsd, p_sd) ) + if( pc_can_Adopt(sd, p_sd, tsd) ) { tsd->adopt_invite = sd->status.account_id; clif_Adopt_request(tsd, sd, p_sd->status.account_id); |