diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 22:31:16 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 22:31:16 +0000 |
| commit | 4f499fb621d773df8fde389b2b3a281b866b3213 (patch) | |
| tree | 7b7fd6d445be0db0170c178e622cf39d78c5dab4 | |
| parent | 4b83969a25118fc099d72f043bf8e366ec478d36 (diff) | |
| download | hercules-4f499fb621d773df8fde389b2b3a281b866b3213.tar.gz hercules-4f499fb621d773df8fde389b2b3a281b866b3213.tar.bz2 hercules-4f499fb621d773df8fde389b2b3a281b866b3213.tar.xz hercules-4f499fb621d773df8fde389b2b3a281b866b3213.zip | |
- Fixed option value being reset'ed on login (fixes cart/peco/falcon being lost)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7217 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
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;
|