diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-15 22:23:47 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-15 22:23:47 +0000 |
commit | 8c302479047fcd9f185bbbefcad621f47d8b9208 (patch) | |
tree | a9e0fcf1cf9613577d3ae1059766cbd4c81b4693 /src | |
parent | f996ce97b548a4919e3ecbf930279ed7e0214e47 (diff) | |
download | hercules-8c302479047fcd9f185bbbefcad621f47d8b9208.tar.gz hercules-8c302479047fcd9f185bbbefcad621f47d8b9208.tar.bz2 hercules-8c302479047fcd9f185bbbefcad621f47d8b9208.tar.xz hercules-8c302479047fcd9f185bbbefcad621f47d8b9208.zip |
- Fixed "wedding_ignore_palette: yes" not working when relogging with the gear already equipped.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7189 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/pc.c | 10 |
1 files changed, 5 insertions, 5 deletions
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;
|