From 2f2066f741111325b2510c6526b41b22dea93370 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 15 Jun 2006 18:56:54 +0000 Subject: - Altered a bit how status_set_viewdata behaves in regards to Wedding/Xmas options. - Added back OPTION_XMAS, but the actual value is missing! - Corrected chrif_save so that the player is not set offline on map-change. - Added change-look support in pc_setoption when specifying OPTION_XMAS - Fixed clif_parse_RemoveOption removing all options instead of just Falcon/Cart/Peco git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7183 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/clif.c') 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)); } /*========================================== -- cgit v1.2.3-70-g09d2