summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index f895a7579..ba24dd3b1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2725,10 +2725,10 @@ int clif_changelook(struct block_list *bl,int type,int val)
vd->hair_color = val;
break;
case LOOK_CLOTHES_COLOR:
- if (
+ if (val && (
(vd->class_ == JOB_WEDDING && battle_config.wedding_ignorepalette) ||
(vd->class_ == JOB_XMAS && battle_config.xmas_ignorepalette)
- )
+ ))
val = 0;
vd->cloth_color = val;
break;
@@ -9404,7 +9404,8 @@ void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
*/
void clif_parse_RemoveOption(int fd,struct map_session_data *sd)
{
- pc_setoption(sd,0);
+ //Can only remove Cart/Riding/Falcon.
+ pc_setoption(sd,sd->sc.option&~(OPTION_CART|OPTION_RIDING|OPTION_FALCON));
}
/*==========================================