Переглянути джерело

- Fixed a typo which made the wedding_ignore_palette setting not work when you log on with them equipped

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9353 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 18 роки тому
батько
коміт
0f2e649828
2 змінених файлів з 4 додано та 2 видалено
  1. 2 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/status.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/11/28
+	* Fixed a typo which made the wedding_ignore_palette setting not work when
+	  you log on with them equipped [Skotlex]
 	* Applied The Ultra Mage's patch to use strict npc header formatting
 	  parsing. Updated the relevant stock scripts/mapflags that didn't conform to
 	  the standard. [Skotlex]

+ 2 - 2
src/map/status.c

@@ -4318,8 +4318,8 @@ void status_set_viewdata(struct block_list *bl, int class_)
 	}
 	vd = status_get_viewdata(bl);
 	if (vd && vd->cloth_color && (
-		(vd->class_==JOB_WEDDING && !battle_config.wedding_ignorepalette)
-		|| (vd->class_==JOB_XMAS && !battle_config.xmas_ignorepalette)
+		(vd->class_==JOB_WEDDING && battle_config.wedding_ignorepalette)
+		|| (vd->class_==JOB_XMAS && battle_config.xmas_ignorepalette)
 	))
 		vd->cloth_color = 0;
 }