diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-07 02:40:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 02:40:56 +0300 |
| commit | 90ec4a40d04100d0c7d1d5e1f80c12742e8883d3 (patch) | |
| tree | a1234320efa4f33b6c6f18f9b197be7aabdd7415 /src/map/clif.c | |
| parent | 336c264a324d708a3b5a72c1c086b74dc76c1b0f (diff) | |
| parent | 872fc8d4f4a8ea60a1d97da4ca724c7b70e1af18 (diff) | |
| download | hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.tar.gz hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.tar.bz2 hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.tar.xz hercules-90ec4a40d04100d0c7d1d5e1f80c12742e8883d3.zip | |
Merge pull request #1464 from MishimaHaruna/variousfixes
Build / CI improvements
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 040f86a58..3e6b4937b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3249,10 +3249,7 @@ void clif_changelook(struct block_list *bl,int type,int val) #endif break; case LOOK_BODY2: - if (val && ( - sd->sc.option&OPTION_WEDDING || sd->sc.option&OPTION_XMAS || - sd->sc.option&OPTION_SUMMER || sd->sc.option&OPTION_HANBOK || - sd->sc.option&OPTION_OKTOBERFEST)) + if (sd != NULL && (sd->sc.option&OPTION_COSTUME) != OPTION_NOTHING) val = 0; vd->body_style = val; break; |