diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-28 21:14:42 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-28 21:14:42 +0000 |
| commit | 3e08b644b046448f1e0697cc2b63d310e1390a66 (patch) | |
| tree | 6d7259883a7b785bac9125d0b7142ddd87f8208a | |
| parent | 84b9be5ace46f9848ce664e1896c4b4c9bf58889 (diff) | |
| download | hercules-3e08b644b046448f1e0697cc2b63d310e1390a66.tar.gz hercules-3e08b644b046448f1e0697cc2b63d310e1390a66.tar.bz2 hercules-3e08b644b046448f1e0697cc2b63d310e1390a66.tar.xz hercules-3e08b644b046448f1e0697cc2b63d310e1390a66.zip | |
- Fixed a typo which made the wedding_ignore_palette setting not work when you log on with them equipped
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9353 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0241ccd41..fab7018b1 100644 --- a/Changelog-Trunk.txt +++ b/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]
diff --git a/src/map/status.c b/src/map/status.c index 51914dede..164c6f4e6 100644 --- a/src/map/status.c +++ b/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;
}
|