diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-23 18:21:49 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-23 18:21:49 +0000 |
| commit | 42e1d3fd8849d608dc1e4136b0acc99b8649f083 (patch) | |
| tree | 4981e0c2a37334d0d794edff259011143d1b91ec /src/char/char.c | |
| parent | 05e7279f4ea2579a3d67b5339fa834e107a967c5 (diff) | |
| download | hercules-42e1d3fd8849d608dc1e4136b0acc99b8649f083.tar.gz hercules-42e1d3fd8849d608dc1e4136b0acc99b8649f083.tar.bz2 hercules-42e1d3fd8849d608dc1e4136b0acc99b8649f083.tar.xz hercules-42e1d3fd8849d608dc1e4136b0acc99b8649f083.zip | |
- char_family now returns the char_id of the children when previously it would return true.
- Expanded the family check to work as it should, exp-share-range is respected, and the child is not considered for it (thanks to TheUltraMage for the investigation)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9049 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/char/char.c b/src/char/char.c index f08e0a76b..0e23f99ab 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1792,15 +1792,15 @@ int char_family(int cid1, int cid2, int cid3) { //we could do a lot more checks and force cross-reference integrity.
if(char_dat[idx1].status.partner_id == cid2 &&
char_dat[idx1].status.child == cid3)
- return 1; //cid1/cid2 parents. cid3 child.
+ return cid3; //cid1/cid2 parents. cid3 child.
if(char_dat[idx1].status.partner_id == cid3 &&
char_dat[idx1].status.child == cid2)
- return 1; //cid1/cid3 parents. cid2 child.
+ return cid2; //cid1/cid3 parents. cid2 child.
if(char_dat[idx2].status.partner_id == cid3 &&
char_dat[idx2].status.child == cid1)
- return 1; //cid2/cid3 parents. cid1 child.
+ return cid1; //cid2/cid3 parents. cid1 child.
return 0;
}
|