summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f9566f4ae..2f88f4fa1 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/16
+ * Fixed option value being reset'ed on login (fixes cart/peco/falcon being
+ lost) [Skotlex]
* Corrected @speed to alter your base speed instead of battle one. Means
the change remains for much longer (until status_calc_pc is invoked, which
could be due to equipping/unequipping stuff) [Skotlex]
diff --git a/src/map/pc.c b/src/map/pc.c
index d88c0cc32..5a57d69e2 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -634,6 +634,7 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
pc_setinventorydata(sd);
pc_checkitem(sd);
+ status_change_init(&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);
@@ -643,7 +644,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
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;