diff options
| -rw-r--r-- | Changelog-Renewal.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 72c556c78..1fdf5768e 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.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; |