summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-18 14:46:22 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-18 14:46:22 +0000
commit615b7532efe7ffe61d3cbb15257df5e3699d58d8 (patch)
tree3ade9257c5b3780f5dba1b4a0e51739b2471316c
parentdb15814cc463589087a9825dd6012126f89cb261 (diff)
downloadhercules-615b7532efe7ffe61d3cbb15257df5e3699d58d8.tar.gz
hercules-615b7532efe7ffe61d3cbb15257df5e3699d58d8.tar.bz2
hercules-615b7532efe7ffe61d3cbb15257df5e3699d58d8.tar.xz
hercules-615b7532efe7ffe61d3cbb15257df5e3699d58d8.zip
- Sorry, fixing the last adoption step. It was too late ._.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12392 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/clif.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index fdeef84d0..678581d03 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12067,13 +12067,10 @@ void clif_parse_Adopt_reply(int fd, struct map_session_data *sd)
sd->adopt_invite = 0;
- if( pid != p1_sd->status.account_id )
- return; // Not the same sender
+ if( pid != p1_sd->status.account_id || !result )
+ return; // Not the same sender | Reply No
- if( pc_can_Adopt(p1_sd, p2_sd, sd) )
- {
- // Lets do the adoption!!
- }
+ pc_adoption(p1_sd, p2_sd, sd);
}
/*==========================================