diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-29 03:56:33 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-29 03:56:33 +0000 |
| commit | ad5290dcbfba41987835868c9b1113f15551dfda (patch) | |
| tree | d33868cd57d928cd7da750244b9cae2e098e0914 /src/map | |
| parent | e4ed82286f5f549101a577b455b7584b6fc20270 (diff) | |
| download | hercules-ad5290dcbfba41987835868c9b1113f15551dfda.tar.gz hercules-ad5290dcbfba41987835868c9b1113f15551dfda.tar.bz2 hercules-ad5290dcbfba41987835868c9b1113f15551dfda.tar.xz hercules-ad5290dcbfba41987835868c9b1113f15551dfda.zip | |
- Fixed a bug in a previous Adoption fix from umage (partnerid is char_id not account_id)
- Added new headgears from EuRO and ThRO.
- Fixed some viewids.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12447 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 532d42ff1..0d8a5803a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12086,8 +12086,10 @@ void clif_parse_Adopt_reply(int fd, struct map_session_data *sd) if( p1_sd == NULL || p2_sd == NULL ) return; // Both players need to be online - if( pid != p1_sd->status.account_id || p2_id != p1_sd->status.partner_id ) + + if( pid != p1_sd->status.account_id ) return; // Incorrect values + if( result == 0 ) return; // Rejected |