5 files changed, 48 insertions, 27 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index daef8f6a8..67ab8c9b8 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6008,20 +6008,18 @@ int battle_damage_area(struct block_list *bl, va_list ap) {
 	if (bl->type == BL_MOB && BL_UCCAST(BL_MOB, bl)->class_ == MOBID_EMPELIUM)
 		return 0;
 	if( bl != src && battle->check_target(src,bl,BCT_ENEMY) > 0 ) {
-		struct map_session_data *sd = NULL;
 		nullpo_ret(src);
 
 		map->freeblock_lock();
-		sd = BL_CAST(BL_PC, src);
 
 		if (src->type == BL_PC)
-			battle->drain(sd, bl, damage, damage, status_get_race(bl), is_boss(bl));
+			battle->drain(BL_UCAST(BL_PC, src), bl, damage, damage, status_get_race(bl), is_boss(bl));
 		if( amotion )
 			battle->delay_damage(tick, amotion,src,bl,0,CR_REFLECTSHIELD,0,damage,ATK_DEF,0,true);
 		else
 			status_fix_damage(src,bl,damage,0);
 		clif->damage(bl,bl,amotion,dmotion,damage,1,BDT_ENDURE,0);
-		if (src->type != BL_PC || !sd->state.autocast)
+		if (src->type != BL_PC || !BL_UCCAST(BL_PC, src)->state.autocast)
 			skill->additional_effect(src, bl, CR_REFLECTSHIELD, 1, BF_WEAPON|BF_SHORT|BF_NORMAL,ATK_DEF,tick);
 		map->freeblock_unlock();
 	}
diff --git a/src/map/clif.c b/src/map/clif.c
index 040f86a58..b92c3185f 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;
@@ -5752,7 +5749,7 @@ void clif_heal(int fd, int type, int val)
 	int len = packet_len(cmd);
 
 	WFIFOHEAD(fd, len);
-	WFIFOW(fd, 0) = 0x13d;
+	WFIFOW(fd, 0) = cmd;
 	WFIFOW(fd, 2) = type;
 #if PACKETVER < 20150513
 	WFIFOW(fd, 4) = cap_value(val, 0, INT16_MAX);
@@ -14219,7 +14216,9 @@ void clif_ranklist_sub(unsigned char *buf, enum fame_list_type type) {
 }
 
 /// 097d <RankingType>.W {<CharName>.24B <point>L}*10 <mypoint>L (ZC_ACK_RANKING)
-void clif_ranklist(struct map_session_data *sd, enum fame_list_type type) {
+void clif_ranklist(struct map_session_data *sd, enum fame_list_type type)
+{
+#if PACKETVER >= 20120502
 	int fd;
 	int mypoint = 0;
 	int upperMask;
@@ -14243,6 +14242,7 @@ void clif_ranklist(struct map_session_data *sd, enum fame_list_type type) {
 
 	WFIFOL(fd, 284) = mypoint; //mypoint
 	WFIFOSET(fd, 288);
+#endif
 }
 
 void clif_parse_ranklist(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -17633,7 +17633,9 @@ void clif_snap( struct block_list *bl, short x, short y ) {
 #endif
 }
 
-void clif_monster_hp_bar( struct mob_data* md, struct map_session_data *sd ) {
+void clif_monster_hp_bar(struct mob_data *md, struct map_session_data *sd)
+{
+#if PACKETVER >= 20120228
 	struct packet_monster_hp p;
 
 	nullpo_retv(md);
@@ -17644,6 +17646,7 @@ void clif_monster_hp_bar( struct mob_data* md, struct map_session_data *sd ) {
 	p.MaxHP = md->status.max_hp;
 
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
+#endif
 }
 
 /* [Ind/Hercules] placeholder for unsupported incoming packets (avoids server disconnecting client) */
@@ -18163,7 +18166,9 @@ void clif_parse_BankWithdraw(int fd, struct map_session_data *sd)
 }
 
 void clif_parse_BankCheck(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
-void clif_parse_BankCheck(int fd, struct map_session_data* sd) {
+void clif_parse_BankCheck(int fd, struct map_session_data* sd)
+{
+#if PACKETVER >= 20130313
 	struct packet_banking_check p;
 
 	if (!battle_config.feature_banking) {
@@ -18176,6 +18181,7 @@ void clif_parse_BankCheck(int fd, struct map_session_data* sd) {
 	p.Reason = (short)0;
 
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
+#endif
 }
 
 void clif_parse_BankOpen(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
@@ -18188,7 +18194,9 @@ void clif_parse_BankClose(int fd, struct map_session_data* sd) {
 	return;
 }
 
-void clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason) {
+void clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason)
+{
+#if PACKETVER >= 20130313
 	struct packet_banking_deposit_ack p;
 
 	nullpo_retv(sd);
@@ -18198,9 +18206,12 @@ void clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK r
 	p.Reason = (short)reason;
 
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
+#endif
 }
 
-void clif_bank_withdraw(struct map_session_data *sd,enum e_BANKING_WITHDRAW_ACK reason) {
+void clif_bank_withdraw(struct map_session_data *sd,enum e_BANKING_WITHDRAW_ACK reason)
+{
+#if PACKETVER >= 20130313
 	struct packet_banking_withdraw_ack p;
 
 	nullpo_retv(sd);
@@ -18210,6 +18221,7 @@ void clif_bank_withdraw(struct map_session_data *sd,enum e_BANKING_WITHDRAW_ACK
 	p.Reason = (short)reason;
 
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
+#endif
 }
 
 /* TODO: official response packet (tried 0x8cb/0x97b but the display was quite screwed up.) */
@@ -18466,6 +18478,7 @@ void clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid, i
 void clif_parse_RouletteOpen(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /* Roulette System [Yommy/Hercules] */
 void clif_parse_RouletteOpen(int fd, struct map_session_data* sd) {
+#if PACKETVER >= 20140612
 	struct packet_roulette_open_ack p;
 
 	if( !battle_config.feature_roulette ) {
@@ -18484,10 +18497,13 @@ void clif_parse_RouletteOpen(int fd, struct map_session_data* sd) {
 	p.SilverPoint = pc_readglobalreg(sd, script->add_str("TmpRouletteSilver"));
 
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
+#endif
 }
 
 void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
-void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) {
+void clif_parse_RouletteInfo(int fd, struct map_session_data* sd)
+{
+#if PACKETVER >= 20140612
 	struct packet_roulette_info_ack p;
 	unsigned short i, j, count = 0;
 
@@ -18510,7 +18526,7 @@ void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) {
 		}
 	}
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
-	return;
+#endif
 }
 
 void clif_parse_RouletteClose(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
@@ -18584,7 +18600,9 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) __attribut
 /**
  * Request to cash in!
  **/
-void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) {
+void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd)
+{
+#if PACKETVER >= 20140612
 	struct packet_roulette_itemrecv_ack p;
 
 	if( !battle_config.feature_roulette ) {
@@ -18627,7 +18645,7 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) {
 		p.Result = RECV_ITEM_FAILED;
 
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
-	return;
+#endif
 }
 
 bool clif_parse_roulette_db(void) {
@@ -18722,7 +18740,9 @@ bool clif_parse_roulette_db(void) {
 /**
  *
  **/
-void clif_roulette_generate_ack(struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, short bonusItemID) {
+void clif_roulette_generate_ack(struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, short bonusItemID)
+{
+#if PACKETVER >= 20140612
 	struct packet_roulette_generate_ack p;
 
 	nullpo_retv(sd);
@@ -18736,6 +18756,7 @@ void clif_roulette_generate_ack(struct map_session_data *sd, unsigned char resul
 	p.RemainSilver = pc_readglobalreg(sd, script->add_str("TmpRouletteSilver"));
 
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
+#endif
 }
 
 /**
@@ -18743,6 +18764,7 @@ void clif_roulette_generate_ack(struct map_session_data *sd, unsigned char resul
  */
 void clif_openmergeitem(int fd, struct map_session_data *sd)
 {
+#if PACKETVER > 20120228
 	int i = 0, n = 0, j = 0;
 	struct merge_item merge_items[MAX_INVENTORY];
 	struct merge_item *merge_items_[MAX_INVENTORY] = {0};
@@ -18785,6 +18807,7 @@ void clif_openmergeitem(int fd, struct map_session_data *sd)
 	for ( i = 0; i < j; i++ )
 		WFIFOW(fd,i*2+4) = merge_items_[i]->position;
 	WFIFOSET(fd,2*j+4);
+#endif
 }
 
 int clif_comparemergeitem(const void *a, const void *b)
@@ -18801,6 +18824,7 @@ int clif_comparemergeitem(const void *a, const void *b)
 
 void clif_ackmergeitems(int fd, struct map_session_data *sd)
 {
+#if PACKETVER > 20120228
 	int i = 0, n = 0, length = 0, count = 0;
 	int16 nameid = 0, indexes[MAX_INVENTORY] = {0}, amounts[MAX_INVENTORY] = {0};
 	struct item item_data;
@@ -18880,6 +18904,7 @@ void clif_ackmergeitems(int fd, struct map_session_data *sd)
 	WFIFOW(fd,4) = count;
 	WFIFOB(fd,6) = MERGEITEM_SUCCESS;
 	WFIFOSET(fd,7);
+#endif
 }
 
 void clif_cancelmergeitem (int fd, struct map_session_data *sd)
diff --git a/src/map/path.c b/src/map/path.c
index f5e08d4df..07b38b740 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -192,10 +192,8 @@ bool path_search_long(struct shootpath_data *spd,struct block_list *bl,int16 m,i
 /// Ensures there is enough space in array to store new element.
 static void heap_push_node(struct node_heap *heap, struct path_node *node)
 {
-#ifndef __clang_analyzer__ // TODO: Figure out why clang's static analyzer doesn't like this
 	BHEAP_ENSURE(*heap, 1, 256);
 	BHEAP_PUSH2(*heap, node, NODE_MINTOPCMP, swap_ptr);
-#endif // __clang_analyzer__
 }
 
 /// Updates path_node in the binary node_heap.
diff --git a/src/map/script.c b/src/map/script.c
index a1efbb3b8..d1aee29bf 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5482,8 +5482,6 @@ bool script_sprintf(struct script_state *st, int start, struct StringBuf *out)
 			safestrncpy(buf, p, len);
 			StrBuf->AppendStr(out, buf);
 		}
-
-		p = np;
 		np++;
 
 		// placeholder = "%%" ; (special case)
diff --git a/src/map/status.c b/src/map/status.c
index 5e65244ef..37efe1f93 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3806,13 +3806,15 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
 	}
 
 	if(flag&SCB_CRI && bst->cri) {
-		if (st->luk == bst->luk)
+		if (st->luk == bst->luk) {
 			st->cri = status->calc_critical(bl, sc, bst->cri, true);
-		else
+		} else {
 			st->cri = status->calc_critical(bl, sc, bst->cri + 3*(st->luk - bst->luk), true);
+		}
+		if (battle_config.show_katar_crit_bonus && bl->type == BL_PC && BL_UCAST(BL_PC, bl)->status.weapon == W_KATAR) {
+			st->cri *= 2;
+		}
 	}
-	if (battle_config.show_katar_crit_bonus && bl->type == BL_PC && BL_UCAST(BL_PC, bl)->status.weapon == W_KATAR)
-		st->cri <<= 1;
 
 	if(flag&SCB_FLEE2 && bst->flee2) {
 		if (st->luk == bst->luk)