From 2f9a514a7118724e2954ac96c67e7396ec61d0b4 Mon Sep 17 00:00:00 2001 From: malufett Date: Wed, 12 Mar 2014 18:32:00 +0800 Subject: Fixed Bug#8073 -http://hercules.ws/board/tracker/issue-8073-removing-magic-gear-and-cart/?gopid=22195#entry22195 Signed-off-by: malufett --- src/map/clif.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/map/clif.c b/src/map/clif.c index c61a72597..fc8761087 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11113,16 +11113,16 @@ void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd) /// 012a void clif_parse_RemoveOption(int fd,struct map_session_data *sd) { - /** - * Attempts to remove these options when this function is called (will remove all available) - **/ -#ifdef NEW_CARTS - pc->setoption(sd,sd->sc.option&~(OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR)); - if( sd->sc.data[SC_PUSH_CART] ) + if( !(sd->sc.option&(OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR)) +#ifdef NEW_CARTS + && sd->sc.data[SC_PUSH_CART] ){ pc->setcart(sd,0); #else - pc->setoption(sd,sd->sc.option&~(OPTION_CART|OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR)); + ){ + pc->setoption(sd,sd->sc.option&~OPTION_CART); #endif + }else // priority to remove this option before we can clear cart + pc->setoption(sd,sd->sc.option&~(OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR)); } -- cgit v1.2.3-70-g09d2