diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-20 01:09:31 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-20 01:09:31 +0000 |
| commit | 558c681aac46514ef406668f9d28dae34e778ec4 (patch) | |
| tree | cad86427b64ec4d244c616f49a2f84c998d2f1a6 | |
| parent | 6bd4e62a427a7d583b287e6969a682a0fa1c5230 (diff) | |
| download | hercules-558c681aac46514ef406668f9d28dae34e778ec4.tar.gz hercules-558c681aac46514ef406668f9d28dae34e778ec4.tar.bz2 hercules-558c681aac46514ef406668f9d28dae34e778ec4.tar.xz hercules-558c681aac46514ef406668f9d28dae34e778ec4.zip | |
* Fixed pc_marriage not checking spouse character job for baby class.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14471 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 72c556c78..1fdf5768e 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -10,6 +10,7 @@ Date Added * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei] * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei] * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei] + * Fixed pc_marriage not checking spouse character job for baby class. [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/map/pc.c b/src/map/pc.c index 433b67b46..e93ae8a93 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7394,7 +7394,7 @@ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) { if(sd == NULL || dstsd == NULL || sd->status.partner_id > 0 || dstsd->status.partner_id > 0 || - sd->class_&JOBL_BABY) + (sd->class_&JOBL_BABY) || (dstsd->class_&JOBL_BABY)) return -1; sd->status.partner_id = dstsd->status.char_id; dstsd->status.partner_id = sd->status.char_id; |