diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8146ab25b..cfe5dd688 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/06/15
+ * Fixed "wedding_ignore_palette: yes" not working when relogging with the
+ gear already equipped. [Skotlex]
* Added blocking of the Kick skills when you are a Soul Linker. [Skotlex]
* Added enabling to turn off a kick-stance regardless of class. [Skotlex]
* Altered a bit how status_set_viewdata behaves in regards to Wedding/Xmas
diff --git a/src/map/pc.c b/src/map/pc.c index b76856dcb..c3e533a21 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -634,11 +634,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t pc_setinventorydata(sd);
pc_checkitem(sd);
- //Set here because we need the inventory data for weapon sprite parsing.
- status_set_viewdata(&sd->bl, sd->status.class_);
- status_change_init(&sd->bl);
- unit_dataset(&sd->bl);
-
if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) &&
(pc_isGM(sd) >= get_atcommand_level(AtCommand_Hide)))
sd->status.option &= (OPTION_MASK | OPTION_INVISIBLE);
@@ -646,6 +641,11 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t sd->status.option &= OPTION_MASK;
sd->sc.option = sd->status.option; //This is the actual option used in battle.
+ //Set here because we need the inventory data for weapon sprite parsing.
+ status_set_viewdata(&sd->bl, sd->status.class_);
+ status_change_init(&sd->bl);
+ unit_dataset(&sd->bl);
+
sd->guild_x = -1;
sd->guild_y = -1;
|