Преглед на файлове

* Fixed pc_marriage not checking spouse character job for baby class.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14471 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei преди 14 години
родител
ревизия
9c50c4006b
променени са 2 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 1 0
      Changelog-Renewal.txt
  2. 1 1
      src/map/pc.c

+ 1 - 0
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

+ 1 - 1
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;