diff options
| author | shennetsind <ind@henn.et> | 2014-03-14 13:41:49 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-03-14 13:41:49 -0300 |
| commit | 2cc2a97b574a9485394c6da315b38b9cf362c277 (patch) | |
| tree | a46d1ca0b138d7973e847e57b7234919b0f69d64 /src/map/clif.c | |
| parent | f4b1ff7426b1c4cd5e8cac37f7e3983cc03c706e (diff) | |
| parent | 1849d357210bc3d01be99e1a7cd5e8c19e5d53f4 (diff) | |
| download | hercules-2cc2a97b574a9485394c6da315b38b9cf362c277.tar.gz hercules-2cc2a97b574a9485394c6da315b38b9cf362c277.tar.bz2 hercules-2cc2a97b574a9485394c6da315b38b9cf362c277.tar.xz hercules-2cc2a97b574a9485394c6da315b38b9cf362c277.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index cf6257628..31f2e07c1 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11109,16 +11109,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)); } |