summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-09-15 15:29:16 +0200
committerHaru <haru@dotalux.com>2016-10-07 01:10:28 +0200
commitc5780deadbda31d4a76e7f4ded866d769c2a1151 (patch)
tree42a3c979fa9f96ddfe014f485115dffc4e9883d3 /src/map/clif.c
parent953feee90e47d75449151834707a165f9ce57fda (diff)
downloadhercules-c5780deadbda31d4a76e7f4ded866d769c2a1151.tar.gz
hercules-c5780deadbda31d4a76e7f4ded866d769c2a1151.tar.bz2
hercules-c5780deadbda31d4a76e7f4ded866d769c2a1151.tar.xz
hercules-c5780deadbda31d4a76e7f4ded866d769c2a1151.zip
Fixed some issues detected by clang's static analyzer (Xcode 8/macOS Sierra)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c5
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;