More aggressive whitespace cleanup. Follow up to 51329e6

Signed-off-by: Haru <haru@dotalux.com>

31 files changed, 1178 insertions, 1917 deletions

diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index 0bd231e3a..ac78e8c84 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -147,27 +147,27 @@ void HPM_map_plugin_load_sub(struct hplugin *plugin) {
 
 bool HPM_map_add_atcommand(char *name, AtCommandFunc func) {
 	unsigned int i = 0;
-	
+
 	for(i = 0; i < atcommand_list_items; i++) {
 		if( !strcmpi(atcommand_list[i].name,name) ) {
 			ShowDebug("HPM_map_add_atcommand: duplicate command '%s', skipping...\n", name);
 			return false;
 		}
 	}
-	
+
 	i = atcommand_list_items;
-	
+
 	RECREATE(atcommand_list, struct HPM_atcommand_list , ++atcommand_list_items);
-	
+
 	safestrncpy(atcommand_list[i].name, name, sizeof(atcommand_list[i].name));
 	atcommand_list[i].func = func;
-	
+
 	return true;
 }
 
 void HPM_map_atcommands(void) {
 	unsigned int i;
-	
+
 	for(i = 0; i < atcommand_list_items; i++) {
 		atcommand->add(atcommand_list[i].name,atcommand_list[i].func,true);
 	}
@@ -178,9 +178,9 @@ void HPM_map_atcommands(void) {
  **/
 void HPM_map_add_group_permission(unsigned int pluginID, char *name, unsigned int *mask) {
 	unsigned char index = pcg->HPMpermissions_count;
-	
+
 	RECREATE(pcg->HPMpermissions, struct pc_groups_new_permission, ++pcg->HPMpermissions_count);
-	
+
 	pcg->HPMpermissions[index].pID = pluginID;
 	pcg->HPMpermissions[index].name = aStrdup(name);
 	pcg->HPMpermissions[index].mask = mask;
@@ -207,6 +207,5 @@ void HPM_map_do_final(void) {
 		}
 		aFree(pcg->HPMpermissions);
 	}
-	
 	HPM->datacheck_final();
 }
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7277f8f08..beeccaddd 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -123,7 +123,7 @@ bool msg_config_read(const char *cfg_name, bool allow_override) {
 		ShowError("Messages file not found: %s\n", cfg_name);
 		return false;
 	}
-	
+
 	if( !atcommand->max_message_table )
 		atcommand->expand_message_table();
 
@@ -152,9 +152,8 @@ bool msg_config_read(const char *cfg_name, bool allow_override) {
 			}
 		}
 	}
-
 	fclose(fp);
-	
+
 	if( ++called == 1 ) { //Original
 		if( script->lang_export_fp ) {
 			int i;
@@ -178,7 +177,7 @@ bool msg_config_read(const char *cfg_name, bool allow_override) {
  *------------------------------------------*/
 void do_final_msg(void) {
 	int i, j;
-	
+
 	for(i = 0; i < atcommand->max_message_table; i++) {
 		for (j = 0; j < MAX_MSG; j++) {
 			if( atcommand->msg_table[i][j] )
@@ -186,7 +185,7 @@ void do_final_msg(void) {
 		}
 		aFree(atcommand->msg_table[i]);
 	}
-	
+
 	if( atcommand->msg_table )
 		aFree(atcommand->msg_table);
 }
@@ -198,8 +197,6 @@ static inline const char* atcommand_help_string(AtCommandInfo *info) {
 	return info->help;
 }
 
-
-
 /*==========================================
  * @send (used for testing packet sends from the client)
  *------------------------------------------*/
@@ -862,7 +859,6 @@ ACMD(storage)
 	return true;
 }
 
-
 /*==========================================
  *
  *------------------------------------------*/
@@ -1106,7 +1102,7 @@ ACMD(heal)
 	// some overflow checks
 	if( hp == INT_MIN ) hp++;
 	if( sp == INT_MIN ) sp++;
-	
+
 	if ( hp == 0 && sp == 0 ) {
 		if (!status_percent_heal(&sd->bl, 100, 100))
 			clif->message(fd, msg_fd(fd,157)); // HP and SP have already been recovered.
@@ -4610,7 +4606,6 @@ ACMD(jailfor) {
 	return true;
 }
 
-
 //By Coltaro
 ACMD(jailtime)
 {
@@ -4768,7 +4763,6 @@ ACMD(disguiseguild)
 	return true;
 }
 
-
 /*==========================================
  * @undisguise by [Yor]
  *------------------------------------------*/
@@ -4858,7 +4852,6 @@ ACMD(exp)
 	return true;
 }
 
-
 /*==========================================
  * @broadcast by [Valaris]
  *------------------------------------------*/
@@ -5103,7 +5096,6 @@ ACMD(follow) {
 	return true;
 }
 
-
 /*==========================================
  * @dropall by [MouseJstr]
  * Drop all your possession on the ground
@@ -6627,7 +6619,6 @@ ACMD(mobinfo)
 				monster->status.vit, monster->status.int_, monster->status.dex, monster->status.luk);
 		clif->message(fd, atcmd_output);
 
-		
 #ifdef RENEWAL
 		safesnprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd,1291), //  ATK : %d~%d MATK : %d~%d Range : %d~%d~%d  Size : %s  Race : %s  Element : %s(Lv : %d)
 				MOB_ATK1(monster), MOB_ATK2(monster), MOB_MATK1(monster), MOB_MATK2(monster), monster->status.rhw.range,
@@ -7311,7 +7302,6 @@ ACMD(mutearea) {
 	return true;
 }
 
-
 ACMD(rates)
 {
 	char buf[CHAT_SIZE_MAX];
@@ -7748,7 +7738,6 @@ ACMD(duel) {
 	return true;
 }
 
-
 ACMD(leave) {
 	if (sd->duel_group <= 0) {
 		// "Duel: @leave without @duel."
@@ -9306,7 +9295,7 @@ ACMD(skdebug) {
 ACMD(cddebug) {
 	int i;
 	struct skill_cd* cd = NULL;
-	
+
 	if (!(cd = idb_get(skill->cd_db,sd->status.char_id))) {
 		clif->message(fd,"No cool down list found");
 	} else {
@@ -9314,7 +9303,7 @@ ACMD(cddebug) {
 		for(i = 0; i < cd->cursor; i++) {
 			if( cd->entry[i] ) {
 				const struct TimerData *td = timer->get(cd->entry[i]->timer);
-				
+
 				if( !td || td->func != skill->blockpc_end ) {
 					clif->messages(fd,"Found invalid entry in slot %d for skill %s",i,skill->dbs->db[cd->entry[i]->skidx].name);
 					sd->blockskill[cd->entry[i]->skidx] = false;
@@ -9322,7 +9311,7 @@ ACMD(cddebug) {
 			}
 		}
 	}
-	
+
 	if (!cd || (*message && !strcmpi(message,"reset"))) {
 		for(i = 0; i < MAX_SKILL; i++) {
 			if( sd->blockskill[i] ) {
@@ -9336,12 +9325,12 @@ ACMD(cddebug) {
 				timer->delete(cd->entry[i]->timer,skill->blockpc_end);
 				ers_free(skill->cd_entry_ers, cd->entry[i]);
 			}
-			
+
 			idb_remove(skill->cd_db,sd->status.char_id);
 			ers_free(skill->cd_ers, cd);
 		}
 	}
-	
+
 	return true;
 }
 
@@ -9350,7 +9339,7 @@ ACMD(cddebug) {
  **/
 ACMD(lang) {
 	uint8 i;
-	
+
 	if (!*message) {
 		clif->messages(fd,"Usage: @%s <Language>",info->command);
 		clif->messages(fd,"There are %d languages available:",script->max_lang_id);
@@ -9358,7 +9347,7 @@ ACMD(lang) {
 			clif->messages(fd,"- %s",script->languages[i]);
 		return false;
 	}
-	
+
 	for(i = 0; i < script->max_lang_id; i++) {
 		if( strcmpi(message,script->languages[i]) == 0 ) {
 			if( i == sd->lang_id ) {
@@ -9370,14 +9359,14 @@ ACMD(lang) {
 			break;
 		}
 	}
-	
+
 	if( i == script->max_lang_id ) {
 		clif->messages(fd,"'%s' did not match any language available",message);
 		clif->messages(fd,"There are %d languages available:",script->max_lang_id);
 		for(i = 0; i < script->max_lang_id; i++)
 			clif->messages(fd,"- %s",script->languages[i]);
 	}
-	
+
 	return true;
 }
 /**
diff --git a/src/map/battle.c b/src/map/battle.c
index d7f12aba9..15db4d88c 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -104,7 +104,6 @@ struct block_list* battle_gettargeted(struct block_list *target) {
 	return bl_list[rnd()%c];
 }
 
-
 //Returns the id of the current targeted character of the passed bl. [Skotlex]
 int battle_gettarget(struct block_list* bl) {
 
@@ -273,7 +272,7 @@ int battle_delay_damage(int64 tick, int amotion, struct block_list *src, struct
 
 	if (d_tbl && sc && check_distance_bl(target, d_tbl, sc->data[SC_DEVOTION]->val3) && damage > 0 && skill_id != PA_PRESSURE && skill_id != CR_REFLECTSHIELD)
 		damage = 0;
-	
+
 	if ( !battle_config.delay_battle_damage || amotion <= 1 ) {
 		map->freeblock_lock();
 		status_fix_damage(src, target, damage, ddelay); // We have to separate here between reflect damage and others [icescope]
@@ -460,7 +459,7 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
 		if( sc->data[SC_ZENKAI] && watk->ele == sc->data[SC_ZENKAI]->val2 )
 			eatk += 200;
 	}
-	
+
 #ifdef RENEWAL_EDP
 	if ( sc && sc->data[SC_EDP] && skill_id != AS_GRIMTOOTH && skill_id != AS_VENOMKNIFE && skill_id != ASC_BREAKER ) {
 		struct status_data *tstatus;
@@ -470,9 +469,8 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
 	} else /* fall through */
 #endif
 	damage += eatk;
-	
 	damage = battle->calc_elefix(src, bl, skill_id, skill_lv, damage, nk, n_ele, s_ele, s_ele_, type == EQI_HAND_L, flag);
-	
+
 	/**
 	 * In RE Shield Boomerang takes weapon element only for damage calculation,
 	 * - resist calculation is always against neutral
@@ -969,11 +967,10 @@ int64 battle_calc_cardfix2(struct block_list *src, struct block_list *bl, int64
 // FIXME: wflag is undocumented
 int64 battle_calc_cardfix(int attack_type, struct block_list *src, struct block_list *target, int nk, int s_ele, int s_ele_, int64 damage, int cflag, int wflag){
 	struct map_session_data *sd, *tsd;
-	short cardfix = 
 #ifdef RENEWAL
-		100;
+	short cardfix = 100;
 #else
-		1000;
+	short cardfix = 1000;
 #endif
 	short t_class, s_class, s_race2, t_race2;
 	struct status_data *sstatus, *tstatus;
@@ -2884,7 +2881,6 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 			return 0;
 		}
 
-
 		if( (sce=sc->data[SC_PARRYING]) && flag&BF_WEAPON && skill_id != WS_CARTTERMINATION && rnd()%100 < sce->val2 )
 		{ // attack blocked by Parrying
 			clif->skill_nodamage(bl, bl, LK_PARRYING, sce->val1,1);
@@ -3136,7 +3132,6 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 		if( sc->data[SC_MEIKYOUSISUI] && rnd()%100 < 40 ) // custom value
 			damage = 0;
 
-
 		if (!damage) return 0;
 
 		if( (sce = sc->data[SC_LIGHTNINGWALK]) && flag&BF_LONG && rnd()%100 < sce->val1 ) {
@@ -4904,7 +4899,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 				else
 					wd.dmg_lv = ATK_DEF;
 				break;
-				
+
 			case KO_BAKURETSU:
 			{
 #ifdef RENEWAL
@@ -5542,7 +5537,6 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 #endif
 		}
 
-
 		if( src != target ) { // Don't reflect your own damage (Grand Cross)
 			if( wd.dmg_lv == ATK_MISS || wd.dmg_lv == ATK_BLOCK ) {
 				int64 prev1 = wd.damage, prev2 = wd.damage2;
@@ -6394,7 +6388,6 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 	switch( target->type ) { // Checks on actual target
 		case BL_PC: {
 				struct status_change* sc = status->get_sc(src);
-			
 				if( ((TBL_PC*)target)->invincible_timer != INVALID_TIMER ) {
 					switch( battle->get_current_skill(src) ) {
 						/* TODO a proper distinction should be established bugreport:8397 */
@@ -6433,7 +6426,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 			TBL_SKILL *su = (TBL_SKILL*)target;
 			if( !su->group )
 				return 0;
-			if( skill->get_inf2(su->group->skill_id)&INF2_TRAP && 
+			if( skill->get_inf2(su->group->skill_id)&INF2_TRAP &&
 				su->group->unit_id != UNT_USED_TRAPS &&
 				su->group->unit_id != UNT_NETHERWORLD ) { //Only a few skills can target traps...
 				switch( battle->get_current_skill(src) ) {
@@ -7401,7 +7394,6 @@ void battle_adjust_conf(void) {
 	}
 #endif
 
-
 #ifndef CELL_NOSTACK
 	if (battle_config.custom_cell_stack_limit != 1)
 		ShowWarning("Battle setting 'custom_cell_stack_limit' takes no effect as this server was compiled without Cell Stack Limit support.\n");
diff --git a/src/map/battleground.c b/src/map/battleground.c
index a92b3faef..5df05d301 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -906,7 +906,6 @@ void do_final_battleground(void)
 		}
 		aFree(bg->arena);
 	}
-	
 }
 void battleground_defaults(void) {
 	bg = &bg_s;
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 2df7e19b8..1e376e3bc 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -482,7 +482,6 @@ int chrif_reconnect(DBKey key, DBData *data, va_list ap) {
 	return 0;
 }
 
-
 /// Called when all the connection steps are completed.
 void chrif_on_ready(void) {
 	static bool once = false;
@@ -512,7 +511,6 @@ void chrif_on_ready(void) {
 	}
 }
 
-
 /*==========================================
  *
  *------------------------------------------*/
@@ -659,7 +657,6 @@ void chrif_authfail(int fd) {/* HELLO WORLD. ip in RFIFOL 15 is not being used (
 	}
 }
 
-
 /**
  * This can still happen (client times out while waiting for char to confirm auth data)
  * @see DBApply
@@ -797,7 +794,7 @@ bool chrif_char_ask_name(int acc, const char* character_name, unsigned short ope
 
 /**
  * Requests a sex change (either per character or per account).
- * 
+ *
  * @param sd             The character's data.
  * @param change_account Whether to change the per-account sex.
  * @retval true.
@@ -1230,7 +1227,6 @@ bool chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) {
 	return true;
 }
 
-
 /*=========================================
  * Tell char-server character disconnected [Wizputer]
  *-----------------------------------------*/
@@ -1301,7 +1297,6 @@ void chrif_on_disconnect(void) {
 	timer->add(timer->gettick() + 1000, chrif->check_connect_char_server, 0, 0);
 }
 
-
 void chrif_update_ip(int fd) {
 	uint32 new_ip;
 
@@ -1658,7 +1653,6 @@ void do_init_chrif(bool minimal) {
 	timer->add_interval(timer->gettick() + 1000, chrif->send_usercount_tochar, 0, 0, UPDATE_INTERVAL);
 }
 
-
 /*=====================================
 * Default Functions : chrif.h
 * Generated by HerculesInterfaceMaker
diff --git a/src/map/clif.c b/src/map/clif.c
index ab5708fc8..0d25be0a6 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -92,7 +92,6 @@ static inline int itemtype(int type) {
 	}
 }
 
-
 static inline void WBUFPOS(uint8* p, unsigned short pos, short x, short y, unsigned char dir) {
 	p += pos;
 	p[0] = (uint8)(x>>2);
@@ -100,7 +99,6 @@ static inline void WBUFPOS(uint8* p, unsigned short pos, short x, short y, unsig
 	p[2] = (uint8)((y<<4) | (dir&0xf));
 }
 
-
 // client-side: x0+=sx0*0.0625-0.5 and y0+=sy0*0.0625-0.5
 static inline void WBUFPOS2(uint8* p, unsigned short pos, short x0, short y0, short x1, short y1, unsigned char sx0, unsigned char sy0) {
 	p += pos;
@@ -646,7 +644,6 @@ void clif_authok(struct map_session_data *sd)
 	p.startTime = (unsigned int)timer->gettick();
 	WBUFPOS(&p.PosDir[0],0,sd->bl.x,sd->bl.y,sd->ud.dir); /* do the stupid client math */
 	p.xSize = p.ySize = 5; /* not-used */
-	
 #if PACKETVER >= 20080102
 	p.font = sd->status.font;
 #endif
@@ -656,7 +653,6 @@ void clif_authok(struct map_session_data *sd)
 	clif->send(&p,sizeof(p),&sd->bl,SELF);
 }
 
-
 /// Notifies the client, that it's connection attempt was refused (ZC_REFUSE_ENTER).
 /// 0074 <error code>.B
 /// error code:
@@ -673,7 +669,6 @@ void clif_authrefuse(int fd, uint8 error_code)
 	WFIFOSET(fd,packet_len(0x74));
 }
 
-
 /// Notifies the client of a ban or forced disconnect (SC_NOTIFY_BAN).
 /// 0081 <error code>.B
 /// error code:
@@ -720,7 +715,6 @@ void clif_authfail_fd(int fd, int type)
 
 }
 
-
 /// Notifies the client, whether it can disconnect and change servers (ZC_RESTART_ACK).
 /// 00b3 <type>.B
 /// type:
@@ -768,8 +762,6 @@ void clif_dropflooritem(struct flooritem_data* fitem) {
 	clif->send(&p, sizeof(p), &fitem->bl, AREA);
 }
 
-
-
 /// Makes an item disappear from the ground.
 /// 00a1 <id>.L (ZC_ITEM_DISAPPEAR)
 void clif_clearflooritem(struct flooritem_data *fitem, int fd)
@@ -790,7 +782,6 @@ void clif_clearflooritem(struct flooritem_data *fitem, int fd)
 	}
 }
 
-
 /// Makes a unit (char, npc, mob, homun) disappear to one client (ZC_NOTIFY_VANISH).
 /// 0080 <id>.L <type>.B
 /// type:
@@ -834,7 +825,6 @@ void clif_clearunit_area(struct block_list* bl, clr_type type)
 	}
 }
 
-
 /// Used to make monsters with player-sprites disappear after dying
 /// like normal monsters, because the client does not remove those
 /// automatically.
@@ -983,7 +973,7 @@ void clif_set_unit_idle(struct block_list* bl, struct map_session_data *tsd, enu
 	int g_id = status->get_guild_id(bl);
 
 	nullpo_retv(bl);
-	
+
 #if PACKETVER < 20091103
 	if( !pc->db_checkid(vd->class_) ) {
 		clif->set_unit_idle2(bl,tsd,target);
@@ -1293,7 +1283,6 @@ void clif_class_change(struct block_list *bl, int class_, int type)
 	}
 }
 
-
 /// Notifies the client of an object's spirits.
 /// 01d0 <id>.L <amount>.W (ZC_SPIRITS)
 /// 01e1 <id>.L <amount>.W (ZC_SPIRITS2)
@@ -1389,7 +1378,6 @@ bool clif_spawn(struct block_list *bl)
 	if (vd->cloth_color)
 		clif->refreshlook(bl,bl->id,LOOK_CLOTHES_COLOR,vd->cloth_color,AREA_WOS);
 
-
 	switch (bl->type) {
 		case BL_PC:
 			{
@@ -1512,7 +1500,6 @@ void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag)
 	clif->send(buf,packet_len(0x22e),&sd->bl,SELF);
 }
 
-
 /// Notification about a change in homunuculus' state (ZC_CHANGESTATE_MER).
 /// 0230 <type>.B <state>.B <id>.L <data>.L
 /// type:
@@ -1621,7 +1608,6 @@ void clif_hom_food(struct map_session_data *sd,int foodid,int fail)
 	return;
 }
 
-
 /// Notifies the client, that it is walking (ZC_NOTIFY_PLAYERMOVE).
 /// 0087 <walk start time>.L <walk data>.6B
 void clif_walkok(struct map_session_data *sd)
@@ -1739,7 +1725,6 @@ void clif_move(struct unit_data *ud)
 #endif
 }
 
-
 /*==========================================
  * Delays the map->quit of a player after they are disconnected. [Skotlex]
  *------------------------------------------*/
@@ -1784,7 +1769,6 @@ void clif_changemap(struct map_session_data *sd, short m, int x, int y) {
 	WFIFOSET(fd,packet_len(0x91));
 }
 
-
 /// Notifies the client of a position change to coordinates on given map, which is on another map-server (ZC_NPCACK_SERVERMOVE).
 /// 0092 <map name>.16B <x>.W <y>.W <ip>.L <port>.W
 void clif_changemapserver(struct map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port) {
@@ -1802,7 +1786,6 @@ void clif_changemapserver(struct map_session_data* sd, unsigned short map_index,
 	WFIFOSET(fd,packet_len(0x92));
 }
 
-
 void clif_blown(struct block_list *bl)
 {
 //Aegis packets says fixpos, but it's unsure whether slide works better or not.
@@ -1811,7 +1794,6 @@ void clif_blown(struct block_list *bl)
 	clif->slide(bl, bl->x, bl->y);
 }
 
-
 /// Visually moves(slides) a character to x,y. If the target cell
 /// isn't walkable, the char doesn't move at all. If the char is
 /// sitting it will stand up (ZC_STOPMOVE).
@@ -1833,7 +1815,6 @@ void clif_fixpos(struct block_list *bl) {
 	}
 }
 
-
 /// Displays the buy/sell dialog of an NPC shop (ZC_SELECT_DEALTYPE).
 /// 00c4 <shop id>.L
 void clif_npcbuysell(struct map_session_data* sd, int id)
@@ -1849,7 +1830,6 @@ void clif_npcbuysell(struct map_session_data* sd, int id)
 	WFIFOSET(fd,packet_len(0xc4));
 }
 
-
 /// Presents list of items, that can be bought in an NPC shop (ZC_PC_PURCHASE_ITEMLIST).
 /// 00c6 <packet len>.W { <price>.L <discount price>.L <item type>.B <name id>.W }*
 void clif_buylist(struct map_session_data *sd, struct npc_data *nd) {
@@ -1912,7 +1892,7 @@ void clif_selllist(struct map_session_data *sd)
 
 			if( sd->status.inventory[i].expire_time )
 				continue; // Cannot Sell Rental Items
- 
+
 			if( sd->status.inventory[i].bound && !pc_can_give_bound_items(sd))
 				continue; // Don't allow sale of bound items
 
@@ -1929,7 +1909,6 @@ void clif_selllist(struct map_session_data *sd)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Displays an NPC dialog message (ZC_SAY_DIALOG).
 /// 00b4 <packet len>.W <npc id>.L <message>.?B
 /// Client behavior (dialog window):
@@ -1956,7 +1935,6 @@ void clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) {
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Adds a 'next' button to an NPC dialog (ZC_WAIT_DIALOG).
 /// 00b5 <npc id>.L
 /// Client behavior (dialog window):
@@ -1980,7 +1958,6 @@ void clif_scriptnext(struct map_session_data *sd, int npcid)
 	WFIFOSET(fd,packet_len(0xb5));
 }
 
-
 /// Adds a 'close' button to an NPC dialog (ZC_CLOSE_DIALOG).
 /// 00b6 <npc id>.L
 /// Client behavior:
@@ -2035,7 +2012,6 @@ void clif_sendfakenpc(struct map_session_data *sd, int npcid) {
 	WFIFOSET(fd, packet_len(0x78));
 }
 
-
 /// Displays an NPC dialog menu (ZC_MENU_LIST).
 /// 00b7 <packet len>.W <npc id>.L <menu items>.?B
 /// Client behavior:
@@ -2078,7 +2054,6 @@ void clif_scriptmenu(struct map_session_data* sd, int npcid, const char* mes) {
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Displays an NPC dialog input box for numbers (ZC_OPEN_EDITDLG).
 /// 0142 <npc id>.L
 /// Client behavior (inputnum window):
@@ -2108,7 +2083,6 @@ void clif_scriptinput(struct map_session_data *sd, int npcid) {
 	WFIFOSET(fd,packet_len(0x142));
 }
 
-
 /// Displays an NPC dialog input box for numbers (ZC_OPEN_EDITDLGSTR).
 /// 01d4 <npc id>.L
 /// Client behavior (inputstr window):
@@ -2138,7 +2112,6 @@ void clif_scriptinputstr(struct map_session_data *sd, int npcid) {
 	WFIFOSET(fd,packet_len(0x1d4));
 }
 
-
 /// Marks a position on client's minimap (ZC_COMPASS).
 /// 0144 <npc id>.L <type>.L <x>.L <y>.L <id>.B <color>.L
 /// npc id:
@@ -2190,7 +2163,6 @@ void clif_cutin(struct map_session_data* sd, const char* image, int type)
 	WFIFOSET(fd,packet_len(0x1b3));
 }
 
-
 /*==========================================
  * Fills in card data from the given item and into the buffer. [Skotlex]
  *------------------------------------------*/
@@ -2314,7 +2286,6 @@ void clif_add_random_options(unsigned char* buf, struct item* item)
 	}
 }
 
-
 /// Notifies the client, about a received inventory item or the result of a pick-up request.
 /// 00a0 <index>.W <amount>.W <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.W <item type>.B <result>.B (ZC_ITEM_PICKUP_ACK)
 /// 029a <index>.W <amount>.W <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.W <item type>.B <result>.B <expire time>.L (ZC_ITEM_PICKUP_ACK2)
@@ -2375,7 +2346,6 @@ void clif_additem(struct map_session_data *sd, int n, int amount, int fail) {
 	clif->send(&p,sizeof(p),&sd->bl,SELF);
 }
 
-
 /// Notifies the client, that an inventory item was deleted or dropped (ZC_ITEM_THROW_ACK).
 /// 00af <index>.W <amount>.W
 void clif_dropitem(struct map_session_data *sd,int n,int amount)
@@ -2392,7 +2362,6 @@ void clif_dropitem(struct map_session_data *sd,int n,int amount)
 	WFIFOSET(fd,packet_len(0xaf));
 }
 
-
 /// Notifies the client, that an inventory item was deleted (ZC_DELETE_ITEM_FROM_BODY).
 /// 07fa <delete type>.W <index>.W <amount>.W
 /// delete type: @see enum delitem_reason
@@ -2416,7 +2385,6 @@ void clif_delitem(struct map_session_data *sd,int n,int amount, short reason)
 #endif
 }
 
-
 // Simplifies inventory/cart/storage packets by handling the packet section relevant to items. [Skotlex]
 // Equip is >= 0 for equippable items (holds the equip-point, is 0 for pet
 // armor/egg) -1 for stackable items, -2 for stackable items where arrows must send in the equip-point.
@@ -2465,7 +2433,6 @@ void clif_item_equip(short idx, struct EQUIPITEM_INFO *p, struct item *i, struct
 
 	p->location = eqp_pos;
 	p->WearState = i->equip;
-	
 #if PACKETVER < 20120925
 	p->IsDamaged = i->attribute ? 1 : 0;
 #endif
@@ -2476,7 +2443,7 @@ void clif_item_equip(short idx, struct EQUIPITEM_INFO *p, struct item *i, struct
 #if PACKETVER >= 20071002
 	p->HireExpireDate = i->expire_time;
 #endif
-	
+
 #if PACKETVER >= 20080102
 	p->bindOnEquipType = i->bound ? 2 : id->flag.bindonequip ? 1 : 0;
 #endif
@@ -2515,18 +2482,18 @@ void clif_item_normal(short idx, struct NORMALITEM_INFO *p, struct item *i, stru
 		p->ITID = i->nameid;
 
 	p->type = itemtype(id->type);
-	
+
 #if PACKETVER < 20120925
 	p->IsIdentified = i->identify ? 1 : 0;
 #endif
 
 	p->count = i->amount;
 	p->WearState = id->equip;
-	
+
 #if PACKETVER >= 5
 	clif->addcards2(&p->slot.card[0], i);
 #endif
-	
+
 #if PACKETVER >= 20080102
 	p->HireExpireDate = i->expire_time;
 #endif
@@ -2692,7 +2659,6 @@ void clif_cartlist(struct map_session_data *sd) {
 	}
 }
 
-
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -2706,7 +2672,6 @@ void clif_clearcart(int fd)
 
 }
 
-
 /// Guild XY locators (ZC_NOTIFY_POSITION_TO_GUILDM) [Valaris]
 /// 01eb <account id>.L <x>.W <y>.W
 void clif_guild_xy(struct map_session_data *sd)
@@ -2923,13 +2888,11 @@ void clif_updatestatus(struct map_session_data *sd,int type)
 			WFIFOL(fd,4)=sd->battle_status.cri/10;
 			break;
 		case SP_MATK1:
-				WFIFOL(fd,4)=pc_rightside_matk(sd);
+			WFIFOL(fd,4)=pc_rightside_matk(sd);
 			break;
 		case SP_MATK2:
-				WFIFOL(fd,4)=pc_leftside_matk(sd);
+			WFIFOL(fd,4)=pc_leftside_matk(sd);
 			break;
-
-
 		case SP_ZENY:
 			WFIFOW(fd,0)=0xb1;
 			WFIFOL(fd,4)=sd->status.zeny;
@@ -3229,7 +3192,6 @@ void clif_refreshlook(struct block_list *bl,int id,int type,int val,enum send_ta
 	clif->sendlook(bl, id, type, val, 0, target);
 }
 
-
 /// Character status (ZC_STATUS).
 /// 00bd <stpoint>.W <str>.B <need str>.B <agi>.B <need agi>.B <vit>.B <need vit>.B
 ///     <int>.B <need int>.B <dex>.B <need dex>.B <luk>.B <need luk>.B <atk>.W <atk2>.W
@@ -3293,7 +3255,6 @@ void clif_initialstatus(struct map_session_data *sd) {
 	clif->updatestatus(sd,SP_ASPD);
 }
 
-
 /// Marks an ammunition item in inventory as equipped (ZC_EQUIP_ARROW).
 /// 013c <index>.W
 void clif_arrowequip(struct map_session_data *sd,int val)
@@ -3312,7 +3273,6 @@ void clif_arrowequip(struct map_session_data *sd,int val)
 	WFIFOSET(fd,packet_len(0x013c));
 }
 
-
 /// Ammunition action message (ZC_ACTION_FAILURE).
 /// 013b <type>.W
 /// type:
@@ -3335,7 +3295,6 @@ void clif_arrow_fail(struct map_session_data *sd,int type)
 	WFIFOSET(fd,packet_len(0x013b));
 }
 
-
 /// Presents a list of items, that can be processed by Arrow Crafting (ZC_MAKINGARROW_LIST).
 /// 01ad <packet len>.W { <name id>.W }*
 void clif_arrow_create_list(struct map_session_data *sd)
@@ -3370,7 +3329,6 @@ void clif_arrow_create_list(struct map_session_data *sd)
 	}
 }
 
-
 /// Notifies the client, about the result of an status change request (ZC_STATUS_CHANGE_ACK).
 /// 00bc <status id>.W <result>.B <value>.B
 /// status id:
@@ -3393,7 +3351,6 @@ void clif_statusupack(struct map_session_data *sd,int type,int ok,int val)
 	WFIFOSET(fd,packet_len(0xbc));
 }
 
-
 /// Notifies the client about the result of a request to equip an item (ZC_REQ_WEAR_EQUIP_ACK).
 /// 00aa <index>.W <equip location>.W <result>.B
 /// 00aa <index>.W <equip location>.W <view id>.W <result>.B (PACKETVER >= 20100629)
@@ -3416,7 +3373,6 @@ void clif_equipitemack(struct map_session_data *sd,int n,int pos,enum e_EQUIP_IT
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
 }
 
-
 /// Notifies the client about the result of a request to take off an item (ZC_REQ_TAKEOFF_EQUIP_ACK).
 /// 00ac <index>.W <equip location>.W <result>.B
 void clif_unequipitemack(struct map_session_data *sd,int n,int pos,enum e_UNEQUIP_ITEM_ACK result) {
@@ -3432,7 +3388,6 @@ void clif_unequipitemack(struct map_session_data *sd,int n,int pos,enum e_UNEQUI
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
 }
 
-
 /// Notifies clients in the area about an special/visual effect (ZC_NOTIFY_EFFECT).
 /// 019b <id>.L <effect id>.L
 /// effect id:
@@ -3459,7 +3414,6 @@ void clif_misceffect(struct block_list* bl,int type)
 	clif->send(buf,packet_len(0x19b),bl,AREA);
 }
 
-
 /// Notifies clients in the area of a state change.
 /// 0119 <id>.L <body state>.W <health state>.W <effect state>.W <pk mode>.B (ZC_STATE_CHANGE)
 /// 0229 <id>.L <body state>.W <health state>.W <effect state>.L <pk mode>.B (ZC_STATE_CHANGE3)
@@ -3510,7 +3464,6 @@ void clif_changeoption(struct block_list* bl)
 #endif
 }
 
-
 /// Displays status change effects on NPCs/monsters (ZC_NPC_SHOWEFST_UPDATE).
 /// 028a <id>.L <effect state>.L <level>.L <showEFST>.L
 void clif_changeoption2(struct block_list* bl) {
@@ -3536,7 +3489,6 @@ void clif_changeoption2(struct block_list* bl) {
 		clif->send(buf,packet_len(0x28a),bl,AREA);
 }
 
-
 /// Notifies the client about the result of an item use request.
 /// 00a8 <index>.W <amount>.W <result>.B (ZC_USE_ITEM_ACK)
 /// 01c8 <index>.W <name id>.W <id>.L <amount>.W <result>.B (ZC_USE_ITEM_ACK2)
@@ -3599,7 +3551,6 @@ void clif_createchat(struct map_session_data* sd, int flag)
 	WFIFOSET(fd,packet_len(0xd6));
 }
 
-
 /// Display a chat above the owner (ZC_ROOM_NEWENTRY).
 /// 00d7 <packet len>.W <owner id>.L <char id>.L <limit>.W <users>.W <type>.B <title>.?B
 /// type:
@@ -3637,7 +3588,6 @@ void clif_dispchat(struct chat_data* cd, int fd)
 	}
 }
 
-
 /// Chatroom properties adjustment (ZC_CHANGE_CHATROOM).
 /// 00df <packet len>.W <owner id>.L <chat id>.L <limit>.W <users>.W <type>.B <title>.?B
 /// type:
@@ -3669,7 +3619,6 @@ void clif_changechatstatus(struct chat_data* cd)
 	clif->send(buf,WBUFW(buf,2),cd->owner,CHAT);
 }
 
-
 /// Removes the chatroom (ZC_DESTROY_ROOM).
 /// 00d8 <chat id>.L
 void clif_clearchat(struct chat_data *cd,int fd)
@@ -3689,7 +3638,6 @@ void clif_clearchat(struct chat_data *cd,int fd)
 	}
 }
 
-
 /// Displays messages regarding join chat failures (ZC_REFUSE_ENTER_ROOM).
 /// 00da <result>.B
 /// result:
@@ -3715,7 +3663,6 @@ void clif_joinchatfail(struct map_session_data *sd,int flag)
 	WFIFOSET(fd,packet_len(0xda));
 }
 
-
 /// Notifies the client about entering a chatroom (ZC_ENTER_ROOM).
 /// 00db <packet len>.W <chat id>.L { <role>.L <name>.24B }*
 /// role:
@@ -3754,7 +3701,6 @@ void clif_joinchatok(struct map_session_data *sd,struct chat_data* cd)
 	WFIFOSET(fd, WFIFOW(fd, 2));
 }
 
-
 /// Notifies clients in a chat about a new member (ZC_MEMBER_NEWENTRY).
 /// 00dc <users>.W <name>.24B
 void clif_addchat(struct chat_data* cd,struct map_session_data *sd)
@@ -3770,7 +3716,6 @@ void clif_addchat(struct chat_data* cd,struct map_session_data *sd)
 	clif->send(buf,packet_len(0xdc),&sd->bl,CHAT_WOS);
 }
 
-
 /// Announce the new owner (ZC_ROLE_CHANGE).
 /// 00e1 <role>.L <nick>.24B
 /// role:
@@ -3794,7 +3739,6 @@ void clif_changechatowner(struct chat_data* cd, struct map_session_data* sd)
 	clif->send(buf,packet_len(0xe1)*2,&sd->bl,CHAT);
 }
 
-
 /// Notify about user leaving the chatroom (ZC_MEMBER_EXIT).
 /// 00dd <users>.W <nick>.24B <flag>.B
 /// flag:
@@ -3815,7 +3759,6 @@ void clif_leavechat(struct chat_data* cd, struct map_session_data* sd, bool flag
 	clif->send(buf,packet_len(0xdd),&sd->bl,CHAT);
 }
 
-
 /// Opens a trade request window from char 'name'.
 /// 00e5 <nick>.24B (ZC_REQ_EXCHANGE_ITEM)
 /// 01f4 <nick>.24B <charid>.L <baselvl>.W (ZC_REQ_EXCHANGE_ITEM2)
@@ -3848,7 +3791,6 @@ void clif_traderequest(struct map_session_data *sd, const char *name)
 #endif // PACKETVER < 6
 }
 
-
 /// Reply to a trade-request.
 /// 00e7 <result>.B (ZC_ACK_EXCHANGE_ITEM)
 /// 01f5 <result>.B <charid>.L <baselvl>.W (ZC_ACK_EXCHANGE_ITEM2)
@@ -3886,7 +3828,6 @@ void clif_tradestart(struct map_session_data *sd, uint8 type)
 	WFIFOSET(fd,packet_len(0xe7));
 }
 
-
 /// Notifies the client about an item from other player in current trade.
 /// 00e9 <amount>.L <nameid>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_EXCHANGE_ITEM)
 /// 080f <nameid>.W <item type>.B <amount>.L <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_EXCHANGE_ITEM2)
@@ -3952,7 +3893,6 @@ void clif_tradeadditem(struct map_session_data* sd, struct map_session_data* tsd
 	WFIFOSET(fd,packet_len(tradeaddType));
 }
 
-
 /// Notifies the client about the result of request to add an item to the current trade (ZC_ACK_ADD_EXCHANGE_ITEM).
 /// 00ea <index>.W <result>.B
 /// result:
@@ -3972,7 +3912,6 @@ void clif_tradeitemok(struct map_session_data* sd, int index, int fail)
 	WFIFOSET(fd,packet_len(0xea));
 }
 
-
 /// Notifies the client about finishing one side of the current trade (ZC_CONCLUDE_EXCHANGE_ITEM).
 /// 00ec <who>.B
 /// who:
@@ -3990,7 +3929,6 @@ void clif_tradedeal_lock(struct map_session_data* sd, int fail)
 	WFIFOSET(fd,packet_len(0xec));
 }
 
-
 /// Notifies the client about the trade being canceled (ZC_CANCEL_EXCHANGE_ITEM).
 /// 00ee
 void clif_tradecancelled(struct map_session_data* sd)
@@ -4004,7 +3942,6 @@ void clif_tradecancelled(struct map_session_data* sd)
 	WFIFOSET(fd,packet_len(0xee));
 }
 
-
 /// Result of a trade (ZC_EXEC_EXCHANGE_ITEM).
 /// 00f0 <result>.B
 /// result:
@@ -4022,7 +3959,6 @@ void clif_tradecompleted(struct map_session_data* sd, int fail)
 	WFIFOSET(fd,packet_len(0xf0));
 }
 
-
 /// Resets the trade window on the send side (ZC_EXCHANGEITEM_UNDO).
 /// 00f1
 /// NOTE: Unknown purpose. Items are not removed until the window is
@@ -4039,7 +3975,6 @@ void clif_tradeundo(struct map_session_data* sd)
 	WFIFOSET(fd,packet_len(0xf1));
 }
 
-
 /// Updates storage total amount (ZC_NOTIFY_STOREITEM_COUNTINFO).
 /// 00f2 <current count>.W <max count>.W
 void clif_updatestorageamount(struct map_session_data* sd, int amount, int max_amount)
@@ -4056,7 +3991,6 @@ void clif_updatestorageamount(struct map_session_data* sd, int amount, int max_a
 	WFIFOSET(fd,packet_len(0xf2));
 }
 
-
 /// Notifies the client of an item being added to the storage.
 /// 00f4 <index>.W <amount>.L <nameid>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_STORE)
 /// 01c4 <index>.W <amount>.L <nameid>.W <type>.B <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_STORE2)
@@ -4070,7 +4004,6 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
 	fd=sd->fd;
 	view = itemdb_viewid(i->nameid);
 
-	
 	WFIFOHEAD(fd,packet_len(storageaddType));
 	WFIFOW(fd, 0) = storageaddType; // Storage item added
 	WFIFOW(fd, 2) = index+1; // index
@@ -4090,7 +4023,6 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
 	WFIFOSET(fd,packet_len(storageaddType));
 }
 
-
 /// Notifies the client of an item being deleted from the storage (ZC_DELETE_ITEM_FROM_STORE).
 /// 00f6 <index>.W <amount>.L
 void clif_storageitemremoved(struct map_session_data* sd, int index, int amount)
@@ -4107,7 +4039,6 @@ void clif_storageitemremoved(struct map_session_data* sd, int index, int amount)
 	WFIFOSET(fd,packet_len(0xf6));
 }
 
-
 /// Closes storage (ZC_CLOSE_STORE).
 /// 00f8
 void clif_storageclose(struct map_session_data* sd)
@@ -4274,7 +4205,6 @@ int clif_calc_walkdelay(struct block_list *bl,int delay, int type, int damage, i
 	return delay>0?delay:1; //Return 1 to specify there should be no noticeable delay, but you should stop walking.
 }
 
-
 /// Sends a 'damage' packet (src performs action on dst)
 /// 008a <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.W <div>.W <type>.B <damage2>.W (ZC_NOTIFY_ACT)
 /// 02e1 <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.L <div>.W <type>.B <damage2>.L (ZC_NOTIFY_ACT2)
@@ -4298,7 +4228,7 @@ int clif_damage(struct block_list* src, struct block_list* dst, int sdelay, int
 		if(in_damage) in_damage = in_damage*(sc->data[SC_ILLUSION]->val2) + rnd()%100;
 		if(in_damage2) in_damage2 = in_damage2*(sc->data[SC_ILLUSION]->val2) + rnd()%100;
 	}
-	
+
 #if PACKETVER < 20071113
 	damage = (short)min(in_damage,INT16_MAX);
 	damage2 = (short)min(in_damage2,INT16_MAX);
@@ -4409,7 +4339,6 @@ void clif_standing(struct block_list* bl)
 	}
 }
 
-
 /// Inform client(s) about a map-cell change (ZC_UPDATE_MAPINFO).
 /// 0192 <x>.W <y>.W <type>.W <map name>.16B
 void clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_target target) {
@@ -4435,7 +4364,6 @@ void clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_targe
 	}
 }
 
-
 /// Notifies the client about an item on floor (ZC_ITEM_ENTRY).
 /// 009d <id>.L <name id>.W <identified>.B <x>.W <y>.W <amount>.W <subX>.B <subY>.B
 void clif_getareachar_item(struct map_session_data* sd,struct flooritem_data* fitem) {
@@ -4502,7 +4430,6 @@ void clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, en
 #endif
 
 	p.PacketType = skill_entryType;
-	
 #if PACKETVER >= 20110718
 	p.PacketLength = sizeof(p);
 #endif
@@ -4518,7 +4445,7 @@ void clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, en
 		p.job = UNT_DUMMYSKILL;
 	else
 		p.job = su->group->unit_id;
-	
+
 #if PACKETVER >= 20110718
 	p.RadiusRange = (unsigned char)su->range;
 #endif
@@ -4535,7 +4462,6 @@ void clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, en
 		clif->changemapcell(bl->type == BL_PC ? ((TBL_PC*)bl)->fd : 0,su->bl.m,su->bl.x,su->bl.y,5,SELF);
 }
 
-
 /*==========================================
  * Server tells client to remove unit of id 'unit->bl.id'
  *------------------------------------------*/
@@ -4551,7 +4477,6 @@ void clif_clearchar_skillunit(struct skill_unit *su, int fd) {
 		clif->changemapcell(fd,su->bl.m,su->bl.x,su->bl.y,su->val2,SELF);
 }
 
-
 /// Removes a skill unit (ZC_SKILL_DISAPPEAR).
 /// 0120 <id>.L
 void clif_skill_delunit(struct skill_unit *su) {
@@ -4564,7 +4489,6 @@ void clif_skill_delunit(struct skill_unit *su) {
 	clif->send(buf,packet_len(0x120),&su->bl,AREA);
 }
 
-
 /// Sent when an object gets ankle-snared (ZC_SKILL_UPDATE).
 /// 01ac <id>.L
 /// Only affects units with class [139,153] client-side.
@@ -4579,7 +4503,6 @@ void clif_skillunit_update(struct block_list* bl)
 	clif->send(buf,packet_len(0x1ac),bl,AREA);
 }
 
-
 /*==========================================
  *
  *------------------------------------------*/
@@ -4701,7 +4624,6 @@ int clif_insight(struct block_list *bl,va_list ap)
 	return 0;
 }
 
-
 /// Updates whole skill tree (ZC_SKILLINFO_LIST).
 /// 010f <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B }*
 void clif_skillinfoblock(struct map_session_data *sd)
@@ -4794,7 +4716,6 @@ void clif_addskill(struct map_session_data *sd, int id)
 	WFIFOSET(fd,packet_len(0x111));
 }
 
-
 /// Deletes a skill from the skill tree (ZC_SKILLINFO_DELETE).
 /// 0441 <skill id>.W
 void clif_deleteskill(struct map_session_data *sd, int id)
@@ -4841,7 +4762,6 @@ void clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill_lv, in
 	WFIFOSET(fd, packet_len(0x10e));
 }
 
-
 /// Updates a skill in the skill tree (ZC_SKILLINFO_UPDATE2).
 /// 07e1 <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <upgradable>.B
 void clif_skillinfo(struct map_session_data *sd,int skill_id, int inf)
@@ -4874,7 +4794,6 @@ void clif_skillinfo(struct map_session_data *sd,int skill_id, int inf)
 	WFIFOSET(fd,packet_len(0x7e1));
 }
 
-
 /// Notifies clients in area, that an object is about to use a skill.
 /// 013e <src id>.L <dst id>.L <x>.W <y>.W <skill id>.W <property>.L <delaytime>.L (ZC_USESKILL_ACK)
 /// 07fb <src id>.L <dst id>.L <x>.W <y>.W <skill id>.W <property>.L <delaytime>.L <is disposable>.B (ZC_USESKILL_ACK2)
@@ -4919,7 +4838,6 @@ void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x,
 		clif->send(buf,packet_len(cmd), bl, AREA);
 }
 
-
 /// Notifies clients in area, that an object canceled casting (ZC_DISPEL).
 /// 01b9 <id>.L
 void clif_skillcastcancel(struct block_list* bl)
@@ -4933,7 +4851,6 @@ void clif_skillcastcancel(struct block_list* bl)
 	clif->send(buf,packet_len(0x1b9), bl, AREA);
 }
 
-
 /// Notifies the client about the result of a skill use request (ZC_ACK_TOUSESKILL).
 /// 0110 <skill id>.W <num>.L <result>.B <cause>.B
 /// num (only used when skill id = NV_BASIC and cause = 0):
@@ -4991,7 +4908,6 @@ void clif_skill_fail(struct map_session_data *sd,uint16 skill_id,enum useskill_f
 	WFIFOSET(fd,packet_len(0x110));
 }
 
-
 /// Skill cooldown display icon (ZC_SKILL_POSTDELAY).
 /// 043d <skill ID>.W <tick>.L
 void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned int duration)
@@ -5010,7 +4926,6 @@ void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned
 #endif
 }
 
-
 /// Skill attack effect and damage.
 /// 0114 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.W <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL)
 /// 01de <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.L <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL2)
@@ -5024,11 +4939,11 @@ int clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick
 
 	damage = (int)cap_value(in_damage,INT_MIN,INT_MAX);
 	type = clif_calc_delay(type,div,damage,ddelay);
-	
+
 #if PACKETVER >= 20131223
 	if( type == 6 ) type = 8; //bugreport:8263
 #endif
-	
+
 	if( ( sc = status->get_sc(dst) ) && sc->count ) {
 		if(sc->data[SC_ILLUSION] && damage)
 			damage = damage*(sc->data[SC_ILLUSION]->val2) + rnd()%100;
@@ -5102,7 +5017,6 @@ int clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick
 	return clif->calc_walkdelay(dst,ddelay,type,damage,div);
 }
 
-
 /// Ground skill attack effect and damage (ZC_NOTIFY_SKILL_POSITION).
 /// 0115 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <x>.W <y>.W <damage>.W <level>.W <div>.W <type>.B
 #if 0
@@ -5160,7 +5074,6 @@ int clif_skill_damage2(struct block_list *src, struct block_list *dst, int64 tic
 }
 #endif // 0
 
-
 /// Non-damaging skill effect (ZC_USE_SKILL).
 /// 011a <skill id>.W <skill lv>.W <dst id>.L <src id>.L <result>.B
 int clif_skill_nodamage(struct block_list *src,struct block_list *dst,uint16 skill_id,int heal,int fail)
@@ -5193,7 +5106,6 @@ int clif_skill_nodamage(struct block_list *src,struct block_list *dst,uint16 ski
 	return fail;
 }
 
-
 /// Non-damaging ground skill effect (ZC_NOTIFY_GROUNDSKILL).
 /// 0117 <skill id>.W <src id>.L <level>.W <x>.W <y>.W <tick>.L
 void clif_skill_poseffect(struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick) {
@@ -5245,7 +5157,6 @@ void clif_skill_warppoint(struct map_session_data* sd, uint16 skill_id, uint16 s
 		sd->menuskill_val = skill_lv;
 }
 
-
 /// Memo message (ZC_ACK_REMEMBER_WARPPOINT).
 /// 011e <type>.B
 /// type:
@@ -5268,7 +5179,6 @@ void clif_skill_memomessage(struct map_session_data* sd, int type)
 	WFIFOSET(fd,packet_len(0x11e));
 }
 
-
 /// Teleport message (ZC_NOTIFY_MAPINFO).
 /// 0189 <type>.W
 /// type:
@@ -5291,7 +5201,6 @@ void clif_skill_mapinfomessage(struct map_session_data *sd, int type)
 	WFIFOSET(fd,packet_len(0x189));
 }
 
-
 /// Displays Sense (WZ_ESTIMATION) information window (ZC_MONSTER_INFO).
 /// 018c <class>.W <level>.W <size>.W <hp>.L <def>.W <race>.W <mdef>.W <element>.W
 ///     <water%>.B <earth%>.B <fire%>.B <wind%>.B <poison%>.B <holy%>.B <shadow%>.B <ghost%>.B <undead%>.B
@@ -5328,7 +5237,6 @@ void clif_skill_estimation(struct map_session_data *sd,struct block_list *dst) {
 	clif->send(buf,packet_len(0x18c),&sd->bl,sd->status.party_id>0?PARTY_SAMEMAP:SELF);
 }
 
-
 /// Presents a textual list of producible items (ZC_MAKABLEITEMLIST).
 /// 018d <packet len>.W { <name id>.W { <material id>.W }*3 }*
 /// material id:
@@ -5370,7 +5278,6 @@ void clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id , int
 	}
 }
 
-
 /// Present a list of producible items (ZC_MAKINGITEM_LIST).
 /// 025a <packet len>.W <mk type>.W { <name id>.W }*
 /// mk type:
@@ -5483,7 +5390,7 @@ void clif_status_change(struct block_list *bl,int type,int flag,int tick,int val
 	p.index = type;
 	p.AID = bl->id;
 	p.state = (unsigned char)flag;
-	
+
 #if PACKETVER >= 20120618
 	p.Total = tick; /* at this stage remain and total are the same value I believe */
 #endif
@@ -5659,7 +5566,6 @@ void clif_broadcast2(struct block_list* bl, const char* mes, size_t len, unsigne
 	aFree(buf);
 }
 
-
 /// Displays heal effect (ZC_RECOVERY).
 /// 013d <var id>.W <amount>.W
 /// var id:
@@ -5675,7 +5581,6 @@ void clif_heal(int fd,int type,int val)
 	WFIFOSET(fd,packet_len(0x13d));
 }
 
-
 /// Displays resurrection effect (ZC_RESURRECTION).
 /// 0148 <id>.L <type>.W
 /// type:
@@ -5700,7 +5605,6 @@ void clif_resurrection(struct block_list *bl,int type)
 	}
 }
 
-
 /// Sets the map property (ZC_NOTIFY_MAPPROPERTY).
 /// 0199 <type>.W
 void clif_map_property(struct map_session_data* sd, enum map_property property)
@@ -5716,7 +5620,6 @@ void clif_map_property(struct map_session_data* sd, enum map_property property)
 	WFIFOSET(fd,packet_len(0x199));
 }
 
-
 /// Set the map type (ZC_NOTIFY_MAPPROPERTY2).
 /// 01d6 <type>.W
 void clif_map_type(struct map_session_data* sd, enum map_type type) {
@@ -5731,7 +5634,6 @@ void clif_map_type(struct map_session_data* sd, enum map_type type) {
 	WFIFOSET(fd,packet_len(0x1D6));
 }
 
-
 /// Updates PvP ranking (ZC_NOTIFY_RANKING).
 /// 019a <id>.L <ranking>.L <total>.L
 // FIXME: missing documentation for the 'type' parameter
@@ -5765,7 +5667,6 @@ void clif_pvpset(struct map_session_data *sd,int pvprank,int pvpnum,int type)
 	}
 }
 
-
 /*==========================================
  *
  *------------------------------------------*/
@@ -5782,7 +5683,6 @@ void clif_map_property_mapall(int mapid, enum map_property property)
 	clif->send(buf,packet_len(0x199),&bl,ALL_SAMEMAP);
 }
 
-
 /// Notifies the client about the result of a refine attempt (ZC_ACK_ITEMREFINING).
 /// 0188 <result>.W <index>.W <refine>.W
 /// result:
@@ -5799,7 +5699,6 @@ void clif_refine(int fd, int fail, int index, int val)
 	WFIFOSET(fd,packet_len(0x188));
 }
 
-
 /// Notifies the client about the result of a weapon refine attempt (ZC_ACK_WEAPONREFINE).
 /// 0223 <result>.L <nameid>.W
 /// result:
@@ -5816,7 +5715,6 @@ void clif_upgrademessage(int fd, int result, int item_id)
 	WFIFOSET(fd,packet_len(0x223));
 }
 
-
 /// Whisper is transmitted to the destination player (ZC_WHISPER).
 /// 0097 <packet len>.W <nick>.24B <message>.?B
 /// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104)
@@ -5848,7 +5746,6 @@ void clif_wis_message(int fd, const char *nick, const char *mes, size_t mes_len)
 #endif
 }
 
-
 /// Inform the player about the result of his whisper action (ZC_ACK_WHISPER).
 /// 0098 <result>.B
 /// result:
@@ -5868,11 +5765,10 @@ void clif_wis_end(int fd, int flag) {
 #if PACKETVER >= 20131223
 	p.unknown = 0;
 #endif
-	
+
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
 }
 
-
 /// Returns character name requested by char_id (ZC_ACK_REQNAME_BYGID).
 /// 0194 <char id>.L <name>.24B
 void clif_solved_charname(int fd, int charid, const char* name)
@@ -5885,7 +5781,6 @@ void clif_solved_charname(int fd, int charid, const char* name)
 	WFIFOSET(fd,packet_len(0x194));
 }
 
-
 /// Presents a list of items that can be carded/composed (ZC_ITEMCOMPOSITION_LIST).
 /// 017b <packet len>.W { <name id>.W }*
 void clif_use_card(struct map_session_data *sd,int idx)
@@ -5916,7 +5811,6 @@ void clif_use_card(struct map_session_data *sd,int idx)
 	WFIFOSET(fd, WFIFOW(fd, 2));
 }
 
-
 /// Notifies the client about the result of item carding/composition (ZC_ACK_ITEMCOMPOSITION).
 /// 017d <equip index>.W <card index>.W <result>.B
 /// result:
@@ -5937,7 +5831,6 @@ void clif_insert_card(struct map_session_data *sd,int idx_equip,int idx_card,int
 	WFIFOSET(fd,packet_len(0x17d));
 }
 
-
 /// Presents a list of items that can be identified (ZC_ITEMIDENTIFY_LIST).
 /// 0177 <packet len>.W { <name id>.W }*
 void clif_item_identify_list(struct map_session_data *sd)
@@ -5966,7 +5859,6 @@ void clif_item_identify_list(struct map_session_data *sd)
 	}
 }
 
-
 /// Notifies the client about the result of a item identify request (ZC_ACK_ITEMIDENTIFY).
 /// 0179 <index>.W <result>.B
 void clif_item_identified(struct map_session_data *sd,int idx,int flag)
@@ -5983,7 +5875,6 @@ void clif_item_identified(struct map_session_data *sd,int idx,int flag)
 	WFIFOSET(fd,packet_len(0x179));
 }
 
-
 /// Presents a list of items that can be repaired (ZC_REPAIRITEMLIST).
 /// 01fc <packet len>.W { <index>.W <name id>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }*
 void clif_item_repair_list(struct map_session_data *sd,struct map_session_data *dstsd, int lv)
@@ -6018,7 +5909,6 @@ void clif_item_repair_list(struct map_session_data *sd,struct map_session_data *
 		clif->skill_fail(sd,sd->ud.skill_id,USESKILL_FAIL_LEVEL,0);
 }
 
-
 /// Notifies the client about the result of a item repair request (ZC_ACK_ITEMREPAIR).
 /// 01fe <index>.W <result>.B
 /// index:
@@ -6042,7 +5932,6 @@ void clif_item_repaireffect(struct map_session_data *sd,int idx,int flag)
 
 }
 
-
 /// Displays a message, that an equipment got damaged (ZC_EQUIPITEM_DAMAGED).
 /// 02bb <equip location>.W <account id>.L
 void clif_item_damaged(struct map_session_data* sd, unsigned short position)
@@ -6059,7 +5948,6 @@ void clif_item_damaged(struct map_session_data* sd, unsigned short position)
 	WFIFOSET(fd,packet_len(0x2bb));
 }
 
-
 /// Presents a list of weapon items that can be refined [Taken from jAthena] (ZC_NOTIFY_WEAPONITEMLIST).
 /// 0221 <packet len>.W { <index>.W <name id>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }*
 void clif_item_refine_list(struct map_session_data *sd)
@@ -6096,7 +5984,6 @@ void clif_item_refine_list(struct map_session_data *sd)
 	}
 }
 
-
 /// Notification of an auto-casted skill (ZC_AUTORUN_SKILL).
 /// 0147 <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradeable>.B
 void clif_item_skill(struct map_session_data *sd,uint16 skill_id,uint16 skill_lv)
@@ -6119,7 +6006,6 @@ void clif_item_skill(struct map_session_data *sd,uint16 skill_id,uint16 skill_lv
 	WFIFOSET(fd,packet_len(0x147));
 }
 
-
 /// Adds an item to character's cart.
 /// 0124 <index>.W <amount>.L <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_CART)
 /// 01c5 <index>.W <amount>.L <name id>.W <type>.B <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W (ZC_ADD_ITEM_TO_CART2)
@@ -6158,7 +6044,6 @@ void clif_cart_additem(struct map_session_data *sd,int n,int amount,int fail)
 	WFIFOSET(fd,packet_len(cartaddType));
 }
 
-
 /// Deletes an item from character's cart (ZC_DELETE_ITEM_FROM_CART).
 /// 0125 <index>.W <amount>.L
 void clif_cart_delitem(struct map_session_data *sd,int n,int amount)
@@ -6176,7 +6061,6 @@ void clif_cart_delitem(struct map_session_data *sd,int n,int amount)
 	WFIFOSET(fd,packet_len(0x125));
 }
 
-
 /// Opens the shop creation menu (ZC_OPENSTORE).
 /// 012d <num>.W
 /// num:
@@ -6194,7 +6078,6 @@ void clif_openvendingreq(struct map_session_data* sd, int num)
 	WFIFOSET(fd,packet_len(0x12d));
 }
 
-
 /// Displays a vending board to target/area (ZC_STORE_ENTRY).
 /// 0131 <owner id>.L <message>.80B
 void clif_showvendingboard(struct block_list* bl, const char* message, int fd)
@@ -6216,7 +6099,6 @@ void clif_showvendingboard(struct block_list* bl, const char* message, int fd)
 	}
 }
 
-
 /// Removes a vending board from screen (ZC_DISAPPEAR_ENTRY).
 /// 0132 <owner id>.L
 void clif_closevendingboard(struct block_list* bl, int fd)
@@ -6236,7 +6118,6 @@ void clif_closevendingboard(struct block_list* bl, int fd)
 	}
 }
 
-
 /// Sends a list of items in a shop.
 /// R 0133 <packet len>.W <owner id>.L { <price>.L <amount>.W <index>.W <type>.B <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }* (ZC_PC_PURCHASE_ITEMLIST_FROMMC)
 /// R 0800 <packet len>.W <owner id>.L <unique id>.L { <price>.L <amount>.W <index>.W <type>.B <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }* (ZC_PC_PURCHASE_ITEMLIST_FROMMC2)
@@ -6292,7 +6173,6 @@ void clif_vendinglist(struct map_session_data* sd, unsigned int id, struct s_ven
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Shop purchase failure (ZC_PC_PURCHASE_RESULT_FROMMC).
 /// 0135 <index>.W <amount>.W <result>.B
 /// result:
@@ -6318,13 +6198,12 @@ void clif_buyvending(struct map_session_data* sd, int index, int amount, int fai
 	WFIFOSET(fd,packet_len(0x135));
 }
 
-
 /// Shop creation success (ZC_PC_PURCHASE_MYITEMLIST).
 /// 0136 <packet len>.W <owner id>.L { <price>.L <index>.W <amount>.W <type>.B <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }*
 void clif_openvending(struct map_session_data* sd, int id, struct s_vending* vending_items) {
 	int i,fd;
 	int count;
-	
+
 #if PACKETVER >= 20150226
 	const int item_length = 47;
 #else
@@ -6358,7 +6237,7 @@ void clif_openvending(struct map_session_data* sd, int id, struct s_vending* ven
 #endif
 	}
 	WFIFOSET(fd,WFIFOW(fd,2));
-	
+
 #if PACKETVER >= 20141022
 	/** should go elsewhere perhaps? it has to be bundled with this however. **/
 	WFIFOHEAD(fd, 3);
@@ -6368,7 +6247,6 @@ void clif_openvending(struct map_session_data* sd, int id, struct s_vending* ven
 #endif
 }
 
-
 /// Inform merchant that someone has bought an item (ZC_DELETEITEM_FROM_MCSTORE).
 /// 0137 <index>.W <amount>.W
 void clif_vendingreport(struct map_session_data* sd, int index, int amount)
@@ -6385,7 +6263,6 @@ void clif_vendingreport(struct map_session_data* sd, int index, int amount)
 	WFIFOSET(fd,packet_len(0x137));
 }
 
-
 /// Result of organizing a party (ZC_ACK_MAKE_GROUP).
 /// 00fa <result>.B
 /// result:
@@ -6407,7 +6284,6 @@ void clif_party_created(struct map_session_data *sd,int result)
 	WFIFOSET(fd,packet_len(0xfa));
 }
 
-
 /// Adds new member to a party.
 /// 0104 <account id>.L <role>.L <x>.W <y>.W <state>.B <party name>.24B <char name>.24B <map name>.16B (ZC_ADD_MEMBER_TO_GROUP)
 /// 01e9 <account id>.L <role>.L <x>.W <y>.W <state>.B <party name>.24B <char name>.24B <map name>.16B <item pickup rule>.B <item share rule>.B (ZC_ADD_MEMBER_TO_GROUP2)
@@ -6446,7 +6322,6 @@ void clif_party_member_info(struct party_data *p, struct map_session_data *sd)
 	clif->send(buf,packet_len(0x1e9),&sd->bl,PARTY);
 }
 
-
 /// Sends party information (ZC_GROUP_LIST).
 /// 00fb <packet len>.W <party name>.24B { <account id>.L <nick>.24B <map name>.16B <role>.B <state>.B }*
 /// role:
@@ -6488,7 +6363,6 @@ void clif_party_info(struct party_data* p, struct map_session_data *sd)
 	}
 }
 
-
 /// The player's 'party invite' state, sent during login (ZC_PARTY_CONFIG).
 /// 02c9 <flag>.B
 /// flag:
@@ -6506,7 +6380,6 @@ void clif_partyinvitationstate(struct map_session_data* sd)
 	WFIFOSET(fd, packet_len(0x2c9));
 }
 
-
 /// Party invitation request.
 /// 00fe <party id>.L <party name>.24B (ZC_REQ_JOIN_GROUP)
 /// 02c6 <party id>.L <party name>.24B (ZC_PARTY_JOIN_REQ)
@@ -6535,7 +6408,6 @@ void clif_party_invite(struct map_session_data *sd,struct map_session_data *tsd)
 	WFIFOSET(fd,packet_len(cmd));
 }
 
-
 /// Party invite result.
 /// 00fd <nick>.24S <result>.B (ZC_ACK_REQ_JOIN_GROUP)
 /// 02c5 <nick>.24S <result>.L (ZC_PARTY_JOIN_REQ_ACK)
@@ -6577,7 +6449,6 @@ void clif_party_inviteack(struct map_session_data* sd, const char* nick, int res
 #endif
 }
 
-
 /// Updates party settings.
 /// 0101 <exp option>.L (ZC_GROUPINFO_CHANGE)
 /// 07d8 <exp option>.L <item pick rule>.B <item share rule>.B (ZC_REQ_GROUPINFO_CHANGE_V2)
@@ -6620,7 +6491,6 @@ void clif_party_option(struct party_data *p,struct map_session_data *sd,int flag
 		clif->send(buf,packet_len(cmd),&sd->bl,SELF);
 }
 
-
 /// 0105 <account id>.L <char name>.24B <result>.B (ZC_DELETE_MEMBER_FROM_GROUP).
 /// result:
 ///     0 = leave
@@ -6655,7 +6525,6 @@ void clif_party_withdraw(struct party_data* p, struct map_session_data* sd, int
 		clif->send(buf,packet_len(0x105),&sd->bl,SELF);
 }
 
-
 /// Party chat message (ZC_NOTIFY_CHAT_PARTY).
 /// 0109 <packet len>.W <account id>.L <message>.?B
 void clif_party_message(struct party_data* p, int account_id, const char* mes, int len)
@@ -6685,7 +6554,6 @@ void clif_party_message(struct party_data* p, int account_id, const char* mes, i
 	}
 }
 
-
 /// Updates the position of a party member on the minimap (ZC_NOTIFY_POSITION_TO_GROUPM).
 /// 0107 <account id>.L <x>.W <y>.W
 void clif_party_xy(struct map_session_data *sd)
@@ -6701,7 +6569,6 @@ void clif_party_xy(struct map_session_data *sd)
 	clif->send(buf,packet_len(0x107),&sd->bl,PARTY_SAMEMAP_WOS);
 }
 
-
 /*==========================================
  * Sends x/y dot to a single fd. [Skotlex]
  *------------------------------------------*/
@@ -6716,7 +6583,6 @@ void clif_party_xy_single(int fd, struct map_session_data *sd)
 	WFIFOSET(fd,packet_len(0x107));
 }
 
-
 /// Updates HP bar of a party member.
 /// 0106 <account id>.L <hp>.W <max hp>.W (ZC_NOTIFY_HP_TO_GROUPM)
 /// 080e <account id>.L <hp>.L <max hp>.L (ZC_NOTIFY_HP_TO_GROUPM_R2)
@@ -6748,7 +6614,6 @@ void clif_party_hp(struct map_session_data *sd)
 	clif->send(buf,packet_len(cmd),&sd->bl,PARTY_AREA_WOS);
 }
 
-
 /*==========================================
  * Sends HP bar to a single fd. [Skotlex]
  *------------------------------------------*/
@@ -6799,7 +6664,6 @@ void clif_movetoattack(struct map_session_data *sd,struct block_list *bl)
 	WFIFOSET(fd,packet_len(0x139));
 }
 
-
 /// Notifies the client about the result of an item produce request (ZC_ACK_REQMAKINGITEM).
 /// 018f <result>.W <name id>.W
 /// result:
@@ -6825,7 +6689,6 @@ void clif_produceeffect(struct map_session_data* sd,int flag,int nameid)
 	WFIFOSET(fd,packet_len(0x18f));
 }
 
-
 /// Initiates the pet taming process (ZC_START_CAPTURE).
 /// 019e
 void clif_catch_process(struct map_session_data *sd)
@@ -6840,7 +6703,6 @@ void clif_catch_process(struct map_session_data *sd)
 	WFIFOSET(fd,packet_len(0x19e));
 }
 
-
 /// Displays the result of a pet taming attempt (ZC_TRYCAPTURE_MONSTER).
 /// 01a0 <result>.B
 ///     0 = failure
@@ -6858,7 +6720,6 @@ void clif_pet_roulette(struct map_session_data *sd,int data)
 	WFIFOSET(fd,packet_len(0x1a0));
 }
 
-
 /// Presents a list of pet eggs that can be hatched (ZC_PETEGG_LIST).
 /// 01a6 <packet len>.W { <index>.W }*
 void clif_sendegg(struct map_session_data *sd)
@@ -6889,7 +6750,6 @@ void clif_sendegg(struct map_session_data *sd)
 	sd->menuskill_val = -1;
 }
 
-
 /// Sends a specific pet data update (ZC_CHANGESTATE_PET).
 /// 01a4 <type>.B <id>.L <data>.L
 /// type:
@@ -6916,7 +6776,6 @@ void clif_send_petdata(struct map_session_data* sd, struct pet_data* pd, int typ
 		clif->send(buf, packet_len(0x1a4), &pd->bl, AREA);
 }
 
-
 /// Pet's base data (ZC_PROPERTY_PET).
 /// 01a2 <name>.24B <renamed>.B <level>.W <hunger>.W <intimacy>.W <accessory id>.W <class>.W
 void clif_send_petstatus(struct map_session_data *sd)
@@ -6943,7 +6802,6 @@ void clif_send_petstatus(struct map_session_data *sd)
 	WFIFOSET(fd,packet_len(0x1a2));
 }
 
-
 /// Notification about a pet's emotion/talk (ZC_PET_ACT).
 /// 01aa <id>.L <data>.L
 /// data:
@@ -6972,7 +6830,6 @@ void clif_pet_emotion(struct pet_data *pd,int param)
 	clif->send(buf,packet_len(0x1aa),&pd->bl,AREA);
 }
 
-
 /// Result of request to feed a pet (ZC_FEED_PET).
 /// 01a3 <result>.B <name id>.W
 /// result:
@@ -6992,7 +6849,6 @@ void clif_pet_food(struct map_session_data *sd,int foodid,int fail)
 	WFIFOSET(fd,packet_len(0x1a3));
 }
 
-
 /// Presents a list of skills that can be auto-spelled (ZC_AUTOSPELLLIST).
 /// 01cd { <skill id>.L }*7
 void clif_autospell(struct map_session_data *sd,uint16 skill_lv)
@@ -7039,7 +6895,6 @@ void clif_autospell(struct map_session_data *sd,uint16 skill_lv)
 	sd->menuskill_val = skill_lv;
 }
 
-
 /// Devotion's visual effect (ZC_DEVOTIONLIST).
 /// 01cf <devoter id>.L { <devotee id>.L }*5 <max distance>.W
 void clif_devotion(struct block_list *src, struct map_session_data *tsd)
@@ -7100,7 +6955,6 @@ void clif_spiritball(struct block_list *bl) {
 	clif->send(buf, packet_len(0x1d0), bl, AREA);
 }
 
-
 /// Notifies clients in area of a character's combo delay (ZC_COMBODELAY).
 /// 01d2 <account id>.L <delay>.L
 void clif_combo_delay(struct block_list *bl,int wait)
@@ -7115,7 +6969,6 @@ void clif_combo_delay(struct block_list *bl,int wait)
 	clif->send(buf,packet_len(0x1d2),bl,AREA);
 }
 
-
 /// Notifies clients in area that a character has blade-stopped another (ZC_BLADESTOP).
 /// 01d1 <src id>.L <dst id>.L <flag>.L
 /// flag:
@@ -7135,7 +6988,6 @@ void clif_bladestop(struct block_list *src, int dst_id, int active)
 	clif->send(buf,packet_len(0x1d1),src,AREA);
 }
 
-
 /// MVP effect (ZC_MVP).
 /// 010c <account id>.L
 void clif_mvp_effect(struct map_session_data *sd)
@@ -7149,7 +7001,6 @@ void clif_mvp_effect(struct map_session_data *sd)
 	clif->send(buf,packet_len(0x10c),&sd->bl,AREA);
 }
 
-
 /// MVP item reward message (ZC_MVP_GETTING_ITEM).
 /// 010a <name id>.W
 void clif_mvp_item(struct map_session_data *sd,int nameid)
@@ -7168,7 +7019,6 @@ void clif_mvp_item(struct map_session_data *sd,int nameid)
 	WFIFOSET(fd,packet_len(0x10a));
 }
 
-
 /// MVP EXP reward message (ZC_MVP_GETTING_SPECIAL_EXP).
 /// 010b <exp>.L
 void clif_mvp_exp(struct map_session_data *sd, unsigned int exp)
@@ -7184,7 +7034,6 @@ void clif_mvp_exp(struct map_session_data *sd, unsigned int exp)
 	WFIFOSET(fd,packet_len(0x10b));
 }
 
-
 /// Dropped MVP item reward message (ZC_THROW_MVPITEM).
 /// 010d
 ///
@@ -7199,7 +7048,6 @@ void clif_mvp_noitem(struct map_session_data* sd)
 	WFIFOSET(fd,packet_len(0x10d));
 }
 
-
 /// Guild creation result (ZC_RESULT_MAKE_GUILD).
 /// 0167 <result>.B
 /// result:
@@ -7220,7 +7068,6 @@ void clif_guild_created(struct map_session_data *sd,int flag)
 	WFIFOSET(fd,packet_len(0x167));
 }
 
-
 /// Notifies the client that it is belonging to a guild (ZC_UPDATE_GDID).
 /// 016c <guild id>.L <emblem id>.L <mode>.L <ismaster>.B <inter sid>.L <guild name>.24B
 /// mode: @see enum guild_permission
@@ -7243,7 +7090,6 @@ void clif_guild_belonginfo(struct map_session_data *sd, struct guild *g)
 	WFIFOSET(fd,packet_len(0x16c));
 }
 
-
 /// Guild member login notice.
 /// 016d <account id>.L <char id>.L <status>.L (ZC_UPDATE_CHARSTAT)
 /// 01f2 <account id>.L <char id>.L <status>.L <gender>.W <hair style>.W <hair color>.W (ZC_UPDATE_CHARSTAT2)
@@ -7316,7 +7162,6 @@ void clif_guild_send_onlineinfo(struct map_session_data *sd)
 	clif->send(buf, p_len*count, &sd->bl, SELF);
 }
 
-
 /// Bitmask of enabled guild window tabs (ZC_ACK_GUILD_MENUINTERFACE).
 /// 014e <menu flag>.L
 /// menu flag:
@@ -7340,7 +7185,6 @@ void clif_guild_masterormember(struct map_session_data *sd)
 	WFIFOSET(fd,packet_len(0x14e));
 }
 
-
 /// Guild basic information (Territories [Valaris])
 /// 0150 <guild id>.L <level>.L <member num>.L <member max>.L <exp>.L <max exp>.L <points>.L <honor>.L <virtue>.L <emblem id>.L <name>.24B <master name>.24B <manage land>.16B (ZC_GUILD_INFO)
 /// 01b6 <guild id>.L <level>.L <member num>.L <member max>.L <exp>.L <max exp>.L <points>.L <honor>.L <virtue>.L <emblem id>.L <name>.24B <master name>.24B <manage land>.16B <zeny>.L (ZC_GUILD_INFO2)
@@ -7376,7 +7220,6 @@ void clif_guild_basicinfo(struct map_session_data *sd) {
 	WFIFOSET(fd,packet_len(0x1b6));
 }
 
-
 /// Guild alliance and opposition list (ZC_MYGUILD_BASIC_INFO).
 /// 014c <packet len>.W { <relation>.L <guild id>.L <guild name>.24B }*
 void clif_guild_allianceinfo(struct map_session_data *sd)
@@ -7404,7 +7247,6 @@ void clif_guild_allianceinfo(struct map_session_data *sd)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Guild member manager information (ZC_MEMBERMGR_INFO).
 /// 0154 <packet len>.W { <account>.L <char id>.L <hair style>.W <hair color>.W <gender>.W <class>.W <level>.W <contrib exp>.L <state>.L <position>.L <memo>.50B <name>.24B }*
 /// state:
@@ -7448,7 +7290,6 @@ void clif_guild_memberlist(struct map_session_data *sd)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Guild position name information (ZC_POSITION_ID_NAME_INFO).
 /// 0166 <packet len>.W { <position id>.L <position name>.24B }*
 void clif_guild_positionnamelist(struct map_session_data *sd) {
@@ -7470,7 +7311,6 @@ void clif_guild_positionnamelist(struct map_session_data *sd) {
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Guild position information (ZC_POSITION_INFO).
 /// 0160 <packet len>.W { <position id>.L <mode>.L <ranking>.L <pay rate>.L }*
 /// mode: @see enum guild_permission
@@ -7498,7 +7338,6 @@ void clif_guild_positioninfolist(struct map_session_data *sd) {
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Notifies clients in a guild about updated position information (ZC_ACK_CHANGE_GUILD_POSITIONINFO).
 /// 0174 <packet len>.W { <position id>.L <mode>.L <ranking>.L <pay rate>.L <position name>.24B }*
 /// mode: @see enum guild_permission
@@ -7527,7 +7366,6 @@ void clif_guild_positionchanged(struct guild *g,int idx)
 		clif->send(buf,WBUFW(buf,2),&sd->bl,GUILD);
 }
 
-
 /// Notifies clients in a guild about updated member position assignments (ZC_ACK_REQ_CHANGE_MEMBERS).
 /// 0156 <packet len>.W { <account id>.L <char id>.L <position id>.L }*
 void clif_guild_memberpositionchanged(struct guild *g,int idx)
@@ -7551,7 +7389,6 @@ void clif_guild_memberpositionchanged(struct guild *g,int idx)
 		clif->send(buf,WBUFW(buf,2),&sd->bl,GUILD);
 }
 
-
 /// Sends emblems bitmap data to the client that requested it (ZC_GUILD_EMBLEM_IMG).
 /// 0152 <packet len>.W <guild id>.L <emblem id>.L <emblem data>.?B
 void clif_guild_emblem(struct map_session_data *sd,struct guild *g)
@@ -7573,7 +7410,6 @@ void clif_guild_emblem(struct map_session_data *sd,struct guild *g)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Sends update of the guild id/emblem id to everyone in the area (ZC_CHANGE_GUILD).
 /// 01b4 <id>.L <guild id>.L <emblem id>.W
 void clif_guild_emblem_area(struct block_list* bl)
@@ -7591,7 +7427,6 @@ void clif_guild_emblem_area(struct block_list* bl)
 	clif->send(buf, 12, bl, AREA_WOS);
 }
 
-
 /// Sends guild skills (ZC_GUILD_SKILLINFO).
 /// 0162 <packet len>.W <skill points>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradeable>.B }*
 void clif_guild_skillinfo(struct map_session_data* sd)
@@ -7631,7 +7466,6 @@ void clif_guild_skillinfo(struct map_session_data* sd)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Sends guild notice to client (ZC_GUILD_NOTICE).
 /// 016f <subject>.60B <notice>.120B
 void clif_guild_notice(struct map_session_data* sd, struct guild* g)
@@ -7656,7 +7490,6 @@ void clif_guild_notice(struct map_session_data* sd, struct guild* g)
 	WFIFOSET(fd,packet_len(0x16f));
 }
 
-
 /// Guild invite (ZC_REQ_JOIN_GUILD).
 /// 016a <guild id>.L <guild name>.24B
 void clif_guild_invite(struct map_session_data *sd,struct guild *g)
@@ -7674,7 +7507,6 @@ void clif_guild_invite(struct map_session_data *sd,struct guild *g)
 	WFIFOSET(fd,packet_len(0x16a));
 }
 
-
 /// Reply to invite request (ZC_ACK_REQ_JOIN_GUILD).
 /// 0169 <answer>.B
 /// answer:
@@ -7695,7 +7527,6 @@ void clif_guild_inviteack(struct map_session_data *sd,int flag)
 	WFIFOSET(fd,packet_len(0x169));
 }
 
-
 /// Notifies clients of a guild of a leaving member (ZC_ACK_LEAVE_GUILD).
 /// 015a <char name>.24B <reason>.40B
 void clif_guild_leave(struct map_session_data *sd,const char *name,const char *mes)
@@ -7710,7 +7541,6 @@ void clif_guild_leave(struct map_session_data *sd,const char *name,const char *m
 	clif->send(buf,packet_len(0x15a),&sd->bl,GUILD_NOBG);
 }
 
-
 /// Notifies clients of a guild of an expelled member.
 /// 015c <char name>.24B <reason>.40B <account name>.24B (ZC_ACK_BAN_GUILD)
 /// 0839 <char name>.24B <reason>.40B (ZC_ACK_BAN_GUILD_SSO)
@@ -7736,7 +7566,6 @@ void clif_guild_expulsion(struct map_session_data* sd, const char* name, const c
 	clif->send(buf, packet_len(cmd), &sd->bl, GUILD_NOBG);
 }
 
-
 /// Guild expulsion list (ZC_BAN_LIST).
 /// 0163 <packet len>.W { <char name>.24B <account name>.24B <reason>.40B }*
 /// 0163 <packet len>.W { <char name>.24B <reason>.40B }* (PACKETVER >= 20100803)
@@ -7779,7 +7608,6 @@ void clif_guild_expulsionlist(struct map_session_data* sd) {
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Guild chat message (ZC_GUILD_CHAT).
 /// 017f <packet len>.W <message>.?B
 void clif_guild_message(struct guild *g,int account_id,const char *mes,int len)
@@ -7821,7 +7649,6 @@ void clif_guild_reqalliance(struct map_session_data *sd,int account_id,const cha
 	WFIFOSET(fd,packet_len(0x171));
 }
 
-
 /// Notifies the client about the result of a alliance request (ZC_ACK_REQ_ALLY_GUILD).
 /// 0173 <answer>.B
 /// answer:
@@ -7844,7 +7671,6 @@ void clif_guild_allianceack(struct map_session_data *sd,int flag)
 	WFIFOSET(fd,packet_len(0x173));
 }
 
-
 /// Notifies the client that a alliance or opposition has been removed (ZC_DELETE_RELATED_GUILD).
 /// 0184 <other guild id>.L <relation>.L
 /// relation:
@@ -7866,7 +7692,6 @@ void clif_guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
 	WFIFOSET(fd,packet_len(0x184));
 }
 
-
 /// Notifies the client about the result of a opposition request (ZC_ACK_REQ_HOSTILE_GUILD).
 /// 0181 <result>.B
 /// result:
@@ -7887,7 +7712,6 @@ void clif_guild_oppositionack(struct map_session_data *sd,int flag)
 	WFIFOSET(fd,packet_len(0x181));
 }
 
-
 /// Adds alliance or opposition (ZC_ADD_RELATED_GUILD).
 /// 0185 <relation>.L <guild id>.L <guild name>.24B
 /*
@@ -7902,7 +7726,6 @@ void clif_guild_allianceadded(struct guild *g,int idx)
 }
 */
 
-
 /// Notifies the client about the result of a guild break (ZC_ACK_DISORGANIZE_GUILD_RESULT).
 /// 015e <reason>.L
 ///     0 = success
@@ -7921,7 +7744,6 @@ void clif_guild_broken(struct map_session_data *sd,int flag)
 	WFIFOSET(fd,packet_len(0x15e));
 }
 
-
 /// Displays emotion on an object (ZC_EMOTION).
 /// 00c0 <id>.L <type>.B
 /// type:
@@ -7938,7 +7760,6 @@ void clif_emotion(struct block_list *bl,int type)
 	clif->send(buf,packet_len(0xc0),bl,AREA);
 }
 
-
 /// Displays the contents of a talkiebox trap (ZC_TALKBOX_CHATCONTENTS).
 /// 0191 <id>.L <contents>.80B
 void clif_talkiebox(struct block_list* bl, const char* talkie)
@@ -7953,7 +7774,6 @@ void clif_talkiebox(struct block_list* bl, const char* talkie)
 	clif->send(buf,packet_len(0x191),bl,AREA);
 }
 
-
 /// Displays wedding effect centered on an object (ZC_CONGRATULATION).
 /// 01ea <id>.L
 void clif_wedding_effect(struct block_list *bl)
@@ -7967,7 +7787,6 @@ void clif_wedding_effect(struct block_list *bl)
 	clif->send(buf, packet_len(0x1ea), bl, AREA);
 }
 
-
 /// Notifies the client of the name of the partner character (ZC_COUPLENAME).
 /// 01e6 <partner name>.24B
 void clif_callpartner(struct map_session_data *sd) {
@@ -7992,7 +7811,6 @@ void clif_callpartner(struct map_session_data *sd) {
 	clif->send(buf, packet_len(0x1e6), &sd->bl, AREA);
 }
 
-
 /// Initiates the partner "taming" process [DracoRPG] (ZC_START_COUPLE).
 /// 01e4
 /// This packet while still implemented by the client is no longer being officially used.
@@ -8009,7 +7827,6 @@ void clif_marriage_process(struct map_session_data *sd)
 }
 */
 
-
 /// Notice of divorce (ZC_DIVORCE).
 /// 0205 <partner name>.24B
 void clif_divorced(struct map_session_data* sd, const char* name)
@@ -8024,7 +7841,6 @@ void clif_divorced(struct map_session_data* sd, const char* name)
 	WFIFOSET(fd, packet_len(0x205));
 }
 
-
 /// Marriage proposal (ZC_REQ_COUPLE).
 /// 01e2 <account id>.L <char id>.L <char name>.24B
 /// This packet while still implemented by the client is no longer being officially used.
@@ -8066,7 +7882,6 @@ void clif_disp_message(struct block_list* src, const char* mes, size_t len, enum
 	clif->send(buf, WBUFW(buf,2), src, target);
 }
 
-
 /// Notifies the client about the result of a request to disconnect another player (ZC_ACK_DISCONNECT_CHARACTER).
 /// 00cd <result>.L (unknown packet version or invalid information at packet_len_table)
 /// 00cd <result>.B
@@ -8086,7 +7901,6 @@ void clif_GM_kickack(struct map_session_data *sd, int result)
 	WFIFOSET(fd, packet_len(0xcd));
 }
 
-
 void clif_GM_kick(struct map_session_data *sd,struct map_session_data *tsd) {
 	int fd;
 
@@ -8102,7 +7916,6 @@ void clif_GM_kick(struct map_session_data *sd,struct map_session_data *tsd) {
 		clif->GM_kickack(sd, 1);
 }
 
-
 /// Displays various manner-related status messages (ZC_ACK_GIVE_MANNER_POINT).
 /// 014a <result>.L
 /// result:
@@ -8124,7 +7937,6 @@ void clif_manner_message(struct map_session_data* sd, uint32 type)
 	WFIFOSET(fd, packet_len(0x14a));
 }
 
-
 /// Follow-up to 0x14a type 3/5, informs who did the manner adjustment action (ZC_NOTIFY_MANNER_POINT_GIVEN).
 /// 014b <type>.B <GM name>.24B
 /// type:
@@ -8144,7 +7956,6 @@ void clif_GM_silence(struct map_session_data* sd, struct map_session_data* tsd,
 	WFIFOSET(fd, packet_len(0x14b));
 }
 
-
 /// Notifies the client about the result of a request to allow/deny whispers from a player (ZC_SETTING_WHISPER_PC).
 /// 00d1 <type>.B <result>.B
 /// type:
@@ -8188,7 +7999,6 @@ void clif_wisall(struct map_session_data *sd,int type,int flag) {
 	WFIFOSET(fd,packet_len(0xd2));
 }
 
-
 /// Play a BGM! [Rikter/Yommy] (ZC_PLAY_NPC_BGM).
 /// 07fe <bgm>.24B
 void clif_playBGM(struct map_session_data* sd, const char* name)
@@ -8204,7 +8014,6 @@ void clif_playBGM(struct map_session_data* sd, const char* name)
 	WFIFOSET(fd,packet_len(0x7fe));
 }
 
-
 /// Plays/stops a wave sound (ZC_SOUND).
 /// 01d3 <file name>.24B <act>.B <term>.L <npc id>.L
 /// file name:
@@ -8251,7 +8060,6 @@ void clif_soundeffectall(struct block_list* bl, const char* name, int type, enum
 	clif->send(buf, packet_len(0x1d3), bl, coverage);
 }
 
-
 /// Displays special effects (npcs, weather, etc) [Valaris] (ZC_NOTIFY_EFFECT2).
 /// 01f3 <id>.L <effect id>.L
 /// effect id:
@@ -8285,7 +8093,6 @@ void clif_specialeffect_single(struct block_list* bl, int type, int fd) {
 	WFIFOSET(fd,10);
 }
 
-
 /// Notifies clients of an special/visual effect that accepts an value (ZC_NOTIFY_EFFECT3).
 /// 0284 <id>.L <effect id>.L <num data>.L
 /// effect id:
@@ -8456,7 +8263,6 @@ void clif_refresh(struct map_session_data *sd)
 	clif->refresh_storagewindow(sd);
 }
 
-
 /// Updates the object's (bl) name on client.
 /// 0095 <id>.L <char name>.24B (ZC_ACK_REQNAME)
 /// 0195 <id>.L <char name>.24B <party name>.24B <guild name>.24B <position name>.24B (ZC_ACK_REQNAMEALL)
@@ -8596,7 +8402,6 @@ void clif_charnameack (int fd, struct block_list *bl)
 	}
 }
 
-
 //Used to update when a char leaves a party/guild. [Skotlex]
 //Needed because when you send a 0x95 packet, the client will not remove the cached party/guild info that is not sent.
 void clif_charnameupdate (struct map_session_data *ssd)
@@ -8651,7 +8456,6 @@ void clif_charnameupdate (struct map_session_data *ssd)
 	clif->send(buf, packet_len(cmd), &ssd->bl, AREA);
 }
 
-
 /// Taekwon Jump (TK_HIGHJUMP) effect (ZC_HIGHJUMP).
 /// 01ff <id>.L <x>.W <y>.W
 ///
@@ -8676,7 +8480,6 @@ void clif_slide(struct block_list *bl, int x, int y)
 	}
 }
 
-
 /// Public chat message (ZC_NOTIFY_CHAT). lordalfa/Skotlex - used by @me as well
 /// 008d <packet len>.W <id>.L <message>.?B
 void clif_disp_overhead(struct block_list *bl, const char* mes)
@@ -8724,7 +8527,6 @@ void clif_party_xy_remove(struct map_session_data *sd)
 	clif->send(buf,packet_len(0x107),&sd->bl,PARTY_SAMEMAP_WOS);
 }
 
-
 /// Displays a skill message (thanks to Rayce) (ZC_SKILLMSG).
 /// 0215 <msg id>.L
 /// msg id:
@@ -8753,7 +8555,6 @@ void clif_gospel_info(struct map_session_data *sd, int type)
 
 }
 
-
 /// Multi-purpose mission information packet (ZC_STARSKILL).
 /// 020e <mapname>.24B <monster_id>.L <star>.B <result>.B
 /// result:
@@ -8844,7 +8645,6 @@ void clif_feel_hate_reset(struct map_session_data *sd)
 	clif->starskill(sd, "", 0, 0, 30);
 }
 
-
 /// Equip window (un)tick ack (ZC_CONFIG).
 /// 02d9 <type>.L <value>.L
 /// type:
@@ -8865,7 +8665,6 @@ void clif_equiptickack(struct map_session_data* sd, int flag)
 	WFIFOSET(fd, packet_len(0x2d9));
 }
 
-
 /// The player's 'view equip' state, sent during login (ZC_CONFIG_NOTIFY).
 /// 02da <open equip window>.B
 /// open equip window:
@@ -8883,7 +8682,6 @@ void clif_equpcheckbox(struct map_session_data* sd)
 	WFIFOSET(fd, packet_len(0x2da));
 }
 
-
 /// Sends info about a player's equipped items.
 /// 02d7 <packet len>.W <name>.24B <class>.W <hairstyle>.W <up-viewid>.W <mid-viewid>.W <low-viewid>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.26B* (ZC_EQUIPWIN_MICROSCOPE)
 /// 02d7 <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.28B* (ZC_EQUIPWIN_MICROSCOPE, PACKETVER >= 20100629)
@@ -8925,7 +8723,6 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
 	clif->send(&viewequip_list, viewequip_list.PacketLength, &sd->bl, SELF);
 }
 
-
 /**
  * Displays a string from msgstringtable.txt (ZC_MSG).
  *
@@ -9165,7 +8962,6 @@ void clif_channel_msg2(struct channel_data *chan, char *msg)
 // ------------
 // Parses incoming (player) connection
 
-
 /// Request to connect to map-server.
 /// 0072 <account id>.L <char id>.L <auth code>.L <client time>.L <gender>.B (CZ_ENTER)
 /// 0436 <account id>.L <char id>.L <auth code>.L <client time>.L <gender>.B (CZ_ENTER2)
@@ -9600,7 +9396,6 @@ void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) {
 #endif
 }
 
-
 /// Server's tick (ZC_NOTIFY_TIME).
 /// 007f <time>.L
 void clif_notify_time(struct map_session_data* sd, int64 time) {
@@ -9615,7 +9410,6 @@ void clif_notify_time(struct map_session_data* sd, int64 time) {
 	WFIFOSET(fd,packet_len(0x7f));
 }
 
-
 void clif_parse_TickSend(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request for server's tick.
 /// 007e <client tick>.L (CZ_REQUEST_TIME)
@@ -9628,7 +9422,6 @@ void clif_parse_TickSend(int fd, struct map_session_data *sd)
 	clif->notify_time(sd, timer->gettick());
 }
 
-
 /// Sends hotkey bar.
 /// 02b9 { <is skill>.B <id>.L <count>.W }*27 (ZC_SHORTCUT_KEY_LIST)
 /// 07d9 { <is skill>.B <id>.L <count>.W }*36 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090603)
@@ -9677,7 +9470,6 @@ void clif_parse_Hotkey(int fd, struct map_session_data *sd) {
 #endif
 }
 
-
 /// Displays cast-like progress bar (ZC_PROGRESS).
 /// 02f0 <color>.L <time>.L
 /* TODO ZC_PROGRESS_ACTOR <account_id>.L */
@@ -9695,7 +9487,6 @@ void clif_progressbar(struct map_session_data * sd, unsigned int color, unsigned
 	WFIFOSET(fd,packet_len(0x2f0));
 }
 
-
 /// Removes an ongoing progress bar (ZC_PROGRESS_CANCEL).
 /// 02f2
 void clif_progressbar_abort(struct map_session_data * sd)
@@ -9710,7 +9501,6 @@ void clif_progressbar_abort(struct map_session_data * sd)
 	WFIFOSET(fd,packet_len(0x2f2));
 }
 
-
 void clif_parse_progressbar(int fd, struct map_session_data * sd) __attribute__((nonnull (2)));
 /// Notification from the client, that the progress bar has reached 100% (CZ_PROGRESS).
 /// 02f1
@@ -9725,7 +9515,6 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd)
 	npc->scriptcont(sd, npc_id, false);
 }
 
-
 void clif_parse_WalkToXY(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to walk to a certain position on the current map.
 /// 0085 <dest>.3B (CZ_REQUEST_MOVE)
@@ -9761,7 +9550,6 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
 	unit->walktoxy(&sd->bl, x, y, 4);
 }
 
-
 /// Notification about the result of a disconnect request (ZC_ACK_REQ_DISCONNECT).
 /// 018b <result>.W
 /// result:
@@ -9781,7 +9569,6 @@ void clif_disconnect_ack(struct map_session_data* sd, short result)
 	WFIFOSET(fd,packet_len(0x18b));
 }
 
-
 void clif_parse_QuitGame(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to disconnect from server (CZ_REQ_DISCONNECT).
 /// 018a <type>.W
@@ -9801,7 +9588,6 @@ void clif_parse_QuitGame(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Requesting unit's name.
 /// 0094 <id>.L (CZ_REQNAME)
@@ -9982,17 +9768,16 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
 		WFIFOW(fd,0) = 0x8e;
 	}
 	WFIFOSET(fd, WFIFOW(fd,2));
-	
+
 	// Chat logging type 'O' / Global Chat
 	logs->chat(LOG_CHAT_GLOBAL, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message);
-	
+
 #ifdef PCRE_SUPPORT
 	// trigger listening npcs
 	map->foreachinrange(npc_chat->sub, &sd->bl, AREA_SIZE, BL_NPC, text, textlen, &sd->bl);
 #endif
 }
 
-
 void clif_parse_MapMove(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /mm /mapmove (as @rura GM command) (CZ_MOVETO_MAP).
 /// Request to warp to a map on given coordinates.
@@ -10008,7 +9793,6 @@ void clif_parse_MapMove(int fd, struct map_session_data *sd)
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 /// Updates body and head direction of an object (ZC_CHANGE_DIRECTION).
 /// 009c <id>.L <head dir>.W <dir>.B
 /// head dir:
@@ -10043,7 +9827,6 @@ void clif_changed_dir(struct block_list *bl, enum send_target target)
 	}
 }
 
-
 void clif_parse_ChangeDir(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to change own body and head direction.
 /// 009b <head dir>.W <dir>.B (CZ_CHANGE_DIRECTION)
@@ -10060,7 +9843,6 @@ void clif_parse_ChangeDir(int fd, struct map_session_data *sd)
 	clif->changed_dir(&sd->bl, AREA_WOS);
 }
 
-
 void clif_parse_Emotion(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to show an emotion (CZ_REQ_EMOTION).
 /// 00bf <type>.B
@@ -10095,7 +9877,6 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd)
 		clif->skill_fail(sd, 1, USESKILL_FAIL_LEVEL, 1);
 }
 
-
 /// Amount of currently online players, reply to /w /who (ZC_USER_COUNT).
 /// 00c2 <count>.L
 void clif_user_count(struct map_session_data* sd, int count) {
@@ -10110,7 +9891,6 @@ void clif_user_count(struct map_session_data* sd, int count) {
 	WFIFOSET(fd,packet_len(0xc2));
 }
 
-
 void clif_parse_HowManyConnections(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /w /who (CZ_REQ_USER_COUNT).
 /// Request to display amount of currently connected players.
@@ -10119,10 +9899,9 @@ void clif_parse_HowManyConnections(int fd, struct map_session_data *sd) {
 	clif->user_count(sd, map->getusers());
 }
 
-
 void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, int64 tick) {
 	struct block_list *target = NULL;
-	
+
 	nullpo_retv(sd);
 	if (pc_isdead(sd)) {
 		clif->clearunit_area(&sd->bl, CLR_DEAD);
@@ -10149,12 +9928,11 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 	switch(action_type) {
 		case 0x00: // once attack
 		case 0x07: // continuous attack
-
 			if( (target = map->id2bl(target_id)) && target->type == BL_NPC ) {
 				npc->click(sd,(TBL_NPC*)target);
 				return;
 			}
-			
+
 			if( pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE )
 				return;
 
@@ -10240,7 +10018,6 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
 	);
 }
 
-
 void clif_parse_Restart(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Response to the death/system menu (CZ_RESTART).
 /// 00b2 <type>.B
@@ -10267,7 +10044,6 @@ void clif_parse_Restart(int fd, struct map_session_data *sd) {
 	}
 }
 
-
 void clif_parse_WisMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Validates and processes whispered messages (CZ_WHISPER).
 /// 0096 <packet len>.W <nick>.24B <message>.?B
@@ -10403,7 +10179,6 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 	clif->wis_message(dstsd->fd, sd->status.name, message, messagelen);
 }
 
-
 void clif_parse_Broadcast(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /b /nb (CZ_BROADCAST).
 /// Request to broadcast a message on whole server.
@@ -10420,7 +10195,6 @@ void clif_parse_Broadcast(int fd, struct map_session_data* sd) {
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 void clif_parse_TakeItem(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to pick up an item.
 /// 009f <id>.L (CZ_ITEM_PICKUP)
@@ -10465,7 +10239,6 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd) {
 	clif->additem(sd,0,0,6);
 }
 
-
 void clif_parse_DropItem(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to drop an item.
 /// 00a2 <index>.W <amount>.W (CZ_ITEM_THROW)
@@ -10503,7 +10276,6 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd)
 	clif->dropitem(sd, item_index, 0);
 }
 
-
 void clif_parse_UseItem(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to use an item.
 /// 00a7 <index>.W <account id>.L (CZ_USE_ITEM)
@@ -10532,7 +10304,6 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
 		clif->useitemack(sd,n,0,false); //Send an empty ack packet or the client gets stuck.
 }
 
-
 void clif_parse_EquipItem(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to equip an item (CZ_REQ_WEAR_EQUIP).
 /// 00a9 <index>.W <position>.W
@@ -10608,7 +10379,6 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
 	pc->unequipitem(sd,index, PCUNEQUIPITEM_RECALC);
 }
 
-
 void clif_parse_NpcClicked(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to start a conversation with an NPC (CZ_CONTACTNPC).
 /// 0090 <id>.L <type>.B
@@ -10649,7 +10419,6 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_NpcBuySellSelected(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Selection between buy/sell was made (CZ_ACK_SELECT_DEALTYPE).
 /// 00c5 <id>.L <type>.B
@@ -10663,7 +10432,6 @@ void clif_parse_NpcBuySellSelected(int fd, struct map_session_data *sd)
 	npc->buysellsel(sd, RFIFOL(fd,2), RFIFOB(fd,6));
 }
 
-
 /// Notification about the result of a purchase attempt from an NPC shop (ZC_PC_PURCHASE_RESULT).
 /// 00ca <result>.B
 /// result:
@@ -10682,7 +10450,6 @@ void clif_npc_buy_result(struct map_session_data* sd, unsigned char result) {
 	WFIFOSET(fd,packet_len(0xca));
 }
 
-
 void clif_parse_NpcBuyListSend(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to buy chosen items from npc shop (CZ_PC_PURCHASE_ITEMLIST).
 /// 00c8 <packet len>.W { <amount>.W <name id>.W }*
@@ -10702,7 +10469,6 @@ void clif_parse_NpcBuyListSend(int fd, struct map_session_data* sd)
 	clif->npc_buy_result(sd, result);
 }
 
-
 /// Notification about the result of a sell attempt to an NPC shop (ZC_PC_SELL_RESULT).
 /// 00cb <result>.B
 /// result:
@@ -10719,7 +10485,6 @@ void clif_npc_sell_result(struct map_session_data* sd, unsigned char result) {
 	WFIFOSET(fd,packet_len(0xcb));
 }
 
-
 void clif_parse_NpcSellListSend(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to sell chosen items to npc shop (CZ_PC_SELL_ITEMLIST).
 /// 00c9 <packet len>.W { <index>.W <amount>.W }*
@@ -10741,7 +10506,6 @@ void clif_parse_NpcSellListSend(int fd,struct map_session_data *sd)
 	clif->npc_sell_result(sd, fail);
 }
 
-
 void clif_parse_CreateChatRoom(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Chatroom creation request (CZ_CREATE_CHATROOM).
 /// 00d5 <packet len>.W <limit>.W <type>.B <passwd>.8B <title>.?B
@@ -10782,7 +10546,6 @@ void clif_parse_CreateChatRoom(int fd, struct map_session_data* sd)
 	chat->create_pc_chat(sd, s_title, s_password, limit, pub);
 }
 
-
 void clif_parse_ChatAddMember(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Chatroom join request (CZ_REQ_ENTER_ROOM).
 /// 00d9 <chat ID>.L <passwd>.8B
@@ -10794,7 +10557,6 @@ void clif_parse_ChatAddMember(int fd, struct map_session_data* sd)
 	chat->join(sd,chatid,password);
 }
 
-
 void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Chatroom properties adjustment request (CZ_CHANGE_CHATROOM).
 /// 00de <packet len>.W <limit>.W <type>.B <passwd>.8B <title>.?B
@@ -10820,7 +10582,6 @@ void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data* sd)
 	chat->change_status(sd, s_title, s_password, limit, pub);
 }
 
-
 void clif_parse_ChangeChatOwner(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to change the chat room ownership (CZ_REQ_ROLE_CHANGE).
 /// 00e0 <role>.L <nick>.24B
@@ -10832,7 +10593,6 @@ void clif_parse_ChangeChatOwner(int fd, struct map_session_data* sd)
 	chat->change_owner(sd,(char*)RFIFOP(fd,6));
 }
 
-
 void clif_parse_KickFromChat(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to expel a player from chat room (CZ_REQ_EXPEL_MEMBER).
 /// 00e2 <name>.24B
@@ -10841,7 +10601,6 @@ void clif_parse_KickFromChat(int fd,struct map_session_data *sd)
 	chat->kick(sd,(char*)RFIFOP(fd,2));
 }
 
-
 void clif_parse_ChatLeave(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to leave the current chatroom (CZ_EXIT_ROOM).
 /// 00e3
@@ -10850,7 +10609,6 @@ void clif_parse_ChatLeave(int fd, struct map_session_data* sd)
 	chat->leave(sd, false);
 }
 
-
 //Handles notifying asker and rejecter of what has just occurred.
 //Type is used to determine the correct msg_txt to use:
 //0:
@@ -10866,7 +10624,6 @@ void clif_noask_sub(struct map_session_data *src, struct map_session_data *targe
 	clif_disp_onlyself(target, output, strlen(output));
 }
 
-
 void clif_parse_TradeRequest(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to begin a trade (CZ_REQ_EXCHANGE_ITEM).
 /// 00e4 <account id>.L
@@ -10892,7 +10649,6 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) {
 	trade->request(sd,t_sd);
 }
 
-
 void clif_parse_TradeAck(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to a trade request (CZ_ACK_EXCHANGE_ITEM).
 /// 00e6 <result>.B
@@ -10904,7 +10660,6 @@ void clif_parse_TradeAck(int fd,struct map_session_data *sd)
 	trade->ack(sd,RFIFOB(fd,2));
 }
 
-
 void clif_parse_TradeAddItem(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to add an item to current trade (CZ_ADD_EXCHANGE_ITEM).
 /// 00e8 <index>.W <amount>.L
@@ -10919,7 +10674,6 @@ void clif_parse_TradeAddItem(int fd,struct map_session_data *sd)
 		trade->additem(sd, index, (short)amount);
 }
 
-
 void clif_parse_TradeOk(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to lock items in current trade (CZ_CONCLUDE_EXCHANGE_ITEM).
 /// 00eb
@@ -10928,7 +10682,6 @@ void clif_parse_TradeOk(int fd,struct map_session_data *sd)
 	trade->ok(sd);
 }
 
-
 void clif_parse_TradeCancel(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to cancel current trade (CZ_CANCEL_EXCHANGE_ITEM).
 /// 00ed
@@ -10937,7 +10690,6 @@ void clif_parse_TradeCancel(int fd,struct map_session_data *sd)
 	trade->cancel(sd);
 }
 
-
 void clif_parse_TradeCommit(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to commit current trade (CZ_EXEC_EXCHANGE_ITEM).
 /// 00ef
@@ -10946,7 +10698,6 @@ void clif_parse_TradeCommit(int fd,struct map_session_data *sd)
 	trade->commit(sd);
 }
 
-
 void clif_parse_StopAttack(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to stop chasing/attacking an unit (CZ_CANCEL_LOCKON).
 /// 0118
@@ -10955,7 +10706,6 @@ void clif_parse_StopAttack(int fd,struct map_session_data *sd)
 	pc_stop_attack(sd);
 }
 
-
 void clif_parse_PutItemToCart(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move an item from inventory to cart (CZ_MOVE_ITEM_FROM_BODY_TO_CART).
 /// 0126 <index>.W <amount>.L
@@ -10971,7 +10721,6 @@ void clif_parse_PutItemToCart(int fd,struct map_session_data *sd) {
 	}
 }
 
-
 void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move an item from cart to inventory (CZ_MOVE_ITEM_FROM_CART_TO_BODY).
 /// 0127 <index>.W <amount>.L
@@ -10982,7 +10731,6 @@ void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
 	pc->getitemfromcart(sd,RFIFOW(fd,2)-2,RFIFOL(fd,4));
 }
 
-
 void clif_parse_RemoveOption(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to remove cart/falcon/peco/dragon (CZ_REQ_CARTOFF).
 /// 012a
@@ -11001,7 +10749,6 @@ void clif_parse_RemoveOption(int fd,struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_ChangeCart(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to change cart's visual look (CZ_REQ_CHANGECART).
 /// 01af <num>.W
@@ -11009,7 +10756,6 @@ void clif_parse_ChangeCart(int fd,struct map_session_data *sd)
 {// TODO: State tracking?
 	int type;
 
-
 	if( pc->checkskill(sd, MC_CHANGECART) < 1 )
 		return;
 
@@ -11041,7 +10787,6 @@ void clif_parse_ChangeCart(int fd,struct map_session_data *sd)
 		pc->setcart(sd,type);
 }
 
-
 void clif_parse_StatusUp(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to increase status (CZ_STATUS_CHANGE).
 /// 00bb <status id>.W <amount>.B
@@ -11062,7 +10807,6 @@ void clif_parse_StatusUp(int fd,struct map_session_data *sd) {
 	pc->statusup(sd, RFIFOW(fd,2), increase_amount);
 }
 
-
 void clif_parse_SkillUp(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to increase level of a skill (CZ_UPGRADE_SKILLLEVEL).
 /// 0112 <skill id>.W
@@ -11174,7 +10918,6 @@ void clif_parse_UseSkillToPos_mercenary(struct mercenary_data *md, struct map_se
 		unit->skilluse_pos(&md->bl, x, y, skill_id, skill_lv);
 }
 
-
 void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to use a targeted skill.
 /// 0113 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL)
@@ -11306,7 +11049,7 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 ski
 		clif->pUseSkillToPos_mercenary(sd->md, sd, tick, skill_id, skill_lv, x, y, skillmoreinfo);
 		return;
 	}
-	
+
 #ifdef RENEWAL
 	if( sd->state.workinprogress&1 ){
 		clif->msgtable(sd, MSG_NPC_WORK_IN_PROGRESS); // TODO look for the client date that has this message.
@@ -11369,7 +11112,6 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 ski
 	}
 }
 
-
 void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to use a ground skill.
 /// 0116 <skill lv>.W <skill id>.W <x>.W <y>.W (CZ_USE_SKILL_TOGROUND)
@@ -11391,7 +11133,6 @@ void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
 	);
 }
 
-
 void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to use a ground skill with text.
 /// 0190 <skill lv>.W <skill id>.W <x>.W <y>.W <contents>.80B (CZ_USE_SKILL_TOGROUND_WITHTALKBOX)
@@ -11413,7 +11154,6 @@ void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd)
 	);
 }
 
-
 void clif_parse_UseSkillMap(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Answer to map selection dialog (CZ_SELECT_WARPPOINT).
 /// 011b <skill id>.W <map name>.16B
@@ -11438,7 +11178,6 @@ void clif_parse_UseSkillMap(int fd, struct map_session_data* sd)
 	skill->castend_map(sd,skill_id,map_name);
 }
 
-
 void clif_parse_RequestMemo(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to set a memo on current map (CZ_REMEMBER_WARPPOINT).
 /// 011d
@@ -11448,7 +11187,6 @@ void clif_parse_RequestMemo(int fd,struct map_session_data *sd)
 		pc->memo(sd,-1);
 }
 
-
 void clif_parse_ProduceMix(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to pharmacy item selection dialog (CZ_REQMAKINGITEM).
 /// 018e <name id>.W { <material id>.W }*3
@@ -11474,7 +11212,6 @@ void clif_parse_ProduceMix(int fd,struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_Cooking(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to mixing item selection dialog (CZ_REQ_MAKINGITEM).
 /// 025b <mk type>.W <name id>.W
@@ -11503,7 +11240,6 @@ void clif_parse_Cooking(int fd,struct map_session_data *sd) {
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_RepairItem(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to repair weapon item selection dialog (CZ_REQ_ITEMREPAIR).
 /// 01fd <index>.W <name id>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W
@@ -11521,7 +11257,6 @@ void clif_parse_RepairItem(int fd, struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_WeaponRefine(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to refine weapon item selection dialog (CZ_REQ_WEAPONREFINE).
 /// 0222 <index>.L
@@ -11544,7 +11279,6 @@ void clif_parse_WeaponRefine(int fd, struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to script menu dialog (CZ_CHOOSE_MENU).
 /// 00b8 <npc id>.L <choice>.B
@@ -11575,7 +11309,6 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd)
 	npc->scriptcont(sd,npc_id, false);
 }
 
-
 void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// NPC dialog 'next' click (CZ_REQ_NEXT_SCRIPT).
 /// 00b9 <npc id>.L
@@ -11584,7 +11317,6 @@ void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd)
 	npc->scriptcont(sd,RFIFOL(fd,2), false);
 }
 
-
 void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// NPC numeric input dialog value (CZ_INPUT_EDITDLG).
 /// 0143 <npc id>.L <value>.L
@@ -11600,7 +11332,6 @@ void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd)
 	npc->scriptcont(sd, npcid, false);
 }
 
-
 void clif_parse_NpcStringInput(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// NPC text input dialog value (CZ_INPUT_EDITDLGSTR).
 /// 01d5 <packet len>.W <npc id>.L <string>.?B
@@ -11617,7 +11348,6 @@ void clif_parse_NpcStringInput(int fd, struct map_session_data* sd)
 	npc->scriptcont(sd, npcid, false);
 }
 
-
 void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// NPC dialog 'close' click (CZ_CLOSE_DIALOG).
 /// 0146 <npc id>.L
@@ -11629,7 +11359,6 @@ void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd)
 	npc->scriptcont(sd, RFIFOL(fd,2), true);
 }
 
-
 void clif_parse_ItemIdentify(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to identify item selection dialog (CZ_REQ_ITEMIDENTIFY).
 /// 0178 <index>.W
@@ -11651,7 +11380,6 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_SelectArrow(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to arrow crafting item selection dialog (CZ_REQ_MAKINGARROW).
 /// 01ae <name id>.W
@@ -11684,7 +11412,6 @@ void clif_parse_SelectArrow(int fd,struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_AutoSpell(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to SA_AUTOSPELL skill selection dialog (CZ_SELECTAUTOSPELL).
 /// 01ce <skill id>.L
@@ -11704,7 +11431,6 @@ void clif_parse_AutoSpell(int fd,struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_UseCard(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to display item carding/composition list (CZ_REQ_ITEMCOMPOSITION_LIST).
 /// 017a <card index>.W
@@ -11713,7 +11439,6 @@ void clif_parse_UseCard(int fd,struct map_session_data *sd)
 	clif->use_card(sd,RFIFOW(fd,2)-2);
 }
 
-
 void clif_parse_InsertCard(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to carding/composing item selection dialog (CZ_REQ_ITEMCOMPOSITION).
 /// 017c <card index>.W <equip index>.W
@@ -11722,7 +11447,6 @@ void clif_parse_InsertCard(int fd,struct map_session_data *sd)
 	pc->insert_card(sd,RFIFOW(fd,2)-2,RFIFOW(fd,4)-2);
 }
 
-
 void clif_parse_SolveCharName(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request of character's name by char ID.
 /// 0193 <char id>.L (CZ_REQNAME_BYGID)
@@ -11735,7 +11459,6 @@ void clif_parse_SolveCharName(int fd, struct map_session_data *sd) {
 	map->reqnickdb(sd, charid);
 }
 
-
 void clif_parse_ResetChar(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /resetskill /resetstate (CZ_RESET).
 /// Request to reset stats or skills.
@@ -11754,7 +11477,6 @@ void clif_parse_ResetChar(int fd, struct map_session_data *sd) {
 	atcommand->exec(fd, sd, cmd, true);
 }
 
-
 void clif_parse_LocalBroadcast(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /lb /nlb (CZ_LOCALBROADCAST).
 /// Request to broadcast a message on current map.
@@ -11772,7 +11494,6 @@ void clif_parse_LocalBroadcast(int fd, struct map_session_data* sd)
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 void clif_parse_MoveToKafra(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move an item from inventory to storage.
 /// 00f3 <index>.W <amount>.L (CZ_MOVE_ITEM_FROM_BODY_TO_STORE)
@@ -11796,7 +11517,6 @@ void clif_parse_MoveToKafra(int fd, struct map_session_data *sd)
 		gstorage->add(sd, item_index, item_amount);
 }
 
-
 void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move an item from storage to inventory.
 /// 00f5 <index>.W <amount>.L (CZ_MOVE_ITEM_FROM_STORE_TO_BODY)
@@ -11815,7 +11535,6 @@ void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd)
 		gstorage->get(sd, item_index, item_amount);
 }
 
-
 void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move an item from cart to storage (CZ_MOVE_ITEM_FROM_CART_TO_STORE).
 /// 0129 <index>.W <amount>.L
@@ -11832,7 +11551,6 @@ void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd)
 		gstorage->addfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4));
 }
 
-
 void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move an item from storage to cart (CZ_MOVE_ITEM_FROM_STORE_TO_CART).
 /// 0128 <index>.W <amount>.L
@@ -11849,7 +11567,6 @@ void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd)
 		gstorage->gettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4));
 }
 
-
 void clif_parse_CloseKafra(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to close storage (CZ_CLOSE_STORE).
 /// 00f7
@@ -11861,7 +11578,6 @@ void clif_parse_CloseKafra(int fd, struct map_session_data *sd)
 		gstorage->close(sd);
 }
 
-
 /// Displays kafra storage password dialog (ZC_REQ_STORE_PASSWORD).
 /// 023a <info>.W
 /// info:
@@ -11882,7 +11598,6 @@ void clif_storagepassword(struct map_session_data* sd, short info)
 	WFIFOSET(fd,packet_len(0x23a));
 }
 
-
 void clif_parse_StoragePassword(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to the kafra storage password dialog (CZ_ACK_STORE_PASSWORD).
 /// 023b <type>.W <password>.16B <new password>.16B
@@ -11895,7 +11610,6 @@ void clif_parse_StoragePassword(int fd, struct map_session_data *sd)
 	//TODO
 }
 
-
 /// Result of kafra storage password validation (ZC_RESULT_STORE_PASSWORD).
 /// 023c <result>.W <error count>.W
 /// result:
@@ -11919,7 +11633,6 @@ void clif_storagepassword_result(struct map_session_data* sd, short result, shor
 	WFIFOSET(fd,packet_len(0x23c));
 }
 
-
 void clif_parse_CreateParty(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Party creation request
 /// 00f9 <party name>.24B (CZ_MAKE_GROUP)
@@ -11961,7 +11674,6 @@ void clif_parse_CreateParty2(int fd, struct map_session_data *sd) {
 	party->create(sd,name,item1,item2);
 }
 
-
 void clif_parse_PartyInvite(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Party invitation request
 /// 00fc <account id>.L (CZ_REQ_JOIN_GROUP)
@@ -12007,7 +11719,6 @@ void clif_parse_PartyInvite2(int fd, struct map_session_data *sd) {
 	party->invite(sd, t_sd);
 }
 
-
 void clif_parse_ReplyPartyInvite(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Party invitation reply
 /// 00ff <party id>.L <flag>.L (CZ_JOIN_GROUP)
@@ -12026,7 +11737,6 @@ void clif_parse_ReplyPartyInvite2(int fd,struct map_session_data *sd)
 	party->reply_invite(sd,RFIFOL(fd,2),RFIFOB(fd,6));
 }
 
-
 void clif_parse_LeaveParty(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to leave party (CZ_REQ_LEAVE_GROUP).
 /// 0100
@@ -12039,7 +11749,6 @@ void clif_parse_LeaveParty(int fd, struct map_session_data *sd) {
 	party->leave(sd);
 }
 
-
 void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to expel a party member (CZ_REQ_EXPEL_GROUP_MEMBER).
 /// 0103 <account id>.L <char name>.24B
@@ -12052,7 +11761,6 @@ void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd) {
 	party->removemember(sd,RFIFOL(fd,2),(char*)RFIFOP(fd,6));
 }
 
-
 void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to change party options.
 /// 0102 <exp share rule>.L (CZ_CHANGE_GROUPEXPOPTION)
@@ -12084,7 +11792,6 @@ void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd)
 #endif
 }
 
-
 void clif_parse_PartyMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Validates and processes party messages (CZ_REQUEST_CHAT_PARTY).
 /// 0108 <packet len>.W <text>.?B (<name> : <message>) 00
@@ -12118,7 +11825,6 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd)
 	party->send_message(sd, text, textlen);
 }
 
-
 void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Changes Party Leader (CZ_CHANGE_GROUP_MASTER).
 /// 07da <account id>.L
@@ -12149,7 +11855,6 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 #endif
 }
 
-
 /// Result of request to register a party booking advertisement (ZC_PARTY_BOOKING_ACK_REGISTER).
 /// 0803 <result>.W
 /// result:
@@ -12172,7 +11877,6 @@ void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
 #endif
 }
 
-
 void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to search for party booking advertisement (CZ_PARTY_BOOKING_REQ_SEARCH).
 /// 0804 <level>.W <map id>.W <job>.W <last index>.L <result count>.W
@@ -12191,7 +11895,6 @@ void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
 #endif
 }
 
-
 /// Party booking search results (ZC_PARTY_BOOKING_ACK_SEARCH).
 /// 0805 <packet len>.W <more results>.B { <index>.L <char name>.24B <expire time>.L <level>.W <map id>.W { <job>.W }*6 }*
 /// more results:
@@ -12225,7 +11928,6 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 #endif
 }
 
-
 void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to delete own party booking advertisement (CZ_PARTY_BOOKING_REQ_DELETE).
 /// 0806
@@ -12239,7 +11941,6 @@ void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 #endif
 }
 
-
 /// Result of request to delete own party booking advertisement (ZC_PARTY_BOOKING_ACK_DELETE).
 /// 0807 <result>.W
 /// result:
@@ -12263,7 +11964,6 @@ void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
 #endif
 }
 
-
 void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to update party booking advertisement (CZ_PARTY_BOOKING_REQ_UPDATE).
 /// 0808 { <job>.W }*6
@@ -12282,7 +11982,6 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 #endif
 }
 
-
 /// Notification about new party booking advertisement (ZC_PARTY_BOOKING_NOTIFY_INSERT).
 /// 0809 <index>.L <char name>.24B <expire time>.L <level>.W <map id>.W { <job>.W }*6
 void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
@@ -12309,7 +12008,6 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
 #endif
 }
 
-
 /// Notification about updated party booking advertisement (ZC_PARTY_BOOKING_NOTIFY_UPDATE).
 /// 080a <index>.L { <job>.W }*6
 void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
@@ -12331,7 +12029,6 @@ void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_boo
 #endif
 }
 
-
 /// Notification about deleted party booking advertisement (ZC_PARTY_BOOKING_NOTIFY_DELETE).
 /// 080b <index>.L
 void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
@@ -12768,7 +12465,6 @@ void clif_parse_CloseVending(int fd, struct map_session_data* sd)
 	vending->close(sd);
 }
 
-
 void clif_parse_VendingListReq(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to open a vending shop (CZ_REQ_BUY_FROMMC).
 /// 0130 <account id>.L
@@ -12780,7 +12476,6 @@ void clif_parse_VendingListReq(int fd, struct map_session_data* sd)
 	vending->list(sd,RFIFOL(fd,2));
 }
 
-
 void clif_parse_PurchaseReq(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Shop item(s) purchase request (CZ_PC_PURCHASE_ITEMLIST_FROMMC).
 /// 0134 <packet len>.W <account id>.L { <amount>.W <index>.W }*
@@ -12796,7 +12491,6 @@ void clif_parse_PurchaseReq(int fd, struct map_session_data* sd)
 	sd->vended_id = 0;
 }
 
-
 void clif_parse_PurchaseReq2(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Shop item(s) purchase request (CZ_PC_PURCHASE_ITEMLIST_FROMMC2).
 /// 0801 <packet len>.W <account id>.L <unique id>.L { <amount>.W <index>.W }*
@@ -12813,7 +12507,6 @@ void clif_parse_PurchaseReq2(int fd, struct map_session_data* sd)
 	sd->vended_id = 0;
 }
 
-
 void clif_parse_OpenVending(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Confirm or cancel the shop preparation window.
 /// 012f <packet len>.W <shop name>.80B { <index>.W <amount>.W <price>.L }* (CZ_REQ_OPENSTORE)
@@ -12863,7 +12556,6 @@ void clif_parse_CreateGuild(int fd,struct map_session_data *sd) {
 	guild->create(sd, name);
 }
 
-
 void clif_parse_GuildCheckMaster(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request for guild window interface permissions (CZ_REQ_GUILD_MENUINTERFACE).
 /// 014d
@@ -12872,7 +12564,6 @@ void clif_parse_GuildCheckMaster(int fd, struct map_session_data *sd)
 	clif->guild_masterormember(sd);
 }
 
-
 void clif_parse_GuildRequestInfo(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request for guild window information (CZ_REQ_GUILD_MENU).
 /// 014f <type>.L
@@ -12914,7 +12605,6 @@ void clif_parse_GuildRequestInfo(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to update guild positions (CZ_REG_CHANGE_GUILD_POSITIONINFO).
 /// 0161 <packet len>.W { <position id>.L <mode>.L <ranking>.L <pay rate>.L <name>.24B }*
@@ -12930,7 +12620,6 @@ void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_GuildChangeMemberPosition(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to update the position of guild members (CZ_REQ_CHANGE_MEMBERPOS).
 /// 0155 <packet len>.W { <account id>.L <char id>.L <position id>.L }*
@@ -12947,7 +12636,6 @@ void clif_parse_GuildChangeMemberPosition(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_GuildRequestEmblem(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request for guild emblem data (CZ_REQ_GUILD_EMBLEM_IMG).
 /// 0151 <guild id>.L
@@ -13084,7 +12772,6 @@ bool clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) {
 	return true;
 }
 
-
 void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to update the guild emblem (CZ_REGISTER_GUILD_EMBLEM_IMG).
 /// 0153 <packet len>.W <emblem data>.?B
@@ -13105,7 +12792,6 @@ void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd)
 	guild->change_emblem(sd, emblem_len, (const char*)emblem);
 }
 
-
 void clif_parse_GuildChangeNotice(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Guild notice update request (CZ_GUILD_NOTICE).
 /// 016e <guild id>.L <msg1>.60B <msg2>.120B
@@ -13182,7 +12868,6 @@ void clif_parse_GuildReplyInvite(int fd,struct map_session_data *sd)
 	guild->reply_invite(sd,RFIFOL(fd,2),RFIFOL(fd,6));
 }
 
-
 void clif_parse_GuildLeave(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to leave guild (CZ_REQ_LEAVE_GUILD).
 /// 0159 <guild id>.L <account id>.L <char id>.L <reason>.40B
@@ -13200,7 +12885,6 @@ void clif_parse_GuildLeave(int fd,struct map_session_data *sd) {
 	guild->leave(sd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),(char*)RFIFOP(fd,14));
 }
 
-
 void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to expel a member of a guild (CZ_REQ_BAN_GUILD).
 /// 015b <guild id>.L <account id>.L <char id>.L <reason>.40B
@@ -13213,7 +12897,6 @@ void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd) {
 	guild->expulsion(sd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),(char*)RFIFOP(fd,14));
 }
 
-
 void clif_parse_GuildMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Validates and processes guild messages (CZ_GUILD_CHAT).
 /// 017e <packet len>.W <text>.?B (<name> : <message>) 00
@@ -13250,7 +12933,6 @@ void clif_parse_GuildMessage(int fd, struct map_session_data* sd)
 		guild->send_message(sd, text, textlen);
 }
 
-
 void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Guild alliance request (CZ_REQ_ALLY_GUILD).
 /// 0170 <account id>.L <inviter account id>.L <inviter char id>.L
@@ -13277,7 +12959,6 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd) {
 	guild->reqalliance(sd,t_sd);
 }
 
-
 void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to a guild alliance request (CZ_ALLY_GUILD).
 /// 0172 <inviter account id>.L <answer>.L
@@ -13289,7 +12970,6 @@ void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd)
 	guild->reply_reqalliance(sd,RFIFOL(fd,2),RFIFOL(fd,6));
 }
 
-
 void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to delete a guild alliance or opposition (CZ_REQ_DELETE_RELATED_GUILD).
 /// 0183 <opponent guild id>.L <relation>.L
@@ -13308,7 +12988,6 @@ void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd) {
 	guild->delalliance(sd,RFIFOL(fd,2),RFIFOL(fd,6));
 }
 
-
 void clif_parse_GuildOpposition(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to set a guild as opposition (CZ_REQ_HOSTILE_GUILD).
 /// 0180 <account id>.L
@@ -13335,7 +13014,6 @@ void clif_parse_GuildOpposition(int fd, struct map_session_data *sd) {
 	guild->opposition(sd,t_sd);
 }
 
-
 void clif_parse_GuildBreak(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to delete own guild (CZ_REQ_DISORGANIZE_GUILD).
 /// 015d <key>.40B
@@ -13351,7 +13029,6 @@ void clif_parse_GuildBreak(int fd, struct map_session_data *sd) {
 	guild->dobreak(sd,(char*)RFIFOP(fd,2));
 }
 
-
 /// Pet
 ///
 
@@ -13369,7 +13046,6 @@ void clif_parse_PetMenu(int fd, struct map_session_data *sd)
 	pet->menu(sd,RFIFOB(fd,2));
 }
 
-
 void clif_parse_CatchPet(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Attempt to tame a monster (CZ_TRYCAPTURE_MONSTER).
 /// 019f <id>.L
@@ -13378,7 +13054,6 @@ void clif_parse_CatchPet(int fd, struct map_session_data *sd)
 	pet->catch_process2(sd,RFIFOL(fd,2));
 }
 
-
 void clif_parse_SelectEgg(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to pet incubator egg selection dialog (CZ_SELECT_PETEGG).
 /// 01a7 <index>.W
@@ -13391,7 +13066,6 @@ void clif_parse_SelectEgg(int fd, struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 void clif_parse_SendEmotion(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to display pet's emotion/talk (CZ_PET_ACT).
 /// 01a9 <data>.L
@@ -13423,7 +13097,6 @@ void clif_parse_SendEmotion(int fd, struct map_session_data *sd)
 		clif->pet_emotion(sd->pd,RFIFOL(fd,2));
 }
 
-
 void clif_parse_ChangePetName(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to change pet's name (CZ_RENAME_PET).
 /// 01a5 <name>.24B
@@ -13432,7 +13105,6 @@ void clif_parse_ChangePetName(int fd, struct map_session_data *sd)
 	pet->change_name(sd,(char*)RFIFOP(fd,2));
 }
 
-
 void clif_parse_GMKick(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /kill (CZ_DISCONNECT_CHARACTER).
 /// Request to disconnect a character.
@@ -13492,7 +13164,6 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd) {
 	}
 }
 
-
 void clif_parse_GMKickAll(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /killall (CZ_DISCONNECT_ALL_CHARACTER).
 /// Request to disconnect all characters.
@@ -13503,7 +13174,6 @@ void clif_parse_GMKickAll(int fd, struct map_session_data* sd) {
 	atcommand->exec(fd, sd, cmd, true);
 }
 
-
 void clif_parse_GMShift(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /remove (CZ_REMOVE_AID).
 /// Request to warp to a character with given login ID.
@@ -13524,7 +13194,6 @@ void clif_parse_GMShift(int fd, struct map_session_data *sd)
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 void clif_parse_GMRemove2(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /remove (CZ_REMOVE_AID_SSO).
 /// Request to warp to a character with given account ID.
@@ -13541,7 +13210,6 @@ void clif_parse_GMRemove2(int fd, struct map_session_data* sd) {
 	}
 }
 
-
 void clif_parse_GMRecall(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /recall (CZ_RECALL).
 /// Request to summon a player with given login ID to own position.
@@ -13562,7 +13230,6 @@ void clif_parse_GMRecall(int fd, struct map_session_data *sd)
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 void clif_parse_GMRecall2(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /recall (CZ_RECALL_SSO).
 /// Request to summon a player with given account ID to own position.
@@ -13579,7 +13246,6 @@ void clif_parse_GMRecall2(int fd, struct map_session_data* sd) {
 	}
 }
 
-
 void clif_parse_GM_Monster_Item(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /item /monster (CZ_ITEM_CREATE).
 /// Request to execute GM commands.
@@ -13650,7 +13316,6 @@ void clif_parse_GM_Monster_Item(int fd, struct map_session_data *sd) {
 	}
 }
 
-
 void clif_parse_GMHide(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /hide (CZ_CHANGE_EFFECTSTATE).
 /// 019d <effect state>.L
@@ -13664,7 +13329,6 @@ void clif_parse_GMHide(int fd, struct map_session_data *sd) {
 	atcommand->exec(fd, sd, cmd, true);
 }
 
-
 void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to adjust player's manner points (CZ_REQ_GIVE_MANNER_POINT).
 /// 0149 <account id>.L <type>.B <value>.W
@@ -13719,7 +13383,6 @@ void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd) {
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 void clif_parse_GMRc(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /rc (CZ_REQ_GIVE_MANNER_BYNAME).
 /// GM adjustment of a player's manner value by -60.
@@ -13734,7 +13397,6 @@ void clif_parse_GMRc(int fd, struct map_session_data* sd)
 	atcommand->exec(fd, sd, command, true);
 }
 
-
 /// Result of request to resolve account name (ZC_ACK_ACCOUNTNAME).
 /// 01e0 <account id>.L <account name>.24B
 void clif_account_name(struct map_session_data* sd, int account_id, const char* accname) {
@@ -13749,7 +13411,6 @@ void clif_account_name(struct map_session_data* sd, int account_id, const char*
 	WFIFOSET(fd,packet_len(0x1e0));
 }
 
-
 void clif_parse_GMReqAccountName(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// GM requesting account name (for right-click gm menu) (CZ_REQ_ACCOUNTNAME).
 /// 01df <account id>.L
@@ -13761,7 +13422,6 @@ void clif_parse_GMReqAccountName(int fd, struct map_session_data *sd)
 	clif->account_name(sd, account_id, ""); // insert account name here >_<
 }
 
-
 void clif_parse_GMChangeMapType(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /changemaptype <x> <y> <type> (CZ_CHANGE_MAPTYPE).
 /// GM single cell type change request.
@@ -13784,7 +13444,6 @@ void clif_parse_GMChangeMapType(int fd, struct map_session_data *sd) {
 	//FIXME: once players leave the map, the client 'forgets' this information.
 }
 
-
 void clif_parse_PMIgnore(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// /in /ex (CZ_SETTING_WHISPER_PC).
 /// Request to allow/deny whispers from a nick.
@@ -13838,7 +13497,6 @@ void clif_parse_PMIgnore(int fd, struct map_session_data* sd) {
 	clif->wisexin(sd, type, 0); // success
 }
 
-
 void clif_parse_PMIgnoreAll(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /inall /exall (CZ_SETTING_WHISPER_STATE).
 /// Request to allow/deny all whispers.
@@ -13875,7 +13533,6 @@ void clif_parse_PMIgnoreAll(int fd, struct map_session_data *sd)
 	clif->wisall(sd, type, flag);
 }
 
-
 /// Whisper ignore list (ZC_WHISPER_LIST).
 /// 00d4 <packet len>.W { <char name>.24B }*
 void clif_PMIgnoreList(struct map_session_data* sd) {
@@ -13894,7 +13551,6 @@ void clif_PMIgnoreList(struct map_session_data* sd) {
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 void clif_parse_PMIgnoreList(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Whisper ignore list request (CZ_REQ_WHISPER_LIST).
 /// 00d3
@@ -13903,7 +13559,6 @@ void clif_parse_PMIgnoreList(int fd,struct map_session_data *sd)
 	clif->PMIgnoreList(sd);
 }
 
-
 void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to invoke the /doridori recovery bonus (CZ_DORIDORI).
 /// 01e7
@@ -13923,7 +13578,6 @@ void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to invoke the effect of super novice's guardian angel prayer (CZ_CHOPOKGI).
 /// 01ed
@@ -13953,7 +13607,6 @@ void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *sd)
 	}
 }
 
-
 /// Friends List
 ///
 
@@ -13982,7 +13635,6 @@ void clif_friendslist_toggle(struct map_session_data *sd,int account_id, int cha
 	WFIFOSET(fd, packet_len(0x206));
 }
 
-
 //Sub-function called from clif_foreachclient to toggle friends on/off [Skotlex]
 int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap)
 {
@@ -13994,7 +13646,6 @@ int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap)
 	return 0;
 }
 
-
 /// Sends the whole friends list (ZC_FRIENDS_LIST).
 /// 0201 <packet len>.W { <account id>.L <char id>.L <name>.24B }*
 void clif_friendslist_send(struct map_session_data *sd)
@@ -14022,7 +13673,6 @@ void clif_friendslist_send(struct map_session_data *sd)
 	}
 }
 
-
 /// Notification about the result of a friend add request (ZC_ADD_FRIENDS_LIST).
 /// 0209 <result>.W <account id>.L <char id>.L <name>.24B
 /// result:
@@ -14047,7 +13697,6 @@ void clif_friendslist_reqack(struct map_session_data *sd, struct map_session_dat
 	WFIFOSET(fd, packet_len(0x209));
 }
 
-
 /// Asks a player for permission to be added as friend (ZC_REQ_ADD_FRIENDS).
 /// 0207 <req account id>.L <req char id>.L <req char name>.24B
 void clif_friendlist_req(struct map_session_data* sd, int account_id, int char_id, const char* name) {
@@ -14063,7 +13712,6 @@ void clif_friendlist_req(struct map_session_data* sd, int account_id, int char_i
 	WFIFOSET(fd,packet_len(0x207));
 }
 
-
 void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to add a player as friend (CZ_ADD_FRIENDS).
 /// 0202 <name>.24B
@@ -14113,7 +13761,6 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd) {
 	clif->friendlist_req(f_sd, sd->status.account_id, sd->status.char_id, sd->status.name);
 }
 
-
 void clif_parse_FriendsListReply(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to a friend add request (CZ_ACK_REQ_ADD_FRIENDS).
 /// 0208 <inviter account id>.L <inviter char id>.L <result>.B
@@ -14182,7 +13829,6 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to delete a friend (CZ_DELETE_FRIENDS).
 /// 0203 <account id>.L <char id>.L
@@ -14247,7 +13893,6 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
 	WFIFOSET(fd, packet_len(0x20a));
 }
 
-
 /// /pvpinfo list (ZC_ACK_PVPPOINT).
 /// 0210 <char id>.L <account id>.L <win point>.L <lose point>.L <point>.L
 void clif_PVPInfo(struct map_session_data* sd) {
@@ -14265,7 +13910,6 @@ void clif_PVPInfo(struct map_session_data* sd) {
 	WFIFOSET(fd, packet_len(0x210));
 }
 
-
 void clif_parse_PVPInfo(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /pvpinfo (CZ_REQ_PVPPOINT).
 /// 020f <char id>.L <account id>.L
@@ -14494,7 +14138,6 @@ void clif_ranking_pk(struct map_session_data* sd) {
 	WFIFOSET(fd, packet_len(0x238));
 }
 
-
 void clif_parse_RankingPk(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /pk (CZ_KILLER_RANK).
 /// 0237
@@ -14502,7 +14145,6 @@ void clif_parse_RankingPk(int fd,struct map_session_data *sd) {
 	clif->ranking_pk(sd);
 }
 
-
 void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// SG Feel save OK [Komurka] (CZ_AGREE_STARPLACE).
 /// 0254 <which>.B
@@ -14530,7 +14172,6 @@ void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
-
 /// Star Gladiator's Feeling map confirmation prompt (ZC_STARPLACE).
 /// 0253 <which>.B
 /// which:
@@ -14548,7 +14189,6 @@ void clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv)
 	sd->menuskill_val = skill_lv;
 }
 
-
 void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to change homunculus' name (CZ_RENAME_MER).
 /// 0231 <name>.24B
@@ -14556,7 +14196,6 @@ void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd) {
 	homun->change_name(sd,(char*)RFIFOP(fd,2));
 }
 
-
 void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to warp/move homunculus/mercenary to it's owner (CZ_REQUEST_MOVETOOWNER).
 /// 0234 <id>.L
@@ -14578,7 +14217,6 @@ void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd)
 	unit->walktoxy(bl, ud->to_x, ud->to_y, 4);
 }
 
-
 void clif_parse_HomMoveTo(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to move homunculus/mercenary (CZ_REQUEST_MOVENPC).
 /// 0232 <id>.L <position data>.3B
@@ -14600,7 +14238,6 @@ void clif_parse_HomMoveTo(int fd, struct map_session_data *sd)
 	unit->walktoxy(bl, x, y, 4);
 }
 
-
 void clif_parse_HomAttack(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to do an action with homunculus/mercenary (CZ_REQUEST_ACTNPC).
 /// 0233 <id>.L <target id>.L <action>.B
@@ -14623,7 +14260,6 @@ void clif_parse_HomAttack(int fd,struct map_session_data *sd)
 	unit->attack(bl, target_id, action_type != 0);
 }
 
-
 void clif_parse_HomMenu(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to invoke a homunculus menu action (CZ_COMMAND_MER).
 /// 022d <type>.W <command>.B
@@ -14644,7 +14280,6 @@ void clif_parse_HomMenu(int fd, struct map_session_data *sd) { //[orn]
 	homun->menu(sd,RFIFOB(fd,packet_db[cmd].pos[1]));
 }
 
-
 void clif_parse_AutoRevive(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to resurrect oneself using Token of Siegfried (CZ_STANDING_RESURRECTION).
 /// 0292
@@ -14673,7 +14308,6 @@ void clif_parse_AutoRevive(int fd, struct map_session_data *sd) {
 	clif->skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1);
 }
 
-
 /// Information about character's status values (ZC_ACK_STATUS_GM).
 /// 0214 <str>.B <standardStr>.B <agi>.B <standardAgi>.B <vit>.B <standardVit>.B
 ///      <int>.B <standardInt>.B <dex>.B <standardDex>.B <luk>.B <standardLuk>.B
@@ -14714,7 +14348,6 @@ void clif_check(int fd, struct map_session_data* pl_sd) {
 	WFIFOSET(fd,packet_len(0x214));
 }
 
-
 void clif_parse_Check(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// /check (CZ_REQ_STATUS_GM).
 /// Request character's status values.
@@ -14736,8 +14369,6 @@ void clif_parse_Check(int fd, struct map_session_data *sd)
 	clif->check(fd, pl_sd);
 }
 
-
-
 /// MAIL SYSTEM
 /// By Zephyrus
 ///
@@ -14756,7 +14387,6 @@ void clif_Mail_setattachment(int fd, int index, uint8 flag)
 	WFIFOSET(fd,packet_len(0x255));
 }
 
-
 /// Notification about the result of retrieving a mail attachment (ZC_MAIL_REQ_GET_ITEM).
 /// 0245 <result>.B
 /// result:
@@ -14771,7 +14401,6 @@ void clif_Mail_getattachment(int fd, uint8 flag)
 	WFIFOSET(fd,packet_len(0x245));
 }
 
-
 /// Notification about the result of sending a mail (ZC_MAIL_REQ_SEND).
 /// 0249 <result>.B
 /// result:
@@ -14785,7 +14414,6 @@ void clif_Mail_send(int fd, bool fail)
 	WFIFOSET(fd,packet_len(0x249));
 }
 
-
 /// Notification about the result of deleting a mail (ZC_ACK_MAIL_DELETE).
 /// 0257 <mail id>.L <result>.W
 /// result:
@@ -14800,7 +14428,6 @@ void clif_Mail_delete(int fd, int mail_id, short fail)
 	WFIFOSET(fd, packet_len(0x257));
 }
 
-
 /// Notification about the result of returning a mail (ZC_ACK_MAIL_RETURN).
 /// 0274 <mail id>.L <result>.W
 /// result:
@@ -14815,7 +14442,6 @@ void clif_Mail_return(int fd, int mail_id, short fail)
 	WFIFOSET(fd,packet_len(0x274));
 }
 
-
 /// Notification about new mail (ZC_MAIL_RECEIVE).
 /// 024a <mail id>.L <title>.40B <sender>.24B
 void clif_Mail_new(int fd, int mail_id, const char *sender, const char *title)
@@ -14830,7 +14456,6 @@ void clif_Mail_new(int fd, int mail_id, const char *sender, const char *title)
 	WFIFOSET(fd,packet_len(0x24a));
 }
 
-
 /// Opens/closes the mail window (ZC_MAIL_WINDOWS).
 /// 0260 <type>.L
 /// type:
@@ -14844,7 +14469,6 @@ void clif_Mail_window(int fd, int flag)
 	WFIFOSET(fd,packet_len(0x260));
 }
 
-
 /// Lists mails stored in inbox (ZC_MAIL_REQ_GET_LIST).
 /// 0240 <packet len>.W <amount>.L { <mail id>.L <title>.40B <read>.B <sender>.24B <time>.L }*amount
 /// read:
@@ -14887,7 +14511,6 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Mail inbox list request (CZ_MAIL_GET_LIST).
 /// 023f
@@ -14904,7 +14527,6 @@ void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd)
 	mail->removezeny(sd, 0);
 }
 
-
 /// Opens a mail (ZC_MAIL_REQ_OPEN).
 /// 0242 <packet len>.W <mail id>.L <title>.40B <sender>.24B <time>.L <zeny>.L
 ///     <amount>.L <name id>.W <item type>.W <identified>.B <damaged>.B <refine>.B
@@ -14967,7 +14589,6 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
 	}
 }
 
-
 void clif_parse_Mail_read(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to open a mail (CZ_MAIL_OPEN).
 /// 0241 <mail id>.L
@@ -14983,7 +14604,6 @@ void clif_parse_Mail_read(int fd, struct map_session_data *sd)
 	clif->mail_read(sd, RFIFOL(fd,2));
 }
 
-
 void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to receive mail's attachment (CZ_MAIL_GET_ITEM).
 /// 0244 <mail id>.L
@@ -15052,7 +14672,6 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd)
 	intif->Mail_getattach(sd->status.char_id, mail_id);
 }
 
-
 void clif_parse_Mail_delete(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to delete a mail (CZ_MAIL_DELETE).
 /// 0243 <mail id>.L
@@ -15084,7 +14703,6 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_Mail_return(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to return a mail (CZ_REQ_MAIL_RETURN).
 /// 0273 <mail id>.L <receive name>.24B
@@ -15109,7 +14727,6 @@ void clif_parse_Mail_return(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_Mail_setattach(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to add an item or Zeny to mail (CZ_MAIL_ADD_ITEM).
 /// 0247 <index>.W <amount>.L
@@ -15128,7 +14745,6 @@ void clif_parse_Mail_setattach(int fd, struct map_session_data *sd)
 	clif->mail_setattachment(fd,idx,flag);
 }
 
-
 void clif_parse_Mail_winopen(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to reset mail item and/or Zeny (CZ_MAIL_RESET_ITEM).
 /// 0246 <type>.W
@@ -15146,7 +14762,6 @@ void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
 		mail->removezeny(sd, 0);
 }
 
-
 void clif_parse_Mail_send(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to send mail (CZ_MAIL_SEND).
 /// 0248 <packet len>.W <recipient>.24B <title>.40B <body len>.B <body>.?B
@@ -15207,7 +14822,6 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
 	sd->cansendmail_tick = timer->gettick() + 1000; // 1 Second flood Protection
 }
 
-
 /// AUCTION SYSTEM
 /// By Zephyrus
 ///
@@ -15235,7 +14849,6 @@ void clif_Auction_openwindow(struct map_session_data *sd)
 	WFIFOSET(fd,packet_len(0x25f));
 }
 
-
 /// Returns auction item search results (ZC_AUCTION_ITEM_REQ_SEARCH).
 /// 0252 <packet len>.W <pages>.L <count>.L { <auction id>.L <seller name>.24B <name id>.W <type>.L <amount>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <now price>.L <max price>.L <buyer name>.24B <delete time>.L }*
 void clif_Auction_results(struct map_session_data *sd, short count, short pages, uint8 *buf)
@@ -15281,7 +14894,6 @@ void clif_Auction_results(struct map_session_data *sd, short count, short pages,
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Result from request to add an item (ZC_ACK_AUCTION_ADD_ITEM).
 /// 0256 <index>.W <result>.B
 /// result:
@@ -15295,7 +14907,6 @@ void clif_Auction_setitem(int fd, int index, bool fail) {
 	WFIFOSET(fd,packet_len(0x256));
 }
 
-
 void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to initialize 'new auction' data (CZ_AUCTION_CREATE).
 /// 024b <type>.W
@@ -15311,7 +14922,6 @@ void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd)
 	sd->auction.amount = 0;
 }
 
-
 void clif_parse_Auction_setitem(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to add an item to the action (CZ_AUCTION_ADD_ITEM).
 /// 024c <index>.W <count>.L
@@ -15377,7 +14987,6 @@ void clif_Auction_message(int fd, unsigned char flag)
 	WFIFOSET(fd,packet_len(0x250));
 }
 
-
 /// Result of the auction close request (ZC_AUCTION_ACK_MY_SELL_STOP).
 /// 025e <result>.W
 /// result:
@@ -15392,7 +15001,6 @@ void clif_Auction_close(int fd, unsigned char flag)
 	WFIFOSET(fd,packet_len(0x25e));
 }
 
-
 void clif_parse_Auction_register(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to add an auction (CZ_AUCTION_ADD).
 /// 024d <now money>.L <max money>.L <delete hour>.W
@@ -15488,7 +15096,6 @@ void clif_parse_Auction_register(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_Auction_cancel(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Cancels an auction (CZ_AUCTION_ADD_CANCEL).
 /// 024e <auction id>.L
@@ -15499,7 +15106,6 @@ void clif_parse_Auction_cancel(int fd, struct map_session_data *sd)
 	intif->Auction_cancel(sd->status.char_id, auction_id);
 }
 
-
 void clif_parse_Auction_close(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Closes an auction (CZ_AUCTION_REQ_MY_SELL_STOP).
 /// 025d <auction id>.L
@@ -15510,7 +15116,6 @@ void clif_parse_Auction_close(int fd, struct map_session_data *sd)
 	intif->Auction_close(sd->status.char_id, auction_id);
 }
 
-
 void clif_parse_Auction_bid(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Places a bid on an auction (CZ_AUCTION_BUY).
 /// 024f <auction id>.L <money>.L
@@ -15536,7 +15141,6 @@ void clif_parse_Auction_bid(int fd, struct map_session_data *sd)
 	}
 }
 
-
 void clif_parse_Auction_search(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Auction Search (CZ_AUCTION_ITEM_SEARCH).
 /// 0251 <search type>.W <auction id>.L <search text>.24B <page number>.W
@@ -15562,7 +15166,6 @@ void clif_parse_Auction_search(int fd, struct map_session_data* sd)
 	intif->Auction_requestlist(sd->status.char_id, type, price, search_text, page);
 }
 
-
 void clif_parse_Auction_buysell(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Requests list of own currently active bids or auctions (CZ_AUCTION_REQ_MY_INFO).
 /// 025c <type>.W
@@ -15581,7 +15184,6 @@ void clif_parse_Auction_buysell(int fd, struct map_session_data* sd)
 	intif->Auction_requestlist(sd->status.char_id, type, 0, "", 1);
 }
 
-
 /// CASH/POINT SHOP
 ///
 
@@ -15674,7 +15276,6 @@ void clif_cashshop_ack(struct map_session_data* sd, int error) {
 	WFIFOSET(fd, packet_len(0x289));
 }
 
-
 void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to buy item(s) from cash shop (CZ_PC_BUY_CASH_POINT_ITEM).
 /// 0288 <name id>.W <amount>.W
@@ -15710,7 +15311,6 @@ void clif_parse_cashshop_buy(int fd, struct map_session_data *sd)
 	clif->cashshop_ack(sd,fail);
 }
 
-
 /// Adoption System
 ///
 
@@ -15732,7 +15332,6 @@ void clif_Adopt_reply(struct map_session_data *sd, int type)
 	WFIFOSET(fd,6);
 }
 
-
 /// Adoption confirmation (ZC_REQ_BABY).
 /// 01f6 <account id>.L <char id>.L <name>.B
 void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *src, int p_id) {
@@ -15749,7 +15348,6 @@ void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *sr
 	WFIFOSET(fd,34);
 }
 
-
 void clif_parse_Adopt_request(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to adopt a player (CZ_REQ_JOIN_BABY).
 /// 01f9 <account id>.L
@@ -15762,7 +15360,6 @@ void clif_parse_Adopt_request(int fd, struct map_session_data *sd) {
 	}
 }
 
-
 void clif_parse_Adopt_reply(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to adopt confirmation (CZ_JOIN_BABY).
 /// 01f7 <account id>.L <char id>.L <answer>.L
@@ -15791,7 +15388,6 @@ void clif_parse_Adopt_reply(int fd, struct map_session_data *sd) {
 	pc->adoption(p1_sd, p2_sd, sd);
 }
 
-
 /// Convex Mirror (ZC_BOSS_INFO).
 /// 0293 <infoType>.B <x>.L <y>.L <minHours>.W <minMinutes>.W <maxHours>.W <maxMinutes>.W <monster name>.51B
 /// infoType:
@@ -15833,7 +15429,6 @@ void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
 	WFIFOSET(fd,70);
 }
 
-
 void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Requesting equip of a player (CZ_EQUIPWIN_MICROSCOPE).
 /// 02d6 <account id>.L
@@ -15850,7 +15445,6 @@ void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd) {
 		clif->msgtable(sd, MSG_EQUIP_NOT_PUBLIC);
 }
 
-
 void clif_parse_EquipTick(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to change equip window tick (CZ_CONFIG).
 /// 02d8 <type>.L <value>.L
@@ -15917,11 +15511,9 @@ void clif_quest_send_list(struct map_session_data *sd)
 		WFIFOW(fd, i*info_len+21) = qi->objectives_count;
 	#endif
 	}
-	
 	WFIFOSET(fd, len);
 }
 
-
 /// Sends list of all quest missions (ZC_ALL_QUEST_MISSION).
 /// 02b2 <packet len>.W <num>.L { <quest id>.L <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3 }*num
 void clif_quest_send_mission(struct map_session_data *sd)
@@ -15956,7 +15548,6 @@ void clif_quest_send_mission(struct map_session_data *sd)
 	WFIFOSET(fd, len);
 }
 
-
 /// Notification about a new quest (ZC_ADD_QUEST).
 /// 02b3 <quest id>.L <active>.B <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3
 void clif_quest_add(struct map_session_data *sd, struct quest *qd)
@@ -15988,7 +15579,6 @@ void clif_quest_add(struct map_session_data *sd, struct quest *qd)
 	WFIFOSET(fd, packet_len(0x2b3));
 }
 
-
 /// Notification about a quest being removed (ZC_DEL_QUEST).
 /// 02b4 <quest id>.L
 void clif_quest_delete(struct map_session_data *sd, int quest_id) {
@@ -16002,7 +15592,6 @@ void clif_quest_delete(struct map_session_data *sd, int quest_id) {
 	WFIFOSET(fd, packet_len(0x2b4));
 }
 
-
 /// Notification of an update to the hunting mission counter (ZC_UPDATE_MISSION_HUNT).
 /// 02b5 <packet len>.W <mobs>.W { <quest id>.L <mob id>.L <total count>.W <current count>.W }*3
 void clif_quest_update_objective(struct map_session_data *sd, struct quest *qd)
@@ -16033,7 +15622,6 @@ void clif_quest_update_objective(struct map_session_data *sd, struct quest *qd)
 	WFIFOSET(fd, len);
 }
 
-
 void clif_parse_questStateAck(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Request to change the state of a quest (CZ_ACTIVE_QUEST).
 /// 02b6 <quest id>.L <active>.B
@@ -16041,7 +15629,6 @@ void clif_parse_questStateAck(int fd, struct map_session_data *sd) {
 	quest->update_status(sd, RFIFOL(fd,2), RFIFOB(fd,6)?Q_ACTIVE:Q_INACTIVE);
 }
 
-
 /// Notification about the change of a quest state (ZC_ACTIVE_QUEST).
 /// 02b7 <quest id>.L <active>.B
 void clif_quest_update_status(struct map_session_data *sd, int quest_id, bool active) {
@@ -16056,7 +15643,6 @@ void clif_quest_update_status(struct map_session_data *sd, int quest_id, bool ac
 	WFIFOSET(fd, packet_len(0x2b7));
 }
 
-
 /// Notification about an NPC's quest state (ZC_QUEST_NOTIFY_EFFECT).
 /// 0446 <npc id>.L <x>.W <y>.W <effect>.W <type>.W
 /// effect:
@@ -16087,7 +15673,6 @@ void clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, s
 #endif
 }
 
-
 /// Mercenary System
 ///
 
@@ -16155,7 +15740,6 @@ void clif_mercenary_updatestatus(struct map_session_data *sd, int type) {
 	WFIFOSET(fd,packet_len(0x2a2));
 }
 
-
 /// Mercenary base status data (ZC_MER_INIT).
 /// 029b <id>.L <atk>.W <matk>.W <hit>.W <crit>.W <def>.W <mdef>.W <flee>.W <aspd>.W
 ///     <name>.24B <level>.W <hp>.L <maxhp>.L <sp>.L <maxsp>.L <expire time>.L <faith>.W
@@ -16214,7 +15798,6 @@ void clif_mercenary_info(struct map_session_data *sd) {
 	WFIFOSET(fd,packet_len(0x29b));
 }
 
-
 /// Mercenary skill tree (ZC_MER_SKILLINFO_LIST).
 /// 029d <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradeable>.B }*
 void clif_mercenary_skillblock(struct map_session_data *sd)
@@ -16252,7 +15835,6 @@ void clif_mercenary_skillblock(struct map_session_data *sd)
 	WFIFOSET(fd,len);
 }
 
-
 void clif_parse_mercenary_action(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to invoke a mercenary menu action (CZ_MER_COMMAND).
 /// 029f <command>.B
@@ -16268,7 +15850,6 @@ void clif_parse_mercenary_action(int fd, struct map_session_data* sd)
 		mercenary->delete(sd->md, 2);
 }
 
-
 /// Mercenary Message
 /// message:
 ///     0 = Mercenary soldier's duty hour is over.
@@ -16280,7 +15861,6 @@ void clif_mercenary_message(struct map_session_data* sd, int message)
 	clif->msgtable(sd, MSG_MERCENARY_EXPIRED + message);
 }
 
-
 /// Notification about the remaining time of a rental item (ZC_CASH_TIME_COUNTER).
 /// 0298 <name id>.W <seconds>.L
 void clif_rental_time(int fd, int nameid, int seconds)
@@ -16292,7 +15872,6 @@ void clif_rental_time(int fd, int nameid, int seconds)
 	WFIFOSET(fd,packet_len(0x298));
 }
 
-
 /// Deletes a rental item from client's inventory (ZC_CASH_ITEM_DELETE).
 /// 0299 <index>.W <name id>.W
 void clif_rental_expired(int fd, int index, int nameid)
@@ -16304,7 +15883,6 @@ void clif_rental_expired(int fd, int index, int nameid)
 	WFIFOSET(fd,packet_len(0x299));
 }
 
-
 /// Book Reading (ZC_READ_BOOK).
 /// 0294 <book id>.L <page>.L
 void clif_readbook(int fd, int book_id, int page)
@@ -16316,7 +15894,6 @@ void clif_readbook(int fd, int book_id, int page)
 	WFIFOSET(fd,packet_len(0x294));
 }
 
-
 /// Battlegrounds
 ///
 
@@ -16346,7 +15923,6 @@ void clif_bg_hp(struct map_session_data *sd)
 	clif->send(buf, packet_len(cmd), &sd->bl, BG_AREA_WOS);
 }
 
-
 /// Updates the position of a camp member on the minimap (ZC_BATTLEFIELD_NOTIFY_POSITION).
 /// 02df <account id>.L <name>.24B <class>.W <x>.W <y>.W
 void clif_bg_xy(struct map_session_data *sd)
@@ -16379,14 +15955,13 @@ void clif_bg_xy_remove(struct map_session_data *sd)
 	clif->send(buf, packet_len(0x2df), &sd->bl, BG_SAMEMAP_WOS);
 }
 
-
 /// Notifies clients of a battleground message (ZC_BATTLEFIELD_CHAT).
 /// 02dc <packet len>.W <account id>.L <name>.24B <message>.?B
 void clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes, size_t len)
 {
 	struct map_session_data *sd;
 	unsigned char *buf;
-	
+
 	nullpo_retv(bgd);
 	nullpo_retv(name);
 	nullpo_retv(mes);
@@ -16405,7 +15980,6 @@ void clif_bg_message(struct battleground_data *bgd, int src_id, const char *name
 	aFree(buf);
 }
 
-
 void clif_parse_BattleChat(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Validates and processes battlechat messages [pakpil] (CZ_BATTLEFIELD_CHAT).
 /// 0x2db <packet len>.W <text>.?B (<name> : <message>) 00
@@ -16438,7 +16012,6 @@ void clif_parse_BattleChat(int fd, struct map_session_data* sd)
 	bg->send_message(sd, text, textlen);
 }
 
-
 /// Notifies client of a battleground score change (ZC_BATTLEFIELD_NOTIFY_POINT).
 /// 02de <camp A points>.W <camp B points>.W
 void clif_bg_updatescore(int16 m) {
@@ -16467,7 +16040,6 @@ void clif_bg_updatescore_single(struct map_session_data *sd) {
 	WFIFOSET(fd,packet_len(0x2de));
 }
 
-
 /// Battleground camp belong-information (ZC_BATTLEFIELD_NOTIFY_CAMPINFO).
 /// 02dd <account id>.L <name>.24B <camp>.W
 void clif_sendbgemblem_area(struct map_session_data *sd)
@@ -16493,7 +16065,6 @@ void clif_sendbgemblem_single(int fd, struct map_session_data *sd)
 	WFIFOSET(fd,packet_len(0x2dd));
 }
 
-
 /// Custom Fonts (ZC_NOTIFY_FONT).
 /// 02ef <account_id>.L <font id>.W
 void clif_font(struct map_session_data *sd)
@@ -16508,7 +16079,6 @@ void clif_font(struct map_session_data *sd)
 #endif
 }
 
-
 /*==========================================
  * Instancing Window
  *------------------------------------------*/
@@ -16617,7 +16187,6 @@ void clif_instance_leave(int fd)
 	WFIFOSET(fd,packet_len(0x02CE));
 }
 
-
 /// Notifies clients about item picked up by a party member (ZC_ITEM_PICKUP_PARTY).
 /// 02b8 <account id>.L <name id>.W <identified>.B <damaged>.B <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W <equip location>.W <item type>.B
 void clif_party_show_picker(struct map_session_data * sd, struct item * item_data)
@@ -16642,7 +16211,6 @@ void clif_party_show_picker(struct map_session_data * sd, struct item * item_dat
 #endif
 }
 
-
 /// Display gained exp (ZC_NOTIFY_EXP).
 /// 07f6 <account id>.L <amount>.L <var id>.W <exp type>.W
 /// var id:
@@ -16666,7 +16234,6 @@ void clif_displayexp(struct map_session_data *sd, unsigned int exp, char type, b
 	WFIFOSET(fd,packet_len(0x7f6));
 }
 
-
 /// Displays digital clock digits on top of the screen (ZC_SHOWDIGIT).
 /// type:
 ///     0 = Displays 'value' for 5 seconds.
@@ -16685,7 +16252,6 @@ void clif_showdigit(struct map_session_data* sd, unsigned char type, int value)
 	WFIFOSET(sd->fd, packet_len(0x1b1));
 }
 
-
 void clif_parse_LessEffect(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Notification of the state of client command /effect (CZ_LESSEFFECT).
 /// 021d <state>.L
@@ -16795,7 +16361,6 @@ void clif_elemental_info(struct map_session_data *sd) {
 	WFIFOSET(fd,22);
 }
 
-
 /// Buying Store System
 ///
 
@@ -16813,7 +16378,6 @@ void clif_buyingstore_open(struct map_session_data* sd)
 	WFIFOSET(fd,packet_len(0x810));
 }
 
-
 void clif_parse_ReqOpenBuyingStore(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to create a buying store (CZ_REQ_OPEN_BUYING_STORE).
 /// 0811 <packet len>.W <limit zeny>.L <result>.B <store name>.80B { <name id>.W <amount>.W <price>.L }*
@@ -16856,7 +16420,6 @@ void clif_parse_ReqOpenBuyingStore(int fd, struct map_session_data* sd) {
 	buyingstore->create(sd, zenylimit, result, storename, itemlist, count);
 }
 
-
 /// Notification, that the requested buying store could not be created (ZC_FAILED_OPEN_BUYING_STORE_TO_BUYER).
 /// 0812 <result>.W <total weight>.L
 /// result:
@@ -16877,7 +16440,6 @@ void clif_buyingstore_open_failed(struct map_session_data* sd, unsigned short re
 	WFIFOSET(fd,packet_len(0x812));
 }
 
-
 /// Notification, that the requested buying store was created (ZC_MYITEMLIST_BUYING_STORE).
 /// 0813 <packet len>.W <account id>.L <limit zeny>.L { <price>.L <count>.W <type>.B <name id>.W }*
 void clif_buyingstore_myitemlist(struct map_session_data* sd)
@@ -16904,7 +16466,6 @@ void clif_buyingstore_myitemlist(struct map_session_data* sd)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Notifies clients in area of a buying store (ZC_BUYING_STORE_ENTRY).
 /// 0814 <account id>.L <store name>.80B
 void clif_buyingstore_entry(struct map_session_data* sd)
@@ -16931,7 +16492,6 @@ void clif_buyingstore_entry_single(struct map_session_data* sd, struct map_sessi
 	WFIFOSET(fd,packet_len(0x814));
 }
 
-
 void clif_parse_ReqCloseBuyingStore(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to close own buying store (CZ_REQ_CLOSE_BUYING_STORE).
 /// 0815
@@ -16939,7 +16499,6 @@ void clif_parse_ReqCloseBuyingStore(int fd, struct map_session_data* sd) {
 	buyingstore->close(sd);
 }
 
-
 /// Notifies clients in area that a buying store was closed (ZC_DISAPPEAR_BUYING_STORE_ENTRY).
 /// 0816 <account id>.L
 void clif_buyingstore_disappear_entry(struct map_session_data* sd)
@@ -16965,7 +16524,6 @@ void clif_buyingstore_disappear_entry_single(struct map_session_data* sd, struct
 	WFIFOSET(fd,packet_len(0x816));
 }
 
-
 /// Request to open someone else's buying store (CZ_REQ_CLICK_TO_BUYING_STORE).
 /// 0817 <account id>.L
 void clif_parse_ReqClickBuyingStore(int fd, struct map_session_data* sd)
@@ -16977,7 +16535,6 @@ void clif_parse_ReqClickBuyingStore(int fd, struct map_session_data* sd)
 	buyingstore->open(sd, account_id);
 }
 
-
 /// Sends buying store item list (ZC_ACK_ITEMLIST_BUYING_STORE).
 /// 0818 <packet len>.W <account id>.L <store id>.L <limit zeny>.L { <price>.L <amount>.W <type>.B <name id>.W }*
 void clif_buyingstore_itemlist(struct map_session_data* sd, struct map_session_data* pl_sd)
@@ -17006,7 +16563,6 @@ void clif_buyingstore_itemlist(struct map_session_data* sd, struct map_session_d
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 void clif_parse_ReqTradeBuyingStore(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to sell items to a buying store (CZ_REQ_TRADE_BUYING_STORE).
 /// 0819 <packet len>.W <account id>.L <store id>.L { <index>.W <name id>.W <amount>.W }*
@@ -17042,7 +16598,6 @@ void clif_parse_ReqTradeBuyingStore(int fd, struct map_session_data* sd) {
 	buyingstore->trade(sd, account_id, buyer_id, itemlist, count);
 }
 
-
 /// Notifies the buyer, that the buying store has been closed due to a post-trade condition (ZC_FAILED_TRADE_BUYING_STORE_TO_BUYER).
 /// 081a <result>.W
 /// result:
@@ -17061,7 +16616,6 @@ void clif_buyingstore_trade_failed_buyer(struct map_session_data* sd, short resu
 	WFIFOSET(fd,packet_len(0x81a));
 }
 
-
 /// Updates the zeny limit and an item in the buying store item list (ZC_UPDATE_ITEM_FROM_BUYING_STORE).
 /// 081b <name id>.W <amount>.W <limit zeny>.L
 void clif_buyingstore_update_item(struct map_session_data* sd, unsigned short nameid, unsigned short amount)
@@ -17078,7 +16632,6 @@ void clif_buyingstore_update_item(struct map_session_data* sd, unsigned short na
 	WFIFOSET(fd,packet_len(0x81b));
 }
 
-
 /// Deletes item from inventory, that was sold to a buying store (ZC_ITEM_DELETE_BUYING_STORE).
 /// 081c <index>.W <amount>.W <price>.L
 /// message:
@@ -17099,7 +16652,6 @@ void clif_buyingstore_delete_item(struct map_session_data* sd, short index, unsi
 	WFIFOSET(fd,packet_len(0x81c));
 }
 
-
 /// Notifies the seller, that a buying store trade failed (ZC_FAILED_TRADE_BUYING_STORE_TO_SELLER).
 /// 0824 <result>.W <name id>.W
 /// result:
@@ -17120,7 +16672,6 @@ void clif_buyingstore_trade_failed_seller(struct map_session_data* sd, short res
 	WFIFOSET(fd,packet_len(0x824));
 }
 
-
 void clif_parse_SearchStoreInfo(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Search Store Info System
 ///
@@ -17177,7 +16728,6 @@ void clif_parse_SearchStoreInfo(int fd, struct map_session_data* sd) {
 	searchstore->query(sd, type, min_price, max_price, (const unsigned short*)itemlist, item_count, (const unsigned short*)cardlist, card_count);
 }
 
-
 /// Results for a store search request (ZC_SEARCH_STORE_INFO_ACK).
 /// 0836 <packet len>.W <is first page>.B <is next page>.B <remaining uses>.B { <store id>.L <account id>.L <shop name>.80B <nameid>.W <item type>.B <price>.L <amount>.W <refine>.B <card1>.W <card2>.W <card3>.W <card4>.W }*
 /// is first page:
@@ -17229,7 +16779,6 @@ void clif_search_store_info_ack(struct map_session_data* sd)
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
-
 /// Notification of failure when searching for stores (ZC_SEARCH_STORE_INFO_FAILED).
 /// 0837 <reason>.B
 /// reason:
@@ -17250,7 +16799,6 @@ void clif_search_store_info_failed(struct map_session_data* sd, unsigned char re
 	WFIFOSET(fd,packet_len(0x837));
 }
 
-
 void clif_parse_SearchStoreInfoNextPage(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to display next page of results (CZ_SEARCH_STORE_INFO_NEXT_PAGE).
 /// 0838
@@ -17259,7 +16807,6 @@ void clif_parse_SearchStoreInfoNextPage(int fd, struct map_session_data* sd)
 	searchstore->next(sd);
 }
 
-
 /// Opens the search store window (ZC_OPEN_SEARCH_STORE_INFO).
 /// 083a <type>.W <remaining uses>.B
 /// type:
@@ -17280,7 +16827,6 @@ void clif_open_search_store_info(struct map_session_data* sd)
 	WFIFOSET(fd,packet_len(0x83a));
 }
 
-
 void clif_parse_CloseSearchStoreInfo(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to close the store search window (CZ_CLOSE_SEARCH_STORE_INFO).
 /// 083b
@@ -17289,7 +16835,6 @@ void clif_parse_CloseSearchStoreInfo(int fd, struct map_session_data* sd)
 	searchstore->close(sd);
 }
 
-
 void clif_parse_SearchStoreInfoListItemClick(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 /// Request to invoke catalog effect on a store from search results (CZ_SSILIST_ITEM_CLICK).
 /// 083c <account id>.L <store id>.L <nameid>.W
@@ -17306,7 +16851,6 @@ void clif_parse_SearchStoreInfoListItemClick(int fd, struct map_session_data* sd
 	searchstore->click(sd, account_id, store_id, nameid);
 }
 
-
 /// Notification of the store position on current map (ZC_SSILIST_ITEM_CLICK_ACK).
 /// 083d <xPos>.W <yPos>.W
 void clif_search_store_info_click_ack(struct map_session_data* sd, short x, short y)
@@ -17322,7 +16866,6 @@ void clif_search_store_info_click_ack(struct map_session_data* sd, short x, shor
 	WFIFOSET(fd,packet_len(0x83d));
 }
 
-
 /// Parse function for packet debugging.
 void clif_parse_debug(int fd,struct map_session_data *sd) {
 	int cmd, packet_len;
@@ -17684,7 +17227,6 @@ void clif_cashshop_db(void) {
 						}
 					}
 
-
 					RECREATE(clif->cs.data[i], struct hCSData *, ++clif->cs.item_count[i]);
 					CREATE(clif->cs.data[i][ clif->cs.item_count[i] - 1 ], struct hCSData , 1);
 
@@ -18007,7 +17549,6 @@ void clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK
 	}
 }
 
-
 void clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED response, char *name) {
 	struct packet_bgqueue_notice_delete p;
 
@@ -18384,7 +17925,7 @@ int clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst
 	if(sc && sc->count && sc->data[SC_ILLUSION]) {
 		if(in_damage) in_damage = in_damage*(sc->data[SC_ILLUSION]->val2) + rnd()%100;
 	}
-	
+
 #if PACKETVER < 20071113
 	damage = (short)min(in_damage,INT16_MAX);
 #else
@@ -18525,7 +18066,7 @@ void clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid, i
 
 	p.prev_leader_aid = prev_leader_aid;
 	p.new_leader_aid = new_leader_aid;
-	
+
 	clif->send(&p,sizeof(p),&sd->bl,PARTY);
 }
 
@@ -18533,12 +18074,12 @@ void clif_parse_RouletteOpen(int fd, struct map_session_data* sd) __attribute__(
 /* Roulette System [Yommy/Hercules] */
 void clif_parse_RouletteOpen(int fd, struct map_session_data* sd) {
 	struct packet_roulette_open_ack p;
-	
+
 	if( !battle_config.feature_roulette ) {
 		clif->message(fd,"Roulette is disabled");
 		return;
 	}
-	
+
 	p.PacketType = 0xa1a;
 	p.Result = 0;
 	p.Serial = 0;
@@ -18561,11 +18102,11 @@ void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) {
 		clif->message(fd,"Roulette is disabled");
 		return;
 	}
-	
+
 	p.PacketType = rouletteinfoackType;
 	p.PacketLength = 8 + (42 * 8);
 	p.RouletteSerial = 1;
-	
+
 	for(i = 0; i < MAX_ROULETTE_LEVEL; i++) {
 		for(j = 0; j < MAX_ROULETTE_COLUMNS-i; j++) {
 			p.ItemInfo[count].Row = i;
@@ -18575,24 +18116,20 @@ void clif_parse_RouletteInfo(int fd, struct map_session_data* sd) {
 			count++;
 		}
 	}
-	
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
 	return;
 }
 
 void clif_parse_RouletteClose(int fd, struct map_session_data* sd) __attribute__((nonnull (2)));
 void clif_parse_RouletteClose(int fd, struct map_session_data* sd) {
-	
 	if( !battle_config.feature_roulette ) {
 		clif->message(fd,"Roulette is disabled");
 		return;
 	}
-	
-		
+
 	/** What do we need this for? (other than state tracking), game client closes the window without our response. **/
-	
 	//ShowDebug("clif_parse_RouletteClose\n");
-	
+
 	return;
 }
 
@@ -18600,24 +18137,23 @@ void clif_parse_RouletteGenerate(int fd, struct map_session_data* sd) __attribut
 void clif_parse_RouletteGenerate(int fd, struct map_session_data* sd) {
 	unsigned char result = GENERATE_ROULETTE_SUCCESS;
 	short stage = sd->roulette.stage;
-	
+
 	if( !battle_config.feature_roulette ) {
 		clif->message(fd,"Roulette is disabled");
 		return;
 	}
-		
+
 	if( sd->roulette.stage >= MAX_ROULETTE_LEVEL )
 		stage = sd->roulette.stage = 0;
-	
+
 	if( stage == 0 ) {
 		if( pc_readglobalreg(sd, script->add_str("TmpRouletteBronze")) <= 0 &&
 		    pc_readglobalreg(sd, script->add_str("TmpRouletteSilver")) < 10 &&
 		    pc_readglobalreg(sd, script->add_str("TmpRouletteGold")) < 10 )
 			result = GENERATE_ROULETTE_NO_ENOUGH_POINT;
 	}
-	
+
 	if( result == GENERATE_ROULETTE_SUCCESS ) {
-		
 		if( stage == 0 ) {
 			if( pc_readglobalreg(sd, script->add_str("TmpRouletteBronze")) > 0 ) {
 				pc_setglobalreg(sd, script->add_str("TmpRouletteBronze"), pc_readglobalreg(sd, script->add_str("TmpRouletteBronze")) - 1);
@@ -18629,7 +18165,6 @@ void clif_parse_RouletteGenerate(int fd, struct map_session_data* sd) {
 				stage = sd->roulette.stage = 4;
 			}
 		}
-		
 		sd->roulette.prizeStage = stage;
 		sd->roulette.prizeIdx = rnd()%clif->rd.items[stage];
 		if( sd->roulette.prizeIdx == 0 ) {
@@ -18638,15 +18173,15 @@ void clif_parse_RouletteGenerate(int fd, struct map_session_data* sd) {
 
 			it.nameid = clif->rd.nameid[stage][0];
 			it.identify = 1;
-			
+
 			pc->additem(sd, &it, clif->rd.qty[stage][0], LOG_TYPE_OTHER);/** TODO maybe a new log type for roulette items? **/
-			
+
 			sd->roulette.stage = 0;
 			result = GENERATE_ROULETTE_LOSING;
 		} else
 			sd->roulette.claimPrize = true;
 	}
-	
+
 	clif->roulette_generate_ack(sd,result,stage,sd->roulette.prizeIdx,0);
 	if( result == GENERATE_ROULETTE_SUCCESS )
 		sd->roulette.stage++;
@@ -18658,19 +18193,19 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) __attribut
  **/
 void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) {
 	struct packet_roulette_itemrecv_ack p;
-	
+
 	if( !battle_config.feature_roulette ) {
 		clif->message(fd,"Roulette is disabled");
 		return;
 	}
-	
+
 	p.PacketType = roulettercvitemackType;
 	p.AdditionItemID = 0;/** TODO **/
-	
+
 	if( sd->roulette.claimPrize ) {
 		struct item it;
 		memset(&it, 0, sizeof(it));
-		
+
 		it.nameid = clif->rd.nameid[sd->roulette.prizeStage][sd->roulette.prizeIdx];
 		it.identify = 1;
 
@@ -18697,7 +18232,7 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) {
 		}
 	} else
 		p.Result = RECV_ITEM_FAILED;
-	
+
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
 	return;
 }
@@ -18707,39 +18242,38 @@ bool clif_parse_roulette_db(void) {
 	config_setting_t *roulette = NULL, *levels = NULL;
 	const char *config_filename = "db/roulette_db.conf"; // FIXME hardcoded name
 	int i, j, item_count_t = 0;
-	
+
 	for( i = 0; i < MAX_ROULETTE_LEVEL; i++ ) {
 		clif->rd.items[i] = 0;
 	}
-	
+
 	if (libconfig->read_file(&roulette_conf, config_filename)) {
 		ShowError("can't read %s\n", config_filename);
 		return false;
 	}
-	
 	roulette = libconfig->lookup(&roulette_conf, "roulette");
-	
+
 	if( roulette != NULL && (levels = libconfig->setting_get_elem(roulette, 0)) != NULL ) {
 		for(i = 0; i < MAX_ROULETTE_LEVEL; i++) {
 			config_setting_t *level;
 			char entry_name[10];
-			
+
 			sprintf(entry_name,"level_%d",i+1);
-			
+
 			if( (level = libconfig->setting_get_member(levels, entry_name)) != NULL ) {
 				int k, item_count = libconfig->setting_length(level);
-				
+
 				for(k = 0; k < item_count; k++) {
 					config_setting_t *entry = libconfig->setting_get_elem(level,k);
 					const char *name = config_setting_name(entry);
 					int qty = libconfig->setting_get_int(entry);
 					struct item_data * data = NULL;
-					
+
 					if( qty < 1 ) {
 						ShowWarning("roulette_db: unsupported qty '%d' for entry named '%s' in category '%s'\n", qty, name, entry_name);
 						continue;
 					}
-					
+
 					if( name[0] == 'I' && name[1] == 'D' && strlen(name) <= 7 ) {
 						if( !( data = itemdb->exists(atoi(name+2))) ) {
 							ShowWarning("roulette_db: unknown item id '%s' in category '%s'\n", name+2, entry_name);
@@ -18751,26 +18285,25 @@ bool clif_parse_roulette_db(void) {
 							continue;
 						}
 					}
-					
+
 					j = clif->rd.items[i];
 					RECREATE(clif->rd.nameid[i],int,++clif->rd.items[i]);
 					RECREATE(clif->rd.qty[i],int,clif->rd.items[i]);
-					
+
 					clif->rd.nameid[i][j] = data->nameid;
 					clif->rd.qty[i][j] = qty;
-					
+
 					item_count_t++;
 				}
 			}
 		}
-		
 	}
 	libconfig->destroy(&roulette_conf);
-	
+
 	for(i = 0; i < MAX_ROULETTE_LEVEL; i++) {
 		int limit = MAX_ROULETTE_COLUMNS-i;
 		if( clif->rd.items[i] == limit ) continue;
-		
+
 		if( clif->rd.items[i] > limit ) {
 			ShowWarning("roulette_db: level %d has %d items, only %d supported, capping...\n",i+1,clif->rd.items[i],limit);
 			clif->rd.items[i] = limit;
@@ -18778,23 +18311,20 @@ bool clif_parse_roulette_db(void) {
 		}
 		/** this scenario = clif->rd.items[i] < limit **/
 		ShowWarning("roulette_db: level %d has %d items, %d are required. filling with apples\n",i+1,clif->rd.items[i],limit);
-		
+
 		clif->rd.items[i] = limit;
 		RECREATE(clif->rd.nameid[i],int,clif->rd.items[i]);
 		RECREATE(clif->rd.qty[i],int,clif->rd.items[i]);
 
-		
 		for(j = 0; j < MAX_ROULETTE_COLUMNS-i; j++) {
-			if( clif->rd.qty[i][j] ) continue;
-			
+			if (clif->rd.qty[i][j])
+				continue;
 			clif->rd.nameid[i][j] = ITEMID_APPLE;
 			clif->rd.qty[i][j] = 1;
 		}
 	}
-
-	
 	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", item_count_t, config_filename);
-	
+
 	return true;
 }
 
@@ -18813,13 +18343,13 @@ void clif_roulette_generate_ack(struct map_session_data *sd, unsigned char resul
 	p.RemainBronze = pc_readglobalreg(sd, script->add_str("TmpRouletteBronze"));
 	p.RemainGold = pc_readglobalreg(sd, script->add_str("TmpRouletteGold"));
 	p.RemainSilver = pc_readglobalreg(sd, script->add_str("TmpRouletteSilver"));
-	
+
 	clif->send(&p,sizeof(p), &sd->bl, SELF);
 }
 
-/** 
-* Stackable items merger 
-**/
+/**
+ * Stackable items merger
+ */
 void clif_openmergeitem(int fd, struct map_session_data *sd)
 {
 	int i = 0, n = 0, j = 0;
@@ -18838,8 +18368,6 @@ void clif_openmergeitem(int fd, struct map_session_data *sd)
 		merge_items[n].nameid = item_data->nameid;
 		merge_items[n].position = i + 2;
 		n++;
-
-
 	}
 
 	qsort(merge_items,n,sizeof(struct merge_item),clif->comparemergeitem);
@@ -18888,7 +18416,7 @@ void clif_ackmergeitems(int fd, struct map_session_data *sd)
 
 	nullpo_retv(sd);
 	length = (RFIFOW(fd,2) - 4)/2;
-	
+
 	if (length >= MAX_INVENTORY || length < 2) {
 		WFIFOHEAD(fd,7);
 		WFIFOW(fd,0) = 0x96f;
@@ -18923,7 +18451,6 @@ void clif_ackmergeitems(int fd, struct map_session_data *sd)
 		n++;
 	}
 
-
 	if (n < 2 || count == 0) {
 		WFIFOHEAD(fd,7);
 		WFIFOW(fd,0) = 0x96f;
@@ -18947,14 +18474,13 @@ void clif_ackmergeitems(int fd, struct map_session_data *sd)
 	for (i = 0; i < n; i++)
 		pc->delitem(sd,indexes[i],amounts[i],0,DELITEM_NORMAL,LOG_TYPE_NPC);
 
-
 	memset(&item_data,'\0',sizeof(item_data));
 
 	item_data.nameid = nameid;
 	item_data.identify = 1;
 	item_data.unique_id = itemdb->unique_id(sd);
 	pc->additem(sd,&item_data,count,LOG_TYPE_NPC);
-	
+
 	ARR_FIND(0,MAX_INVENTORY,i,item_data.unique_id == sd->status.inventory[i].unique_id);
 
 	WFIFOHEAD(fd,7);
@@ -18963,7 +18489,6 @@ void clif_ackmergeitems(int fd, struct map_session_data *sd)
 	WFIFOW(fd,4) = count;
 	WFIFOB(fd,6) = MERGEITEM_SUCCESS;
 	WFIFOSET(fd,7);
-	
 }
 
 void clif_cancelmergeitem (int fd, struct map_session_data *sd)
@@ -19195,14 +18720,13 @@ static void __attribute__ ((unused)) packetdb_addpacket(short cmd, int len, ...)
 	va_end(va);
 }
 void packetdb_loaddb(void) {
-
 	memset(packet_db,0,sizeof(packet_db));
-	
-	#define packet(id, size, ...) packetdb_addpacket((id), (size), ##__VA_ARGS__, 0xFFFF)
-	#define packetKeys(a,b,c) do { clif->cryptKey[0] = (a); clif->cryptKey[1] = (b); clif->cryptKey[2] = (c); } while(0)
-	#include "packets.h" /* load structure data */
-	#undef packet
-	#undef packetKeys
+
+#define packet(id, size, ...) packetdb_addpacket((id), (size), ##__VA_ARGS__, 0xFFFF)
+#define packetKeys(a,b,c) do { clif->cryptKey[0] = (a); clif->cryptKey[1] = (b); clif->cryptKey[2] = (c); } while(0)
+#include "packets.h" /* load structure data */
+#undef packet
+#undef packetKeys
 }
 void clif_bc_ready(void) {
 	if( battle_config.display_status_timers )
@@ -19262,7 +18786,7 @@ void do_final_clif(void)
 		}
 		aFree(clif->cs.data[i]);
 	}
-	
+
 	for(i = 0; i < MAX_ROULETTE_LEVEL; i++) {
 		if( clif->rd.nameid[i] )
 			aFree(clif->rd.nameid[i]);
diff --git a/src/map/duel.c b/src/map/duel.c
index 21f5c0c93..e18e2fc45 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -26,10 +26,10 @@ struct duel_interface *duel;
 void duel_savetime(struct map_session_data* sd) {
 	time_t clock;
 	struct tm *t;
-	
+
 	time(&clock);
 	t = localtime(&clock);
-	
+
 	pc_setglobalreg(sd, script->add_str("PC_LAST_DUEL_TIME"), t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min);
 }
 
@@ -37,12 +37,12 @@ int duel_checktime(struct map_session_data* sd) {
 	int diff;
 	time_t clock;
 	struct tm *t;
-	
+
 	time(&clock);
 	t = localtime(&clock);
-	
+
 	diff = t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min - pc_readglobalreg(sd, script->add_str("PC_LAST_DUEL_TIME") );
-	
+
 	return !(diff >= 0 && diff < battle_config.duel_time_interval);
 }
 
@@ -55,7 +55,7 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
 	nullpo_retr(1, sd);
 	nullpo_retr(1, ssd);
 	if (sd->duel_group != ssd->duel_group) return 0;
-	
+
 	sprintf(output, "      %d. %s", ++(*p), sd->status.name);
 	clif_disp_onlyself(ssd, output, strlen(output));
 	return 1;
@@ -84,21 +84,21 @@ void duel_showinfo(const unsigned int did, struct map_session_data* sd) {
 int duel_create(struct map_session_data* sd, const unsigned int maxpl) {
 	int i=1;
 	char output[256];
-	
+
 	nullpo_ret(sd);
 
 	while(i < MAX_DUEL && duel->list[i].members_count > 0) i++;
 	if(i == MAX_DUEL) return 0;
-	
+
 	duel->count++;
 	sd->duel_group = i;
 	duel->list[i].members_count++;
 	duel->list[i].invites_count = 0;
 	duel->list[i].max_players_limit = maxpl;
-	
+
 	safestrncpy(output, msg_sd(sd,372), sizeof(output)); // " -- Duel has been created (@invite/@leave) --"
 	clif_disp_onlyself(sd, output, strlen(output));
-	
+
 	clif->map_property(sd, MAPPROPERTY_FREEPVPZONE);
 	clif->maptypeproperty2(&sd->bl,SELF);
 	return i;
@@ -115,7 +115,7 @@ void duel_invite(const unsigned int did, struct map_session_data* sd, struct map
 
 	target_sd->duel_invite = did;
 	duel->list[did].invites_count++;
-	
+
 	// "Blue -- Player %s invites you to PVP duel (@accept/@reject) --"
 	sprintf(output, msg_sd(target_sd,374), sd->status.name);
 	clif->broadcast((struct block_list *)target_sd, output, strlen(output)+1, BC_BLUE, SELF);
@@ -132,19 +132,18 @@ static int duel_leave_sub(struct map_session_data* sd, va_list va)
 
 void duel_leave(const unsigned int did, struct map_session_data* sd) {
 	char output[256];
-	
+
 	nullpo_retv(sd);
 	// " <- Player %s has left duel --"
 	sprintf(output, msg_sd(sd,375), sd->status.name);
 	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
-	
+
 	duel->list[did].members_count--;
-	
 	if(duel->list[did].members_count == 0) {
 		map->foreachpc(duel_leave_sub, did);
 		duel->count--;
 	}
-	
+
 	sd->duel_group = 0;
 	duel_savetime(sd);
 	clif->map_property(sd, MAPPROPERTY_NOTHING);
@@ -153,13 +152,13 @@ void duel_leave(const unsigned int did, struct map_session_data* sd) {
 
 void duel_accept(const unsigned int did, struct map_session_data* sd) {
 	char output[256];
-	
+
 	nullpo_retv(sd);
 	duel->list[did].members_count++;
 	sd->duel_group = sd->duel_invite;
 	duel->list[did].invites_count--;
 	sd->duel_invite = 0;
-	
+
 	// " -> Player %s has accepted duel --"
 	sprintf(output, msg_sd(sd,376), sd->status.name);
 	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
@@ -170,12 +169,12 @@ void duel_accept(const unsigned int did, struct map_session_data* sd) {
 
 void duel_reject(const unsigned int did, struct map_session_data* sd) {
 	char output[256];
-	
+
 	nullpo_retv(sd);
 	// " -- Player %s has rejected duel --"
 	sprintf(output, msg_sd(sd,377), sd->status.name);
 	clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
-	
+
 	duel->list[did].invites_count--;
 	sd->duel_invite = 0;
 }
diff --git a/src/map/elemental.c b/src/map/elemental.c
index 435dffaf4..b629275e5 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -785,7 +785,7 @@ int read_elementaldb(void) {
 	struct status_data *estatus;
 
 	sprintf(line, "%s/%s", map->db_path, "elemental_db.txt");
-	
+
 	if( core->runflag == MAPSERVER_ST_RUNNING ) //only necessary after we're up
 		memset(elemental->db,0,sizeof(elemental->db));
 
@@ -980,27 +980,26 @@ void elemental_defaults(void) {
 
 	/* */
 	memset(elemental->db,0,sizeof(elemental->db));
-	
+
 	/* funcs */
-	
 	elemental->class = elemental_class;
 	elemental->get_viewdata = elemental_get_viewdata;
-	
+
 	elemental->create = elemental_create;
 	elemental->data_received = elemental_data_received;
 	elemental->save = elemental_save;
-	
+
 	elemental->change_mode_ack = elemental_change_mode_ack;
 	elemental->change_mode = elemental_change_mode;
-	
+
 	elemental->heal = elemental_heal;
 	elemental->dead = elemental_dead;
-	
+
 	elemental->delete = elemental_delete;
 	elemental->summon_stop = elemental_summon_stop;
-	
+
 	elemental->get_lifetime = elemental_get_lifetime;
-	
+
 	elemental->unlocktarget = elemental_unlocktarget;
 	elemental->skillnotok = elemental_skillnotok;
 	elemental->set_target = elemental_set_target;
@@ -1008,11 +1007,11 @@ void elemental_defaults(void) {
 	elemental->clean_effect = elemental_clean_effect;
 	elemental->action = elemental_action;
 	elemental->skill_get_requirements = elemental_skill_get_requirements;
-	
+
 	elemental->read_skilldb = read_elemental_skilldb;
 	elemental->reload_db = reload_elementaldb;
 	elemental->reload_skilldb = reload_elemental_skilldb;
-	
+
 	elemental->search_index = elemental_search_index;
 	elemental->summon_init = elemental_summon_init;
 	elemental->summon_end_timer = elemental_summon_end_timer;
diff --git a/src/map/guild.c b/src/map/guild.c
index 0e5fa977e..7a187b625 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -227,7 +227,7 @@ int guild_getposition(struct guild* g, struct map_session_data* sd)
 
 	if( g == NULL && (g=sd->guild) == NULL )
 		return -1;
-	
+
 	ARR_FIND( 0, g->max_member, i, g->member[i].account_id == sd->status.account_id && g->member[i].char_id == sd->status.char_id );
 	return( i < g->max_member ) ? g->member[i].position : -1;
 }
@@ -263,7 +263,7 @@ int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) {
 	struct guild *g;
 
 	c = DB->data2ptr(data);
-	
+
 	if (
 		(g = guild->search(c->guild_id)) == NULL ||
 		(i = guild->getindex(g, c->account_id, c->char_id)) < 0
@@ -475,7 +475,7 @@ int guild_recv_info(struct guild *sg) {
 			if (channel->config->ally_autojoin) {
 				struct s_mapiterator* iter = mapit_getallusers();
 				struct guild *tg[MAX_GUILDALLIANCE];
-				
+
 				for (i = 0; i < MAX_GUILDALLIANCE; i++) {
 					tg[i] = NULL;
 					if( sg->alliance[i].opposition == 0 && sg->alliance[i].guild_id )
@@ -507,11 +507,8 @@ int guild_recv_info(struct guild *sg) {
 						}
 					}
 				}
-				
 				mapit->free(iter);
-				
 			}
-			
 			aChSysSave = chan;
 
 		}
@@ -540,16 +537,16 @@ int guild_recv_info(struct guild *sg) {
 			instances_save = g->instances;
 	}
 	memcpy(g,sg,sizeof(struct guild));
-	
+
 	g->channel = aChSysSave;
 	g->instance = instance_save;
 	g->instances = instances_save;
-	
+
 	if(g->max_member > MAX_GUILD) {
 		ShowError("guild_recv_info: Received guild with %d members, but MAX_GUILD is only %d. Extra guild-members have been lost!\n", g->max_member, MAX_GUILD);
 		g->max_member = MAX_GUILD;
 	}
-	
+
 	for(i=bm=m=0;i<g->max_member;i++){
 		if(g->member[i].account_id>0){
 			sd = g->member[i].sd = guild->sd_check(g->guild_id, g->member[i].account_id, g->member[i].char_id);
@@ -623,7 +620,7 @@ int guild_invite(struct map_session_data *sd, struct map_session_data *tsd) {
 			return 0;
 		}
 	}
-	
+
 	if (!tsd->fd) { //You can't invite someone who has already disconnected.
 		clif->guild_inviteack(sd,1);
 		return 0;
@@ -735,10 +732,9 @@ void guild_member_joined(struct map_session_data *sd)
 	if (i == -1)
 		sd->status.guild_id = 0;
 	else {
-		
 		g->member[i].sd = sd;
 		sd->guild = g;
-		
+
 		if (channel->config->ally && channel->config->ally_autojoin) {
 			channel->join(g->channel, sd, "", true);
 		}
@@ -868,7 +864,7 @@ int guild_member_withdraw(int guild_id, int account_id, int char_id, int flag, c
 
 	if(g == NULL)
 		return 0; // no such guild (error!)
-	
+
 	i = guild->getindex(g, account_id, char_id);
 	if( i == -1 )
 		return 0; // not a member (inconsistency!)
@@ -876,7 +872,7 @@ int guild_member_withdraw(int guild_id, int account_id, int char_id, int flag, c
 	online_member_sd = guild->getavailablesd(g);
 	if(online_member_sd == NULL)
 		return 0; // no one online to inform
-		
+
 #ifdef GP_BOUND_ITEMS
 	//Guild bound item check
 	guild->retrieveitembound(char_id,account_id,guild_id);
@@ -940,9 +936,9 @@ void guild_retrieveitembound(int char_id,int aid,int guild_id) {
 int guild_send_memberinfoshort(struct map_session_data *sd,int online)
 { // cleaned up [LuzZza]
 	struct guild *g;
-	
+
 	nullpo_ret(sd);
-		
+
 	if(sd->status.guild_id <= 0)
 		return 0;
 
@@ -960,7 +956,7 @@ int guild_send_memberinfoshort(struct map_session_data *sd,int online)
 			ShowError("guild_send_memberinfoshort: Failed to locate member %d:%d in guild %d!\n", sd->status.account_id, sd->status.char_id, g->guild_id);
 		return 0;
 	}
-	
+
 	if (sd->state.connect_new) {
 		//Note that this works because it is invoked in parse_LoadEndAck before connect_new is cleared.
 		clif->guild_belonginfo(sd,g);
@@ -971,13 +967,12 @@ int guild_send_memberinfoshort(struct map_session_data *sd,int online)
 
 int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int online,int lv,int class_)
 { // cleaned up [LuzZza]
-	
 	int i,alv,c,idx=-1,om=0,oldonline=-1;
 	struct guild *g = guild->search(guild_id);
-	
+
 	if(g == NULL)
 		return 0;
-	
+
 	for(i=0,alv=0,c=0,om=0;i<g->max_member;i++){
 		struct guild_member *m=&g->member[i];
 		if(!m->account_id) continue;
@@ -993,7 +988,7 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin
 		if(m->online)
 			om++;
 	}
-	
+
 	if(idx == -1 || c == 0) {
 		//Treat char_id who doesn't match guild_id (not found as member)
 		struct map_session_data *sd = map->id2sd(account_id);
@@ -1004,7 +999,7 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin
 		ShowWarning("guild: not found member %d,%d on %d[%s]\n", account_id,char_id,guild_id,g->name);
 		return 0;
 	}
-	
+
 	g->average_lv=alv/c;
 	g->connect_member=om;
 
@@ -1013,14 +1008,14 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin
 
 	if(oldonline!=online)
 		clif->guild_memberlogin_notice(g, idx, online);
-	
+
 	if(!g->member[idx].sd)
 		return 0;
 
 	//Send XY dot updates. [Skotlex]
 	//Moved from guild_send_memberinfoshort [LuzZza]
 	for(i=0; i < g->max_member; i++) {
-		
+
 		if(!g->member[i].sd || i == idx ||
 			g->member[i].sd->bl.m != g->member[idx].sd->bl.m)
 			continue;
@@ -1079,7 +1074,7 @@ int guild_memberposition_changed(struct guild *g,int idx,int pos)
 
 	g->member[idx].position=pos;
 	clif->guild_memberpositionchanged(g,idx);
-	
+
 	// Update char position in client [LuzZza]
 	if(g->member[idx].sd != NULL)
 		clif->charnameupdate(g->member[idx].sd);
@@ -1111,7 +1106,7 @@ int guild_position_changed(int guild_id,int idx,struct guild_position *p)
 		return 0;
 	memcpy(&g->position[idx],p,sizeof(struct guild_position));
 	clif->guild_positionchanged(g,idx);
-	
+
 	// Update char name in client [LuzZza]
 	for(i=0;i<g->max_member;i++)
 		if(g->member[i].position == idx && g->member[i].sd != NULL)
@@ -1251,29 +1246,27 @@ unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp) {
 	struct guild *g;
 	struct guild_expcache *c;
 	int per;
-	
+
 	nullpo_ret(sd);
 
 	if (!exp) return 0;
-	
+
 	if (sd->status.guild_id == 0 ||
 		(g = sd->guild) == NULL ||
 		(per = guild->getposition(g,sd)) < 0 ||
 		(per = g->position[per].exp_mode) < 1)
 		return 0;
-	
 
 	if (per < 100)
 		exp = exp * per / 100;
 	//Otherwise tax everything.
-	
 	c = DB->data2ptr(guild->expcache_db->ensure(guild->expcache_db, DB->i2key(sd->status.char_id), guild->create_expcache, sd));
 
 	if (c->exp > UINT64_MAX - exp)
 		c->exp = UINT64_MAX;
 	else
 		c->exp += exp;
-	
+
 	return exp;
 }
 
@@ -1433,7 +1426,6 @@ int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
 		return 0;
 	}
 
-
 	nullpo_ret(sd);
 
 	if(tsd==NULL || tsd->status.guild_id<=0)
@@ -1499,7 +1491,7 @@ int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag)
 		struct guild *g, *tg; // Reconfirm the number of alliance
 		g=sd->guild;
 		tg=tsd->guild;
-		
+
 		if(g==NULL || guild->get_alliance_count(g,0) >= battle_config.max_guild_alliance){
 			clif->guild_allianceack(sd,4);
 			clif->guild_allianceack(tsd,3);
@@ -1639,7 +1631,7 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id
 			channel->guild_leave_alliance(g[1],g[0]);
 		}
 	}
-	
+
 	if (!(flag & 0x08)) { // new relationship
 		for(i=0;i<2-(flag&1);i++) {
 			if(g[i]!=NULL) {
@@ -1671,7 +1663,6 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id
 			clif->guild_oppositionack(sd[0],0);
 	}
 
-
 	for (i = 0; i < 2 - (flag & 1); i++) { // Retransmission of the relationship list to all members
 		if (g[i] != NULL) {
 			for (j = 0; j < g[i]->max_member; j++) {
@@ -1771,7 +1762,7 @@ int guild_broken(int guild_id,int flag)
 	}
 	if( g->instance )
 		aFree(g->instance);
-	
+
 	if( g->hdata )
 	{
 		for( i = 0; i < g->hdatac; i++ ) {
@@ -1782,7 +1773,7 @@ int guild_broken(int guild_id,int flag)
 		}
 		aFree(g->hdata);
 	}
-	
+
 	idb_remove(guild->db,guild_id);
 	return 0;
 }
@@ -1795,7 +1786,7 @@ int guild_gm_change(int guild_id, struct map_session_data *sd)
 
 	if (sd->status.guild_id != guild_id)
 		return 0;
-	
+
 	g=guild->search(guild_id);
 
 	nullpo_ret(g);
@@ -1839,7 +1830,7 @@ int guild_gm_changed(int guild_id, int account_id, int char_id)
 		clif->message(g->member[pos].sd->fd, msg_sd(g->member[pos].sd,878)); //"You no longer are the Guild Master."
 		g->member[pos].sd->state.gmaster_flag = 0;
 	}
-	
+
 	if (g->member[0].sd && g->member[0].sd->fd) {
 		clif->message(g->member[0].sd->fd, msg_sd(g->member[0].sd,879)); //"You have become the Guild Master!"
 		g->member[0].sd->state.gmaster_flag = 1;
@@ -1867,7 +1858,7 @@ int guild_break(struct map_session_data *sd,char *name) {
 	struct guild *g;
 	struct unit_data *ud;
 	int i;
-	
+
 	nullpo_ret(sd);
 
 	if( (g=sd->guild)==NULL )
@@ -1888,7 +1879,7 @@ int guild_break(struct map_session_data *sd,char *name) {
 		clif->guild_broken(sd,2);
 		return 0;
 	}
-	
+
 	/* regardless of char server allowing it, we clear the guild master's auras */
 	if( (ud = unit->bl2ud(&sd->bl)) ) {
 		int count = 0;
@@ -1905,7 +1896,6 @@ int guild_break(struct map_session_data *sd,char *name) {
 						groups[count++] = ud->skillunit[i];
 					break;
 			}
-			
 		}
 		for(i = 0; i < count; i++) { // FIXME: Why is this not done in the above loop?
 			skill->del_unitgroup(groups[i],ALC_MARK);
@@ -1915,7 +1905,7 @@ int guild_break(struct map_session_data *sd,char *name) {
 #ifdef GP_BOUND_ITEMS
 	pc->bound_clear(sd,IBT_GUILD);
 #endif
-	
+
 	intif->guild_break(g->guild_id);
 	return 1;
 }
@@ -2153,7 +2143,7 @@ bool guild_isallied(int guild_id, int guild_id2)
 
 void guild_flag_add(struct npc_data *nd) {
 	int i;
-	
+
 	/* check */
 	for( i = 0; i < guild->flags_count; i++ ) {
 		if( guild->flags[i] && guild->flags[i]->bl.id == nd->bl.id ) {
@@ -2184,11 +2174,10 @@ void guild_flag_remove(struct npc_data *nd) {
 	for( i = 0, cursor = 0; i < guild->flags_count; i++ ) {
 		if( guild->flags[i] == NULL )
 			continue;
-		
+
 		if( cursor != i ) {
 			memmove(&guild->flags[cursor], &guild->flags[i], sizeof(struct npc_data*));
 		}
-		
 		cursor++;
 	}
 
@@ -2234,7 +2223,7 @@ void guild_flags_clear(void) {
 		if( guild->flags[i] )
 			guild->flags[i] = NULL;
 	}
-	
+
 	guild->flags_count = 0;
 }
 
@@ -2247,7 +2236,7 @@ void do_init_guild(bool minimal) {
 	guild->expcache_db  = idb_alloc(DB_OPT_BASE);
 	guild->infoevent_db = idb_alloc(DB_OPT_BASE);
 	guild->expcache_ers = ers_new(sizeof(struct guild_expcache),"guild.c::expcache_ers",ERS_OPT_NONE);
-		
+
 	sv->readdb(map->db_path, "castle_db.txt", ',', 4, 5, -1, guild->read_castledb);
 
 	sv->readdb(map->db_path, "guild_skill_tree.txt", ',', 2+MAX_GUILD_SKILL_REQUIRE*2, 2+MAX_GUILD_SKILL_REQUIRE*2, -1, guild->read_guildskill_tree_db); //guild skill tree [Komurka]
@@ -2262,7 +2251,7 @@ void do_final_guild(void) {
 	DBIterator *iter = db_iterator(guild->db);
 	struct guild *g;
 	int i;
-	
+
 	for( g = dbi_first(iter); dbi_exists(iter); g = dbi_next(iter) ) {
 		if( g->channel != NULL )
 			channel->delete(g->channel);
@@ -2281,21 +2270,21 @@ void do_final_guild(void) {
 			aFree(g->hdata);
 		}
 	}
-	
+
 	dbi_destroy(iter);
-	
+
 	db_destroy(guild->db);
 	guild->castle_db->destroy(guild->castle_db,guild->castle_db_final);
 	guild->expcache_db->destroy(guild->expcache_db,guild->expcache_db_final);
 	guild->infoevent_db->destroy(guild->infoevent_db,guild->eventlist_db_final);
 	ers_destroy(guild->expcache_ers);
-		
+
 	if( guild->flags )
 		aFree(guild->flags);
 }
 void guild_defaults(void) {
 	guild = &guild_s;
-	
+
 	guild->init = do_init_guild;
 	guild->final = do_final_guild;
 	/* */
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index cc736708d..d0a4f6679 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -297,10 +297,10 @@ bool homunculus_levelup(struct homun_data *hd) {
 		ShowError("homunculus_levelup: Invalid class %d. \n", hd->homunculus.class_);
 		return false;
 	}
-	
+
 	if( !hd->exp_next || hd->homunculus.exp < hd->exp_next )
 		return false;
-	
+
 	switch( htype ) {
 		case HT_REG:
 		case HT_EVO:
@@ -312,7 +312,7 @@ bool homunculus_levelup(struct homun_data *hd) {
 				return false;
 			break;
 	}
-		
+
 	hom = &hd->homunculus;
 	hom->level++ ;
 	if (!(hom->level % 3))
@@ -385,7 +385,7 @@ bool homunculus_evolve(struct homun_data *hd) {
 	sd = hd->master;
 	if (!sd)
 		return false;
-	
+
 	if(!hd->homunculusDB->evo_class || hd->homunculus.class_ == hd->homunculusDB->evo_class) {
 		clif->emotion(&hd->bl, E_SWT);
 		return false;
@@ -438,7 +438,7 @@ bool homunculus_mutate(struct homun_data *hd, int homun_id) {
 	sd = hd->master;
 	if (!sd)
 		return false;
-	
+
 	m_class = homun->class2type(hd->homunculus.class_);
 	m_id    = homun->class2type(homun_id);
 
@@ -461,7 +461,6 @@ bool homunculus_mutate(struct homun_data *hd, int homun_id) {
 	clif->emotion(&sd->bl, E_NO1);
 	clif->specialeffect(&hd->bl,568,AREA);
 
-
 	//status_Calc flag&1 will make current HP/SP be reloaded from hom structure
 	hom = &hd->homunculus;
 	hom->hp = hd->battle_status.hp;
@@ -480,12 +479,12 @@ int homunculus_gainexp(struct homun_data *hd,unsigned int exp) {
 
 	if(hd->homunculus.vaporize != HOM_ST_ACTIVE)
 		return 1;
-	
+
 	if( (htype = homun->class2type(hd->homunculus.class_)) == HT_INVALID ) {
 		ShowError("homunculus_gainexp: Invalid class %d. \n", hd->homunculus.class_);
 		return 0;
 	}
-	
+
 	switch( htype ) {
 		case HT_REG:
 		case HT_EVO:
@@ -763,7 +762,7 @@ bool homunculus_create(struct map_session_data *sd, struct s_homunculus *hom) {
 	hd->bl.x = hd->ud.to_x;
 	hd->bl.y = hd->ud.to_y;
 	hd->masterteleport_timer = 0;
-	
+
 	map->addiddb(&hd->bl);
 	status_calc_homunculus(hd,SCO_FIRST);
 	status_percent_heal(&hd->bl, 100, 100);
@@ -835,7 +834,7 @@ bool homunculus_recv_data(int account_id, struct s_homunculus *sh, int flag) {
 
 	if (!sd->status.hom_id) //Hom just created.
 		sd->status.hom_id = sh->hom_id;
-	
+
 	if (sd->hd) //uh? Overwrite the data.
 		memcpy(&sd->hd->homunculus, sh, sizeof(struct s_homunculus));
 	else
@@ -985,10 +984,10 @@ bool homunculus_shuffle(struct homun_data *hd) {
 	exp = hd->homunculus.exp;
 	memcpy(&b_skill, &hd->homunculus.hskill, sizeof(b_skill));
 	skillpts = hd->homunculus.skillpts;
-	
+
 	//Reset values to level 1.
 	homun->stat_reset(hd);
-	
+
 	//Level it back up
 	do {
 		hd->homunculus.exp += hd->exp_next;
@@ -1159,7 +1158,7 @@ bool homunculus_read_skill_db_sub(char* split[], int columns, int current) {
 
 	// check for bounds [celest]
 	classid = atoi(split[0]) - HM_CLASS_BASE;
-	
+
 	if ( classid >= MAX_HOMUNCULUS_CLASS ) {
 		ShowWarning("homunculus_read_skill_db_sub: Invalid homunculus class %d.\n", atoi(split[0]));
 		return false;
@@ -1273,7 +1272,7 @@ void do_init_homunculus(bool minimal) {
 }
 
 void do_final_homunculus(void) {
-	
+
 }
 
 void homunculus_defaults(void) {
diff --git a/src/map/instance.c b/src/map/instance.c
index 1fc396325..300247fe7 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -47,7 +47,6 @@ bool instance_is_valid(int instance_id) {
 	return true;
 }
 
-
 /*--------------------------------------
  * name : instance name
  * Return value could be
@@ -61,7 +60,7 @@ int instance_create(int owner_id, const char *name, enum instance_owner_type typ
 	struct guild *g = NULL;
 	short *iptr = NULL;
 	int i;
-	
+
 	switch ( type ) {
 		case IOT_NONE:
 			break;
@@ -93,15 +92,15 @@ int instance_create(int owner_id, const char *name, enum instance_owner_type typ
 			ShowError("instance_create: unknown type %d for owner_id %d and name %s.\n", type,owner_id,name);
 			return -1;
 	}
-	
+
 	if( type != IOT_NONE && *icptr ) {
 		ARR_FIND(0, *icptr, i, strcmp(instance->list[iptr[i]].name,name) == 0 );
 		if( i != *icptr )
 			return -4;/* already got this instance */
 	}
-		
+
 	ARR_FIND(0, instance->instances, i, instance->list[i].state == INSTANCE_FREE);
-		
+
 	if( i == instance->instances )
 		RECREATE(instance->list, struct instance_data, ++instance->instances);
 
@@ -121,9 +120,9 @@ int instance_create(int owner_id, const char *name, enum instance_owner_type typ
 	instance->list[i].respawn.map = 0;
 	instance->list[i].respawn.y = 0;
 	instance->list[i].respawn.x = 0;
-	
+
 	safestrncpy( instance->list[i].name, name, sizeof(instance->list[i].name) );
-	
+
 	if( type != IOT_NONE ) {
 		int j;
 		ARR_FIND(0, *icptr, j, iptr[j] == -1);
@@ -146,7 +145,7 @@ int instance_create(int owner_id, const char *name, enum instance_owner_type typ
 			iptr[j] = i;
 		}
 	}
-	
+
 	clif->instance(i, 1, 0); // Start instancing window
 	return i;
 }
@@ -166,27 +165,27 @@ int instance_add_map(const char *name, int instance_id, bool usebasename, const
 		ShowError("instance_add_map: trying to attach '%s' map to non-existing instance %d.\n", name, instance_id);
 		return -1;
 	}
-	
+
 	if( map_name != NULL && strdb_iget(mapindex->db, map_name) ) {
 		ShowError("instance_add_map: trying to create instanced map with existent name '%s'\n", map_name);
 		return -2;
 	}
-	
+
 	if( map->list[m].instance_id >= 0 ) {
 		// Source map already belong to a Instance.
 		ShowError("instance_add_map: trying to instance already instanced map %s.\n", name);
 		return -4;
 	}
-	
+
 	ARR_FIND( instance->start_id, map->count, i, map->list[i].name[0] == 0 ); // Searching for a Free Map
-		
+
 	if( i < map->count )
 		im = i; // Unused map found (old instance)
 	else {
 		im = map->count; // Using next map index
 		RECREATE(map->list,struct map_data,++map->count);
 	}
-	
+
 	if( map->list[m].cell == (struct mapcell *)0xdeadbeaf )
 		map->cellfromcache(&map->list[m]);
 
@@ -199,13 +198,13 @@ int instance_add_map(const char *name, int instance_id, bool usebasename, const
 	map->list[im].index = mapindex->addmap(-1, map->list[im].name); // Add map index
 
 	map->list[im].channel = NULL;
-	
+
 	if( !map->list[im].index ) {
 		map->list[im].name[0] = '\0';
 		ShowError("instance_add_map: no more free map indexes.\n");
 		return -3; // No free map index
 	}
-	
+
 	// Reallocate cells
 	num_cell = map->list[im].xs * map->list[im].ys;
 	CREATE( map->list[im].cell, struct mapcell, num_cell );
@@ -221,7 +220,7 @@ int instance_add_map(const char *name, int instance_id, bool usebasename, const
 		map->list[im].cell[j].npc = 0;
 		map->list[im].cell[j].landprotector = 0;
 	}
-	
+
 	size = map->list[im].bxs * map->list[im].bys * sizeof(struct block_list*);
 	map->list[im].block = (struct block_list**)aCalloc(size, 1);
 	map->list[im].block_mob = (struct block_list**)aCalloc(size, 1);
@@ -246,7 +245,7 @@ int instance_add_map(const char *name, int instance_id, bool usebasename, const
 	if( map->list[m].skill_count ) {
 		map->list[im].skill_count = map->list[m].skill_count;
 		CREATE( map->list[im].skills, struct mapflag_skill_adjust*, map->list[im].skill_count );
-		
+
 		for(i = 0; i < map->list[im].skill_count; i++) {
 			CREATE( map->list[im].skills[i], struct mapflag_skill_adjust, 1);
 			memcpy( map->list[im].skills[i],map->list[m].skills[i],sizeof(struct mapflag_skill_adjust));
@@ -256,20 +255,20 @@ int instance_add_map(const char *name, int instance_id, bool usebasename, const
 	if( map->list[m].zone_mf_count ) {
 		map->list[im].zone_mf_count = map->list[m].zone_mf_count;
 		CREATE( map->list[im].zone_mf, char *, map->list[im].zone_mf_count );
-		
+
 		for(i = 0; i < map->list[im].zone_mf_count; i++) {
 			CREATE(map->list[im].zone_mf[i], char, MAP_ZONE_MAPFLAG_LENGTH);
 			safestrncpy(map->list[im].zone_mf[i],map->list[m].zone_mf[i],MAP_ZONE_MAPFLAG_LENGTH);
 		}
 	}
-	
+
 	//Mimic questinfo
 	if( map->list[m].qi_count ) {
 		map->list[im].qi_count = map->list[m].qi_count;
 		CREATE( map->list[im].qi_data, struct questinfo, map->list[im].qi_count );
 		memcpy( map->list[im].qi_data, map->list[m].qi_data, map->list[im].qi_count * sizeof(struct questinfo) );
 	}
-	
+
 	map->list[im].m = im;
 	map->list[im].instance_id = instance_id;
 	map->list[im].instance_src_map = m;
@@ -280,7 +279,7 @@ int instance_add_map(const char *name, int instance_id, bool usebasename, const
 
 	instance->list[instance_id].map[instance->list[instance_id].num_map - 1] = im; // Attach to actual instance
 	map->addmap2db(&map->list[im]);
-	
+
 	return im;
 }
 
@@ -305,11 +304,11 @@ int instance_map2imap(int16 m, int instance_id) {
 
 int instance_mapname2imap(const char *map_name, int instance_id) {
 	int i;
-	
+
 	if( !instance->valid(instance_id) ) {
 		return -1;
 	}
-	
+
 	for( i = 0; i < instance->list[instance_id].num_map; i++ ) {
 		if( instance->list[instance_id].map[i] && !strcmpi(map->list[map->list[instance->list[instance_id].map[i]].instance_src_map].name,map_name) )
 			return instance->list[instance_id].map[i];
@@ -317,7 +316,6 @@ int instance_mapname2imap(const char *map_name, int instance_id) {
 	return -1;
 }
 
-
 /*--------------------------------------
  * m : source map
  * instance_id : where to search
@@ -354,7 +352,7 @@ int instance_init_npc(struct block_list* bl, va_list args) {
 	struct npc_data *nd = (struct npc_data*)bl;
 	struct event_data *ev;
 	char evname[EVENT_NAME_LENGTH];
-	
+
 	snprintf(evname, EVENT_NAME_LENGTH, "%s::OnInstanceInit", nd->exname);
 
 	if( ( ev = strdb_get(npc->ev_db, evname) ) )
@@ -377,7 +375,7 @@ void instance_init(int instance_id) {
 
 	/* cant be together with the previous because it will rely on all of them being up */
 	map->foreachininstance(instance->init_npc, instance_id, BL_NPC);
-	
+
 	instance->list[instance_id].state = INSTANCE_BUSY;
 }
 
@@ -387,7 +385,7 @@ void instance_init(int instance_id) {
  *--------------------------------------*/
 int instance_del_load(struct map_session_data* sd, va_list args) {
 	int16 m = va_arg(args,int);
-	
+
 	if( !sd || sd->bl.m != m )
 		return 0;
 
@@ -428,7 +426,7 @@ int instance_cleanup_sub(struct block_list *bl, va_list ap) {
  *--------------------------------------*/
 void instance_del_map(int16 m) {
 	int i;
-	
+
 	if( m <= 0 || map->list[m].instance_id == -1 ) {
 		ShowError("instance_del_map: tried to remove non-existing instance map (%d)\n", m);
 		return;
@@ -439,38 +437,38 @@ void instance_del_map(int16 m) {
 
 	if( map->list[m].mob_delete_timer != INVALID_TIMER )
 		timer->delete(map->list[m].mob_delete_timer, map->removemobs_timer);
-	
+
 	mapindex->removemap(map_id2index(m));
 
 	// Free memory
 	aFree(map->list[m].cell);
 	aFree(map->list[m].block);
 	aFree(map->list[m].block_mob);
-	
+
 	if (map->list[m].unit_count && map->list[m].units) {
 		for(i = 0; i < map->list[m].unit_count; i++) {
 			aFree(map->list[m].units[i]);
 		}
 		aFree(map->list[m].units);
 	}
-	
+
 	if (map->list[m].skill_count && map->list[m].skills) {
 		for(i = 0; i < map->list[m].skill_count; i++) {
 			aFree(map->list[m].skills[i]);
 		}
 		aFree(map->list[m].skills);
 	}
-	
+
 	if (map->list[m].zone_mf_count && map->list[m].zone_mf) {
 		for(i = 0; i < map->list[m].zone_mf_count; i++) {
 			aFree(map->list[m].zone_mf[i]);
 		}
 		aFree(map->list[m].zone_mf);
 	}
-	
+
 	if( map->list[m].qi_data )
 		aFree(map->list[m].qi_data);
-	
+
 	// Remove from instance
 	for( i = 0; i < instance->list[map->list[m].instance_id].num_map; i++ ) {
 		if( instance->list[map->list[m].instance_id].map[i] == m ) {
@@ -481,10 +479,10 @@ void instance_del_map(int16 m) {
 			break;
 		}
 	}
-	
+
 	if( i == instance->list[map->list[m].instance_id].num_map )
 		ShowError("map_instance_del: failed to remove %s from instance list (%s): %d\n", map->list[m].name, instance->list[map->list[m].instance_id].name, m);
-	
+
 	if( map->list[m].channel )
 		channel->delete(map->list[m].channel);
 
@@ -514,7 +512,7 @@ void instance_destroy(int instance_id) {
 	short *iptr = NULL;
 	int type, j;
 	unsigned int now = (unsigned int)time(NULL);
-	
+
 	if( !instance->valid(instance_id) )
 		return; // nothing to do
 
@@ -524,7 +522,7 @@ void instance_destroy(int instance_id) {
 		type = 2;
 	else
 		type = 3;
-		
+
 	clif->instance(instance_id, 5, type); // Report users this instance has been destroyed
 
 	switch ( instance->list[instance_id].owner_type ) {
@@ -555,13 +553,13 @@ void instance_destroy(int instance_id) {
 			ShowError("instance_destroy: unknown type %d for owner_id %d and name '%s'.\n", instance->list[instance_id].owner_type,instance->list[instance_id].owner_id,instance->list[instance_id].name);
 			break;
 	}
-	
+
 	if( iptr != NULL ) {
 		ARR_FIND(0, *icptr, j, iptr[j] == instance_id);
 		if( j != *icptr )
 			iptr[j] = -1;
 	}
-	
+
 	if (instance->list[instance_id].map) {
 		int last = 0;
 		while (instance->list[instance_id].num_map && last != instance->list[instance_id].map[0]) {
@@ -570,7 +568,7 @@ void instance_destroy(int instance_id) {
 			instance->del_map( instance->list[instance_id].map[0] );
 		}
 	}
-	
+
 	if( instance->list[instance_id].regs.vars )
 		db_destroy(instance->list[instance_id].regs.vars);
 	if( instance->list[instance_id].regs.arrays )
@@ -585,11 +583,11 @@ void instance_destroy(int instance_id) {
 
 	if( instance->list[instance_id].map )
 		aFree(instance->list[instance_id].map);
-	
+
 	instance->list[instance_id].map = NULL;
 	instance->list[instance_id].state = INSTANCE_FREE;
 	instance->list[instance_id].num_map = 0;
-	
+
 	if (instance->list[instance_id].hdata)
 	{
 		for( j = 0; j < instance->list[instance_id].hdatac; j++ ) {
@@ -600,7 +598,7 @@ void instance_destroy(int instance_id) {
 		}
 		aFree(instance->list[instance_id].hdata);
 	}
-	
+
 	instance->list[instance_id].hdata = NULL;
 	instance->list[instance_id].hdatac = 0;
 }
@@ -688,13 +686,13 @@ void do_reload_instance(void) {
 	struct s_mapiterator *iter;
 	struct map_session_data *sd;
 	int i, k;
-	
+
 	for(i = 0; i < instance->instances; i++) {
 		for(k = 0; k < instance->list[i].num_map; k++) {
 			if( !map->list[map->list[instance->list[i].map[k]].instance_src_map].flag.src4instance )
 				break;
 		}
-		
+
 		if( k != instance->list[i].num_map ) /* any (or all) of them were disabled, we destroy */
 			instance->destroy(i);
 		else {
@@ -704,7 +702,7 @@ void do_reload_instance(void) {
 			instance->set_timeout(i,instance->list[i].original_progress_timeout,instance->list[i].idle_timeoutval);
 		}
 	}
-	
+
 	iter = mapit_getallusers();
 	for( sd = (TBL_PC*)mapit->first(iter); mapit->exists(iter); sd = (TBL_PC*)mapit->next(iter) ) {
 		if(sd && map->list[sd->bl.m].instance_id >= 0) {
@@ -714,14 +712,13 @@ void do_reload_instance(void) {
 	mapit->free(iter);
 }
 
-
 void do_final_instance(void) {
 	int i;
-	
+
 	for(i = 0; i < instance->instances; i++) {
 		instance->destroy(i);
 	}
-	
+
 	if( instance->list )
 		aFree(instance->list);
 
@@ -738,7 +735,7 @@ void do_init_instance(bool minimal) {
 
 void instance_defaults(void) {
 	instance = &instance_s;
-	
+
 	instance->init = do_init_instance;
 	instance->final = do_final_instance;
 	instance->reload = do_reload_instance;
diff --git a/src/map/intif.c b/src/map/intif.c
index 12f679552..1795055c4 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -279,7 +279,7 @@ int intif_saveregistry(struct map_session_data *sd) {
 
 	if (intif->CheckForCharServer() || !sd->regs.vars)
 		return -1;
-	
+
 	WFIFOHEAD(inter_fd, 60000 + 300);
 	WFIFOW(inter_fd,0)  = 0x3004;
 	/* 0x2 = length (set later) */
@@ -288,78 +288,76 @@ int intif_saveregistry(struct map_session_data *sd) {
 	WFIFOW(inter_fd,12) = 0;/* count */
 
 	plen = 14;
-	
+
 	iter = db_iterator(sd->regs.vars);
 	for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) ) {
 		const char *varname = NULL;
 		struct script_reg_state *src = NULL;
-		
+
 		if( data->type != DB_DATA_PTR ) /* its a @number */
 			continue;
-		
+
 		varname = script->get_str(script_getvarid(key.i64));
-		
+
 		if( varname[0] == '@' ) /* @string$ can get here, so we skip */
 			continue;
-		
+
 		src = DB->data2ptr(data);
 
 		/* no need! */
 		if( !src->update )
 			continue;
-		
+
 		src->update = false;
-				
+
 		len = strlen(varname)+1;
-		
+
 		WFIFOB(inter_fd, plen) = (unsigned char)len;/* won't be higher; the column size is 32 */
 		plen += 1;
-		
+
 		safestrncpy((char*)WFIFOP(inter_fd,plen), varname, len);
 		plen += len;
-				
+
 		WFIFOL(inter_fd, plen) = script_getvaridx(key.i64);
 		plen += 4;
-		
+
 		if( src->type ) {
 			struct script_reg_str *p = (struct script_reg_str *)src;
-						
+
 			WFIFOB(inter_fd, plen) = p->value ? 2 : 3;
 			plen += 1;
-			
+
 			if( p->value ) {
 				len = strlen(p->value)+1;
-				
+
 				WFIFOB(inter_fd, plen) = (unsigned char)len;/* won't be higher; the column size is 254 */
 				plen += 1;
-				
+
 				safestrncpy((char*)WFIFOP(inter_fd,plen), p->value, len);
 				plen += len;
 			} else {
 				script->reg_destroy_single(sd,key.i64,&p->flag);
 			}
-			
 		} else {
 			struct script_reg_num *p = (struct script_reg_num *)src;
 
 			WFIFOB(inter_fd, plen) =  p->value ? 0 : 1;
 			plen += 1;
-		
+
 			if( p->value ) {
 				WFIFOL(inter_fd, plen) = p->value;
 				plen += 4;
 			} else {
 				script->reg_destroy_single(sd,key.i64,&p->flag);
 			}
-			
 		}
-		
+
 		WFIFOW(inter_fd,12) += 1;
-		
+
 		if( plen > 60000 ) {
 			WFIFOW(inter_fd, 2) = plen;
 			WFIFOSET(inter_fd, plen);
-			
+
 			/* prepare follow up */
 			WFIFOHEAD(inter_fd, 60000 + 300);
 			WFIFOW(inter_fd,0)  = 0x3004;
@@ -367,19 +365,18 @@ int intif_saveregistry(struct map_session_data *sd) {
 			WFIFOL(inter_fd,4)  = sd->status.account_id;
 			WFIFOL(inter_fd,8)  = sd->status.char_id;
 			WFIFOW(inter_fd,12) = 0;/* count */
-			
+
 			plen = 14;
 		}
-		
 	}
 	dbi_destroy(iter);
 
 	/* mark & go. */
 	WFIFOW(inter_fd, 2) = plen;
 	WFIFOSET(inter_fd, plen);
-	
+
 	sd->vars_dirty = false;
-	
+
 	return 0;
 }
 
@@ -826,7 +823,6 @@ int intif_guild_castle_dataload(int num, int *castle_ids)
 	return 1;
 }
 
-
 // Request change castle guild owner and save data
 int intif_guild_castle_datasave(int castle_id,int index, int value)
 {
@@ -895,7 +891,6 @@ int intif_homunculus_requestdelete(int homun_id)
 
 }
 
-
 //-----------------------------------------------------------------
 // Packets receive from inter server
 
@@ -999,13 +994,13 @@ void intif_parse_Registers(int fd)
 	else { //Normally registries should arrive for in log-in chars.
 		sd = map->id2sd(account_id);
 	}
-	
+
 	if (!sd || sd->status.char_id != char_id) {
 		return; //Character registry from another character.
 	}
-		
+
 	flag = ( sd->vars_received&PRL_ACCG && sd->vars_received&PRL_ACCL && sd->vars_received&PRL_CHAR ) ? 0 : 1;
-	
+
 	switch (RFIFOB(fd,12)) {
 		case 3: //Character Registry
 			sd->vars_received |= PRL_CHAR;
@@ -1024,14 +1019,14 @@ void intif_parse_Registers(int fd)
 	}
 	/* have it not complain about insertion of vars before loading, and not set those vars as new or modified */
 	pc->reg_load = true;
-	
+
 	if( RFIFOW(fd, 14) ) {
 		char key[32];
 		unsigned int index;
 		int max = RFIFOW(fd, 14), cursor = 16, i;
-		
+
 		script->parser_current_file = "loading char/acc variables";//for script_add_str to refer to here in case errors occur
-		
+
 		/**
 		 * Vessel!char_reg_num_db
 		 *
@@ -1043,13 +1038,13 @@ void intif_parse_Registers(int fd)
 				char sval[254];
 				safestrncpy(key, (char*)RFIFOP(fd, cursor + 1), RFIFOB(fd, cursor));
 				cursor += RFIFOB(fd, cursor) + 1;
-				
+
 				index = RFIFOL(fd, cursor);
 				cursor += 4;
-				
+
 				safestrncpy(sval, (char*)RFIFOP(fd, cursor + 1), RFIFOB(fd, cursor));
 				cursor += RFIFOB(fd, cursor) + 1;
-								
+
 				script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (void*)sval, NULL);
 			}
 		/**
@@ -1063,23 +1058,22 @@ void intif_parse_Registers(int fd)
 				int ival;
 				safestrncpy(key, (char*)RFIFOP(fd, cursor + 1), RFIFOB(fd, cursor));
 				cursor += RFIFOB(fd, cursor) + 1;
-				
+
 				index = RFIFOL(fd, cursor);
 				cursor += 4;
-				
+
 				ival = RFIFOL(fd, cursor);
 				cursor += 4;
-								
+
 				script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (void*)h64BPTRSIZE(ival), NULL);
 			}
 		}
-		
 		script->parser_current_file = NULL;/* reset */
 	}
-	
+
 	/* flag it back */
 	pc->reg_load = false;
-		
+
 	if (flag && sd->vars_received&PRL_ACCG && sd->vars_received&PRL_ACCL && sd->vars_received&PRL_CHAR)
 		pc->reg_received(sd); //Received all registry values, execute init scripts and what-not. [Skotlex]
 }
@@ -1662,7 +1656,7 @@ void intif_parse_MailDelete(int fd) {
 	int char_id = RFIFOL(fd,2);
 	int mail_id = RFIFOL(fd,6);
 	bool failed = RFIFOB(fd,10);
-	
+
 	if ( (sd = map->charid2sd(char_id)) == NULL) {
 		ShowError("intif_parse_MailDelete: char not found %d\n", char_id);
 		return;
@@ -1987,7 +1981,7 @@ int intif_mercenary_create(struct s_mercenary *merc)
 
 void intif_parse_MercenaryReceived(int fd) {
 	int len = RFIFOW(fd,2) - 5;
-	
+
 	if (sizeof(struct s_mercenary) != len) {
 		if (battle_config.etc_log)
 			ShowError("intif: create mercenary data size mismatch %d != %"PRIuS"\n", len, sizeof(struct s_mercenary));
@@ -2067,7 +2061,7 @@ int intif_elemental_create(struct s_elemental *ele)
 
 void intif_parse_ElementalReceived(int fd) {
 	int len = RFIFOW(fd,2) - 5;
-	
+
 	if (sizeof(struct s_elemental) != len) {
 		if (battle_config.etc_log)
 			ShowError("intif: create elemental data size mismatch %d != %"PRIuS"\n", len, sizeof(struct s_elemental));
@@ -2128,8 +2122,6 @@ void intif_parse_ElementalSaved(int fd) {
 }
 
 void intif_request_accinfo( int u_fd, int aid, int group_lv, char* query ) {
-
-
 	WFIFOHEAD(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH);
 
 	WFIFOW(inter_fd,0) = 0x3007;
@@ -2176,7 +2168,7 @@ void intif_itembound_req(int char_id,int aid,int guild_id) {
 		gstor->lock = 1; //Lock for retrieval process
 #endif
 }
- 
+
 //3856
 void intif_parse_Itembound_ack(int fd) {
 #ifdef GP_BOUND_ITEMS
@@ -2252,11 +2244,11 @@ int intif_parse(int fd)
 		case 0x383f: intif->pGuildEmblem(fd); break;
 		case 0x3840: intif->pGuildCastleDataLoad(fd); break;
 		case 0x3843: intif->pGuildMasterChanged(fd); break;
-			
+
 		//Quest system
 		case 0x3860: intif->pQuestLog(fd); break;
 		case 0x3861: intif->pQuestSave(fd); break;
-			
+
 		// Mail System
 		case 0x3848: intif->pMailInboxReceived(fd); break;
 		case 0x3849: intif->pMailNew(fd); break;
@@ -2287,7 +2279,7 @@ int intif_parse(int fd)
 		case 0x387c: intif->pElementalReceived(fd); break;
 		case 0x387d: intif->pElementalDeleted(fd); break;
 		case 0x387e: intif->pElementalSaved(fd); break;
-			
+
 		case 0x3880: intif->pCreatePet(fd); break;
 		case 0x3881: intif->pRecvPetData(fd); break;
 		case 0x3882: intif->pSavePetOk(fd); break;
@@ -2328,7 +2320,7 @@ void intif_defaults(void) {
 
 	/* */
 	memcpy(intif->packet_len_table,&packet_len_table,sizeof(intif->packet_len_table));
-	
+
 	/* funcs */
 	intif->parse = intif_parse;
 	intif->create_pet = intif_create_pet;
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index 2b5069af7..f89bd2f1c 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -36,10 +36,10 @@ int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct hSockOpt opt;
 	if( ircbot->isOn || ++ircbot->fails >= 3 )
 		return 0;
-	
+
 	opt.silent = 1;
 	opt.setTimeo = 0;
-	
+
 	ircbot->last_try = timer->gettick();
 
 	if ((ircbot->fd = sockt->make_connection(ircbot->ip, channel->config->irc_server_port, &opt)) > 0) {
@@ -58,14 +58,14 @@ int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) {
 int irc_identify_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( !ircbot->isOn )
 		return 0;
-	
+
 	sprintf(send_string, "USER HerculesWS%d 8 * : Hercules IRC Bridge",rnd()%777);
 	ircbot->send(send_string);
 	sprintf(send_string, "NICK %s", channel->config->irc_nick);
 	ircbot->send(send_string);
 
 	timer->add(timer->gettick() + 3000, ircbot->join_timer, 0, 0);
-	
+
 	return 0;
 }
 
@@ -76,7 +76,7 @@ int irc_identify_timer(int tid, int64 tick, int id, intptr_t data) {
 int irc_join_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( !ircbot->isOn )
 		return 0;
-	
+
 	if (channel->config->irc_nick_pw[0] != '\0') {
 		sprintf(send_string, "PRIVMSG NICKSERV : IDENTIFY %s", channel->config->irc_nick_pw);
 		ircbot->send(send_string);
@@ -84,7 +84,7 @@ int irc_join_timer(int tid, int64 tick, int id, intptr_t data) {
 			sprintf(send_string, "PRIVMSG NICKSERV : GHOST %s %s", channel->config->irc_nick, channel->config->irc_nick_pw);
 		}
 	}
-	
+
 	sprintf(send_string, "JOIN %s", channel->config->irc_channel);
 	ircbot->send(send_string);
 	ircbot->isIn = true;
@@ -125,20 +125,20 @@ int irc_parse(int fd) {
 		timer->add(timer->gettick() + 120000, ircbot->connect_timer, 0, 0);
 		return 0;
 	}
-	
+
 	if( !RFIFOREST(fd) )
 		return 0;
-	
+
 	parse_string = (char*)RFIFOP(fd,0);
 	parse_string[ RFIFOREST(fd) - 1 ] = '\0';
-	
+
 	parse_string = strtok_r(parse_string,"\r\n",&str_safe);
-	
+
 	while (parse_string != NULL) {
 		ircbot->parse_sub(fd,parse_string);
 		parse_string = strtok_r(NULL,"\r\n",&str_safe);
 	}
-	
+
 	RFIFOSKIP(fd, RFIFOREST(fd));
 	RFIFOFLUSH(fd);
 	return 0;
@@ -158,7 +158,7 @@ void irc_parse_source(char *source, char *nick, char *ident, char *host) {
 	int i, pos = 0;
 	size_t len = strlen(source);
 	unsigned char stage = 0;
-	
+
 	for(i = 0; i < len; i++) {
 		if( stage == 0 && source[i] == '!' ) {
 			safestrncpy(nick, &source[0], min(i + 1, IRC_NICK_LENGTH));
@@ -182,21 +182,21 @@ void irc_parse_sub(int fd, char *str) {
 	char source[180], command[60], buf1[IRC_MESSAGE_LENGTH], buf2[IRC_MESSAGE_LENGTH];
 	char *target = buf1, *message = buf2;
 	struct irc_func *func;
-	
+
 	source[0] = command[0] = buf1[0] = buf2[0] = '\0';
-	
+
 	if( str[0] == ':' )
 		str++;
-	
+
 	if (sscanf(str, "%179s %59s %499s :%499[^\r\n]", source, command, buf1, buf2) == 3 && buf1[0] == ':') {
 		// source command :message (i.e. QUIT)
 		message = buf1+1;
 		target = buf2;
 	}
-		
+
 	if( command[0] == '\0' )
 		return;
-		
+
 	if ((func = ircbot->func_search(command)) == NULL && (func = ircbot->func_search(source)) == NULL) {
 #ifdef IRCBOT_DEBUG
 		ShowWarning("Unknown command received %s from %s\n",command,source);
@@ -204,7 +204,6 @@ void irc_parse_sub(int fd, char *str) {
 		return;
 	}
 	func->func(fd,command,source,target,message);
-	
 }
 
 /**
@@ -301,7 +300,7 @@ void irc_privmsg(int fd, char *cmd, char *source, char *target, char *msg) {
 
 		if( source[0] != '\0' )
 			ircbot->parse_source(source,source_nick,source_ident,source_host);
-				
+
 		if( ircbot->channel ) {
 			size_t padding_len = strlen(ircbot->channel->name) + strlen(source_nick) + 13;
 			while (1) {
@@ -421,26 +420,26 @@ void irc_bot_init(bool minimal) {
 		channel->config->irc = false;
 		return;
 	}
-	
+
 	ircbot->funcs.size = ARRAYLENGTH(irc_func_base);
 
 	CREATE(ircbot->funcs.list,struct irc_func*,ircbot->funcs.size);
-	
+
 	for( i = 0; i < ircbot->funcs.size; i++ ) {
-		
+
 		CREATE(function, struct irc_func, 1);
-		
+
 		safestrncpy(function->name, irc_func_base[i].name, sizeof(function->name));
 		function->func = irc_func_base[i].func;
-		
+
 		ircbot->funcs.list[i] = function;
 	}
-	
+
 	ircbot->fails = 0;
 	ircbot->fd = 0;
 	ircbot->isIn = false;
 	ircbot->isOn = false;
-	
+
 	timer->add_func_list(ircbot->connect_timer, "irc_connect_timer");
 	timer->add(timer->gettick() + 7000, ircbot->connect_timer, 0, 0);
 }
@@ -450,14 +449,14 @@ void irc_bot_init(bool minimal) {
  */
 void irc_bot_final(void) {
 	int i;
-	
+
 	if (!channel->config->irc)
 		return;
 	if( ircbot->isOn ) {
 		ircbot->send("QUIT :Hercules is shutting down");
 		sockt->close(ircbot->fd);
 	}
-	
+
 	for( i = 0; i < ircbot->funcs.size; i++ ) {
 		aFree(ircbot->funcs.list[i]);
 	}
@@ -469,25 +468,25 @@ void irc_bot_final(void) {
  */
 void ircbot_defaults(void) {
 	ircbot = &irc_bot_s;
-	
+
 	ircbot->channel = NULL;
-	
+
 	ircbot->init = irc_bot_init;
 	ircbot->final = irc_bot_final;
-	
+
 	ircbot->parse = irc_parse;
 	ircbot->parse_sub = irc_parse_sub;
 	ircbot->parse_source = irc_parse_source;
-	
+
 	ircbot->func_search = irc_func_search;
-	
+
 	ircbot->connect_timer = irc_connect_timer;
 	ircbot->identify_timer = irc_identify_timer;
 	ircbot->join_timer = irc_join_timer;
-	
+
 	ircbot->send = irc_send;
 	ircbot->relay = irc_relay;
-	
+
 	ircbot->pong = irc_pong;
 	ircbot->privmsg = irc_privmsg;
 
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index dbade4c10..ccedee72a 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -160,14 +160,14 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str,
 /* [Ind/Hercules] */
 int itemdb_chain_item(unsigned short chain_id, int *rate) {
 	struct item_chain_entry *entry;
-	
+
 	if( chain_id >= itemdb->chain_count ) {
 		ShowError("itemdb_chain_item: unknown chain id %d\n", chain_id);
 		return UNKNOWN_ITEM_ID;
 	}
-	
+
 	entry = &itemdb->chains[chain_id].items[ rnd()%itemdb->chains[chain_id].qty ];
-	
+
 	if( rnd()%10000 >= entry->rate )
 		return 0;
 
@@ -178,47 +178,47 @@ int itemdb_chain_item(unsigned short chain_id, int *rate) {
 /* [Ind/Hercules] */
 void itemdb_package_item(struct map_session_data *sd, struct item_package *package) {
 	int i = 0, get_count, j, flag;
-	
+
 	for( i = 0; i < package->must_qty; i++ ) {
 		struct item it;
 		memset(&it, 0, sizeof(it));
 
 		it.nameid = package->must_items[i].id;
 		it.identify = 1;
-		
+
 		if( package->must_items[i].hours ) {
 			it.expire_time = (unsigned int)(time(NULL) + ((package->must_items[i].hours*60)*60));
 		}
-		
+
 		if( package->must_items[i].named ) {
 			it.card[0] = CARD0_FORGE;
 			it.card[1] = 0;
 			it.card[2] = GetWord(sd->status.char_id, 0);
 			it.card[3] = GetWord(sd->status.char_id, 1);
 		}
-		
+
 		if( package->must_items[i].announce )
 			clif->package_announce(sd,package->must_items[i].id,package->id);
-		
+
 		if ( package->must_items[i].force_serial )
 			it.unique_id = itemdb->unique_id(sd);
 
 		get_count = itemdb->isstackable(package->must_items[i].id) ? package->must_items[i].qty : 1;
-		
+
 		it.amount = get_count == 1 ? 1 : get_count;
-		
+
 		for( j = 0; j < package->must_items[i].qty; j += get_count ) {
 			if ( ( flag = pc->additem(sd, &it, get_count, LOG_TYPE_SCRIPT) ) )
 				clif->additem(sd, 0, 0, flag);
 		}
 	}
-	
+
 	if( package->random_qty ) {
 		for( i = 0; i < package->random_qty; i++ ) {
 			struct item_package_rand_entry *entry;
-			
+
 			entry = &package->random_groups[i].random_list[rnd()%package->random_groups[i].random_qty];
-			
+
 			while( 1 ) {
 				if( rnd()%10000 >= entry->rate ) {
 					entry = entry->next;
@@ -226,28 +226,28 @@ void itemdb_package_item(struct map_session_data *sd, struct item_package *packa
 				} else {
 					struct item it;
 					memset(&it, 0, sizeof(it));
-					
+
 					it.nameid = entry->id;
 					it.identify = 1;
-					
+
 					if( entry->hours ) {
 						it.expire_time = (unsigned int)(time(NULL) + ((entry->hours*60)*60));
 					}
-					
+
 					if( entry->named ) {
 						it.card[0] = CARD0_FORGE;
 						it.card[1] = 0;
 						it.card[2] = GetWord(sd->status.char_id, 0);
 						it.card[3] = GetWord(sd->status.char_id, 1);
 					}
-					
+
 					if( entry->announce )
 						clif->package_announce(sd,entry->id,package->id);
-					
+
 					get_count = itemdb->isstackable(entry->id) ? entry->qty : 1;
-					
+
 					it.amount = get_count == 1 ? 1 : get_count;
-					
+
 					for( j = 0; j < entry->qty; j += get_count ) {
 						if ( ( flag = pc->additem(sd, &it, get_count, LOG_TYPE_SCRIPT) ) )
 							clif->additem(sd, 0, 0, flag);
@@ -257,9 +257,8 @@ void itemdb_package_item(struct map_session_data *sd, struct item_package *packa
 			}
 		}
 	}
-	
-	return;
 }
+
 /*==========================================
  * Return a random item id from group. (takes into account % chance giving/tot group)
  *------------------------------------------*/
@@ -267,17 +266,17 @@ int itemdb_searchrandomid(struct item_group *group) {
 
 	if (group->qty)
 		return group->nameid[rnd()%group->qty];
-	
+
 	ShowError("itemdb_searchrandomid: No item entries for group id %d\n", group->id);
 	return UNKNOWN_ITEM_ID;
 }
 bool itemdb_in_group(struct item_group *group, int nameid) {
 	int i;
-	
+
 	for( i = 0; i < group->qty; i++ )
 		if( group->nameid[i] == nameid )
 			return true;
-	
+
 	return false;
 }
 
@@ -522,7 +521,6 @@ int itemdb_isstackable2(struct item_data *data)
 	}
 }
 
-
 /*==========================================
  * Trade Restriction functions [Skotlex]
  *------------------------------------------*/
@@ -569,10 +567,10 @@ int itemdb_isrestricted(struct item* item, int gmlv, int gmlv2, int (*func)(stru
 
 	if (!func(item_data, gmlv, gmlv2))
 		return 0;
-	
+
 	if(item_data->slot == 0 || itemdb_isspecial(item->card[0]))
 		return 1;
-	
+
 	for(i = 0; i < item_data->slot; i++) {
 		if (!item->card[i]) continue;
 		if (!func(itemdb->search(item->card[i]), gmlv, gmlv2))
@@ -623,12 +621,12 @@ void itemdb_read_groups(void) {
 		ShowError("can't read %s\n", config_filename);
 		return;
 	}
-		
+
 	gsize = aMalloc( libconfig->setting_length(item_group_conf.root) * sizeof(unsigned int) );
-	
+
 	for(i = 0; i < libconfig->setting_length(item_group_conf.root); i++)
 		gsize[i] = 0;
-	
+
 	i = 0;
 	while( (itg = libconfig->setting_get_elem(item_group_conf.root,i++)) ) {
 		const char *name = config_setting_name(itg);
@@ -639,7 +637,7 @@ void itemdb_read_groups(void) {
 			--i;
 			continue;
 		}
-		
+
 		c = 0;
 		while( (it = libconfig->setting_get_elem(itg,c++)) ) {
 			if( config_setting_is_list(it) )
@@ -647,19 +645,18 @@ void itemdb_read_groups(void) {
 			else
 				gsize[ i - 1 ] += 1;
 		}
-		
 	}
-		
+
 	i = 0;
 	CREATE(itemdb->groups, struct item_group, libconfig->setting_length(item_group_conf.root));
 	itemdb->group_count = (unsigned short)libconfig->setting_length(item_group_conf.root);
-	
+
 	while( (itg = libconfig->setting_get_elem(item_group_conf.root,i++)) ) {
 		struct item_data *data = itemdb->name2id(config_setting_name(itg));
 		int ecount = 0;
-		
+
 		data->group = &itemdb->groups[count];
-		
+
 		itemdb->groups[count].id = data->nameid;
 		itemdb->groups[count].qty = gsize[ count ];
 
@@ -672,13 +669,13 @@ void itemdb_read_groups(void) {
 				repeat = libconfig->setting_get_int_elem(it,1);
 			} else
 				itname = libconfig->setting_get_string_elem(itg,c - 1);
-			
+
 			if( itname[0] == 'I' && itname[1] == 'D' && strlen(itname) < 8 ) {
 				if( !( data = itemdb->exists(atoi(itname+2)) ) )
 					ShowWarning("itemdb_read_groups: unknown item ID '%d' in group '%s'!\n",atoi(itname+2),config_setting_name(itg));
 			} else if( !( data = itemdb->name2id(itname) ) )
 				ShowWarning("itemdb_read_groups: unknown item '%s' in group '%s'!\n",itname,config_setting_name(itg));
-			
+
 			itemdb->groups[count].nameid[ecount] = data ? data->nameid : 0;
 			if( repeat > 1 ) {
 				//memset would be better? I failed to get the following to work though hu
@@ -689,25 +686,24 @@ void itemdb_read_groups(void) {
 			}
 			ecount += repeat;
 		}
-		
 		count++;
 	}
-		
+
 	libconfig->destroy(&item_group_conf);
 	aFree(gsize);
-	
 	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, config_filename);
 }
+
 /* [Ind/Hercules] - HCache for Packages */
 void itemdb_write_cached_packages(const char *config_filename) {
 	FILE *file;
 	unsigned short pcount = itemdb->package_count;
 	unsigned short i;
-	
+
 	if( !(file = HCache->open(config_filename,"wb")) ) {
 		return;
 	}
-	
+
 	// first 2 bytes = package count
 	hwrite(&pcount,sizeof(pcount),1,file);
 
@@ -741,7 +737,7 @@ void itemdb_write_cached_packages(const char *config_filename) {
 		for(c = 0; c < random_qty; c++) {
 			struct item_package_rand_group *group = &itemdb->packages[i].random_groups[c];
 			unsigned short group_qty = group->random_qty, h;
-			
+
 			//next 2 bytes = how many entries in this group
 			hwrite(&group_qty,sizeof(group_qty),1,file);
 			//now we loop into the group's list
@@ -765,9 +761,8 @@ void itemdb_write_cached_packages(const char *config_filename) {
 			}
 		}
 	}
-	
 	fclose(file);
-	
+
 	return;
 }
 bool itemdb_read_cached_packages(const char *config_filename) {
@@ -778,7 +773,7 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 	if( !(file = HCache->open(config_filename,"rb")) ) {
 		return false;
 	}
-	
+
 	// first 2 bytes = package count
 	hread(&pcount,sizeof(pcount),1,file);
 
@@ -790,25 +785,25 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 		struct item_data *pdata;
 		struct item_package *package = &itemdb->packages[i];
 		unsigned short c;
-		
+
 		//into a package, first 2 bytes = id.
 		hread(&id,sizeof(id),1,file);
 		//next 2 bytes = must count
 		hread(&must_qty,sizeof(must_qty),1,file);
 		//next 2 bytes = random count
 		hread(&random_qty,sizeof(random_qty),1,file);
-		
+
 		if( !(pdata = itemdb->exists(id)) )
 			ShowWarning("itemdb_read_cached_packages: unknown package item '%d', skipping..\n",id);
 		else
 			pdata->package = &itemdb->packages[i];
-		
+
 		package->id = id;
 		package->random_qty = random_qty;
 		package->must_qty = must_qty;
 		package->must_items = NULL;
 		package->random_groups = NULL;
-		
+
 		if( package->must_qty ) {
 			CREATE(package->must_items, struct item_package_must_entry, package->must_qty);
 			//now we loop into must
@@ -847,13 +842,13 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 			for(c = 0; c < package->random_qty; c++) {
 				unsigned short group_qty = 0, h;
 				struct item_package_rand_entry *prev = NULL;
-				
+
 				//next 2 bytes = how many entries in this group
 				hread(&group_qty,sizeof(group_qty),1,file);
-				
+
 				package->random_groups[c].random_qty = group_qty;
 				CREATE(package->random_groups[c].random_list, struct item_package_rand_entry, package->random_groups[c].random_qty);
-				
+
 				//now we loop into the group's list
 				for(h = 0; h < group_qty; h++) {
 					struct item_package_rand_entry *entry = &itemdb->packages[i].random_groups[c].random_list[h];
@@ -862,7 +857,7 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 					struct item_data *data;
 
 					if( prev ) prev->next = entry;
-					
+
 					//first 2 byte = item id
 					hread(&mid,sizeof(mid),1,file);
 					//next 2 byte = qty
@@ -880,7 +875,7 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 
 					if( !(data = itemdb->exists(mid)) )
 						ShowWarning("itemdb_read_cached_packages: unknown item '%d' in package '%s'!\n",mid,itemdb_name(package->id));
-					
+
 					entry->id = data ? data->nameid : 0;
 					entry->rate = rate;
 					entry->hours = hours;
@@ -895,9 +890,7 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 			}
 		}
 	}
-	
 	fclose(file);
-	
 	ShowStatus("Done reading '"CL_WHITE"%hu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"' ("CL_GREEN"C"CL_RESET").\n", pcount, config_filename);
 
 	return true;
@@ -914,42 +907,41 @@ void itemdb_read_packages(void) {
 	int i = 0, count = 0, c = 0, highest_gcount = 0;
 	unsigned int *must = NULL, *random = NULL, *rgroup = NULL, **rgroups = NULL;
 	struct item_package_rand_entry **prev = NULL;
-	
+
 	if( HCache->check(config_filename) ) {
 		if( itemdb->read_cached_packages(config_filename) )
 			return;
 	}
-	
+
 	if (libconfig->read_file(&item_packages_conf, config_filename)) {
 		ShowError("can't read %s\n", config_filename);
 		return;
 	}
-	
+
 	must = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) );
 	random = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) );
 	rgroup = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) );
 	rgroups = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int *) );
 
-	
 	for(i = 0; i < libconfig->setting_length(item_packages_conf.root); i++) {
 		must[i] = 0;
 		random[i] = 0;
 		rgroup[i] = 0;
 		rgroups[i] = NULL;
 	}
-	
+
 	/* validate tree, drop poisonous fruits! */
 	i = 0;
 	while( (itg = libconfig->setting_get_elem(item_packages_conf.root,i++)) ) {
 		const char *name = config_setting_name(itg);
-		
+
 		if( !itemdb->name2id(name) ) {
 			ShowWarning("itemdb_read_packages: unknown package item '%s', skipping..\n",name);
 			libconfig->setting_remove(item_packages_conf.root, name);
 			--i;
 			continue;
 		}
-		
+
 		c = 0;
 		while( (it = libconfig->setting_get_elem(itg,c++)) ) {
 			int rval = 0;
@@ -959,7 +951,7 @@ void itemdb_read_packages(void) {
 				--c;
 				continue;
 			}
-			
+
 			if( rval == 0 )
 				must[ i - 1 ] += 1;
 			else {
@@ -976,7 +968,7 @@ void itemdb_read_packages(void) {
 	for(i = 0; i < highest_gcount; i++) {
 		prev[i] = NULL;
 	}
-	
+
 	for(i = 0; i < libconfig->setting_length(item_packages_conf.root); i++ ) {
 		rgroups[i] = aMalloc( rgroup[i] * sizeof(unsigned int) );
 		for( c = 0; c < rgroup[i]; c++ ) {
@@ -995,28 +987,28 @@ void itemdb_read_packages(void) {
 		   }
 		}
 	}
-			   
+
 	CREATE(itemdb->packages, struct item_package, libconfig->setting_length(item_packages_conf.root));
 	itemdb->package_count = (unsigned short)libconfig->setting_length(item_packages_conf.root);
-	
+
 	/* write */
 	i = 0;
 	while( (itg = libconfig->setting_get_elem(item_packages_conf.root,i++)) ) {
 		struct item_data *data = itemdb->name2id(config_setting_name(itg));
 		int r = 0, m = 0;
-		
+
 		for(r = 0; r < highest_gcount; r++) {
 			prev[r] = NULL;
 		}
-		
+
 		data->package = &itemdb->packages[count];
-		
+
 		itemdb->packages[count].id  = data->nameid;
 		itemdb->packages[count].random_groups = NULL;
 		itemdb->packages[count].must_items = NULL;
 		itemdb->packages[count].random_qty = rgroup[ i - 1 ];
 		itemdb->packages[count].must_qty = must[ i - 1 ];
-				
+
 		if( itemdb->packages[count].random_qty ) {
 			CREATE(itemdb->packages[count].random_groups, struct item_package_rand_group, itemdb->packages[count].random_qty);
 			for( c = 0; c < itemdb->packages[count].random_qty; c++ ) {
@@ -1029,14 +1021,14 @@ void itemdb_read_packages(void) {
 		}
 		if( itemdb->packages[count].must_qty )
 			CREATE(itemdb->packages[count].must_items, struct item_package_must_entry, itemdb->packages[count].must_qty);
-		
+
 		c = 0;
 		while( (it = libconfig->setting_get_elem(itg,c++)) ) {
 			int icount = 1, expire = 0, rate = 10000, gid = 0;
 			bool announce = false, named = false, force_serial = false;
-			
+
 			itname = config_setting_name(it);
-			
+
 			if( itname[0] == 'I' && itname[1] == 'D' && strlen(itname) < 8 ) {
 				if( !( data = itemdb->exists(atoi(itname+2)) ) )
 					ShowWarning("itemdb_read_packages: unknown item ID '%d' in package '%s'!\n",atoi(itname+2),config_setting_name(itg));
@@ -1045,10 +1037,10 @@ void itemdb_read_packages(void) {
 
 			if( ( t = libconfig->setting_get_member(it, "Count")) )
 				icount = libconfig->setting_get_int(t);
-			
+
 			if( ( t = libconfig->setting_get_member(it, "Expire")) )
 				expire = libconfig->setting_get_int(t);
-			
+
 			if( ( t = libconfig->setting_get_member(it, "Rate")) ) {
 				if( (rate = (unsigned short)libconfig->setting_get_int(t)) > 10000 ) {
 					ShowWarning("itemdb_read_packages: invalid rate (%d) for item '%s' in package '%s'!\n",rate,itname,config_setting_name(itg));
@@ -1061,7 +1053,7 @@ void itemdb_read_packages(void) {
 
 			if( ( t = libconfig->setting_get_member(it, "Named")) && libconfig->setting_get_bool(t) )
 				named = true;
-			
+
 			if( ( t = libconfig->setting_get_member(it, "ForceSerial")) && libconfig->setting_get_bool(t) )
 				force_serial = true;
 
@@ -1081,12 +1073,12 @@ void itemdb_read_packages(void) {
 				m++;
 			} else {
 				int gidx = gid - 1;
-				
+
 				r = itemdb->packages[count].random_groups[gidx].random_qty;
-				
+
 				if( prev[gidx] )
 					prev[gidx]->next = &itemdb->packages[count].random_groups[gidx].random_list[r];
-				
+
 				itemdb->packages[count].random_groups[gidx].random_list[r].id = data ? data->nameid : 0;
 				itemdb->packages[count].random_groups[gidx].random_list[r].qty = icount;
 				if( (itemdb->packages[count].random_groups[gidx].random_list[r].rate = rate) == 10000 ) {
@@ -1097,17 +1089,16 @@ void itemdb_read_packages(void) {
 				itemdb->packages[count].random_groups[gidx].random_list[r].named = named == true ? 1 : 0;
 				itemdb->packages[count].random_groups[gidx].random_list[r].force_serial = force_serial == true ? 1 : 0;
 				itemdb->packages[count].random_groups[gidx].random_qty += 1;
-				
+
 				prev[gidx] = &itemdb->packages[count].random_groups[gidx].random_list[r];
 			}
-			
 		}
-		
+
 		for(r = 0; r < highest_gcount; r++) {
 			if( prev[r] )
 				prev[r]->next = &itemdb->packages[count].random_groups[r].random_list[0];
 		}
-		
+
 		for( r = 0; r < itemdb->packages[count].random_qty; r++  ) {
 			if( itemdb->packages[count].random_groups[r].random_qty == 1 ) {
 				//item packages don't stop looping until something comes out of them, so if you have only one item in it the drop is guaranteed.
@@ -1116,11 +1107,9 @@ void itemdb_read_packages(void) {
 				itemdb->packages[count].random_groups[r].random_list[0].rate = 10000;
 			}
 		}
-				
 		count++;
 	}
-	
-	
+
 	aFree(must);
 	aFree(random);
 	for(i = 0; i < libconfig->setting_length(item_packages_conf.root); i++ ) {
@@ -1129,12 +1118,12 @@ void itemdb_read_packages(void) {
 	aFree(rgroups);
 	aFree(rgroup);
 	aFree(prev);
-	
+
 	libconfig->destroy(&item_packages_conf);
 
 	if( HCache->enabled )
 		itemdb->write_cached_packages(config_filename);
-	
+
 	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, config_filename);
 }
 
@@ -1147,7 +1136,7 @@ void itemdb_read_chains(void) {
 	const char *config_filename = "db/pre-re/item_chain.conf"; // FIXME hardcoded name
 #endif
 	int i = 0, count = 0;
-	
+
 	if (libconfig->read_file(&item_chain_conf, config_filename)) {
 		ShowError("can't read %s\n", config_filename);
 		return;
@@ -1155,7 +1144,7 @@ void itemdb_read_chains(void) {
 
 	CREATE(itemdb->chains, struct item_chain, libconfig->setting_length(item_chain_conf.root));
 	itemdb->chain_count = (unsigned short)libconfig->setting_length(item_chain_conf.root);
-	
+
 #ifdef ENABLE_CASE_CHECK
 	script->parser_current_file = config_filename;
 #endif // ENABLE_CASE_CHECK
@@ -1165,12 +1154,12 @@ void itemdb_read_chains(void) {
 		const char *name = config_setting_name(itc);
 		int c = 0;
 		config_setting_t *entry = NULL;
-		
+
 		script->set_constant2(name,i-1,0);
 		itemdb->chains[count].qty = (unsigned short)libconfig->setting_length(itc);
-		
+
 		CREATE(itemdb->chains[count].items, struct item_chain_entry, libconfig->setting_length(itc));
-		
+
 		while( (entry = libconfig->setting_get_elem(itc,c++)) ) {
 			const char *itname = config_setting_name(entry);
 			if( itname[0] == 'I' && itname[1] == 'D' && strlen(itname) < 8 ) {
@@ -1178,32 +1167,32 @@ void itemdb_read_chains(void) {
 					ShowWarning("itemdb_read_chains: unknown item ID '%d' in chain '%s'!\n",atoi(itname+2),name);
 			} else if( !( data = itemdb->name2id(itname) ) )
 				ShowWarning("itemdb_read_chains: unknown item '%s' in chain '%s'!\n",itname,name);
-			
+
 			if( prev )
 				prev->next = &itemdb->chains[count].items[c - 1];
-			
+
 			itemdb->chains[count].items[c - 1].id = data ? data->nameid : 0;
 			itemdb->chains[count].items[c - 1].rate = data ? libconfig->setting_get_int(entry) : 0;
-			
+
 			prev = &itemdb->chains[count].items[c - 1];
 		}
-		
+
 		if( prev )
 			prev->next = &itemdb->chains[count].items[0];
-		
+
 		count++;
 	}
 #ifdef ENABLE_CASE_CHECK
 	script->parser_current_file = NULL;
 #endif // ENABLE_CASE_CHECK
-	
+
 	libconfig->destroy(&item_chain_conf);
-	
+
 	if( !script->get_constant("ITMCHAIN_ORE",&i) )
 		ShowWarning("itemdb_read_chains: failed to find 'ITMCHAIN_ORE' chain to link to cache!\n");
 	else
 		itemdb->chain_cache[ECC_ORE] = i;
-	
+
 	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, config_filename);
 }
 
@@ -1212,21 +1201,19 @@ void itemdb_read_chains(void) {
  **/
 int itemdb_combo_split_atoi (char *str, int *val) {
 	int i;
-	
+
 	for (i=0; i<MAX_ITEMS_PER_COMBO; i++) {
 		if (!str) break;
-		
+
 		val[i] = atoi(str);
-		
 		str = strchr(str,':');
-		
 		if (str)
 			*str++=0;
 	}
-	
+
 	if( i == 0 ) //No data found.
 		return 0;
-	
+
 	return i;
 }
 /**
@@ -1235,41 +1222,38 @@ int itemdb_combo_split_atoi (char *str, int *val) {
 void itemdb_read_combos() {
 	uint32 lines = 0, count = 0;
 	char line[1024];
-	
 	char filepath[256];
 	FILE* fp;
-	
+
 	sprintf(filepath, "%s/%s", map->db_path, DBPATH"item_combo_db.txt");
-	
+
 	if ((fp = fopen(filepath, "r")) == NULL) {
 		ShowError("itemdb_read_combos: File not found \"%s\".\n", filepath);
 		return;
 	}
-	
+
 	// process rows one by one
 	while(fgets(line, sizeof(line), fp)) {
 		char *str[2], *p;
-		
+
 		lines++;
 
 		if (line[0] == '/' && line[1] == '/')
 			continue;
-		
+
 		memset(str, 0, sizeof(str));
-		
+
 		p = line;
-		
 		p = trim(p);
-
 		if (*p == '\0')
 			continue;// empty line
-		
+
 		if (!strchr(p,',')) {
 			/* is there even a single column? */
 			ShowError("itemdb_read_combos: Insufficient columns in line %d of \"%s\", skipping.\n", lines, filepath);
 			continue;
 		}
-		
+
 		str[0] = p;
 		p = strchr(p,',');
 		*p = '\0';
@@ -1278,12 +1262,12 @@ void itemdb_read_combos() {
 		str[1] = p;
 		p = strchr(p,',');
 		p++;
-		
+
 		if (str[1][0] != '{') {
 			ShowError("itemdb_read_combos(#1): Invalid format (Script column) in line %d of \"%s\", skipping.\n", lines, filepath);
 			continue;
 		}
-		
+
 		/* no ending key anywhere (missing \}\) */
 		if ( str[1][strlen(str[1])-1] != '}' ) {
 			ShowError("itemdb_read_combos(#2): Invalid format (Script column) in line %d of \"%s\", skipping.\n", lines, filepath);
@@ -1292,12 +1276,12 @@ void itemdb_read_combos() {
 			int items[MAX_ITEMS_PER_COMBO];
 			int v = 0, retcount = 0;
 			struct item_combo *combo = NULL;
-			
+
 			if((retcount = itemdb->combo_split_atoi(str[0], items)) < 2) {
 				ShowError("itemdb_read_combos: line %d of \"%s\" doesn't have enough items to make for a combo (min:2), skipping.\n", lines, filepath);
 				continue;
 			}
-			
+
 			/* validate */
 			for(v = 0; v < retcount; v++) {
 				if( !itemdb->exists(items[v]) ) {
@@ -1308,11 +1292,11 @@ void itemdb_read_combos() {
 			/* failed at some item */
 			if( v < retcount )
 				continue;
-			
+
 			RECREATE(itemdb->combos, struct item_combo*, ++itemdb->combo_count);
-			
+
 			CREATE(combo, struct item_combo, 1);
-			
+
 			combo->count = retcount;
 			combo->script = script->parse(str[1], filepath, lines, 0, NULL);
 			combo->id = itemdb->combo_count - 1;
@@ -1320,37 +1304,28 @@ void itemdb_read_combos() {
 			for( v = 0; v < retcount; v++ ) {
 				combo->nameid[v] = items[v];
 			}
-			
+
 			itemdb->combos[itemdb->combo_count - 1] = combo;
-			
+
 			/* populate the items to refer to this combo */
 			for( v = 0; v < retcount; v++ ) {
 				struct item_data * it;
 				int index;
-				
+
 				it = itemdb->exists(items[v]);
-				
 				index = it->combos_count;
-				
 				RECREATE(it->combos, struct item_combo*, ++it->combos_count);
-				
 				it->combos[index] = combo;
 			}
-			
 		}
-		
 		count++;
 	}
-	
 	fclose(fp);
-	
 	ShowStatus("Done reading '"CL_WHITE"%"PRIu32""CL_RESET"' entries in '"CL_WHITE"item_combo_db"CL_RESET"'.\n", count);
-		
+
 	return;
 }
 
-
-
 /*======================================
  * Applies gender restrictions according to settings. [Skotlex]
  *======================================*/
@@ -1498,7 +1473,7 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) {
 		entry->flag.available = 1;
 		entry->view_id = 0;
 	}
-	
+
 	entry->sex = itemdb->gendercheck(entry); //Apply gender filtering.
 
 	// Validated. Finally insert it
@@ -1813,7 +1788,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
 
 	if( (t = libconfig->setting_get_member(it, "ForceSerial")) )
 		id.flag.force_serial = libconfig->setting_get_bool(t) ? 1 : 0;
-	
+
 	if ( (t = libconfig->setting_get_member(it, "BuyingStore")) )
 		id.flag.buyingstore = libconfig->setting_get_bool(t) ? 1 : 0;
 
@@ -1926,7 +1901,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
 		id.flag.available = 1;
 		id.view_id = i32;
 	}
-	
+
 	if( libconfig->setting_lookup_string(it, "Script", &str) )
 		id.script = *str ? script->parse(str, source, -id.nameid, SCRIPT_IGNORE_EXTERNAL_BRACKETS, NULL) : NULL;
 
@@ -1970,7 +1945,7 @@ int itemdb_readdb_libconfig(const char *filename) {
 	config_setting_t *itdb, *it;
 	char filepath[256];
 	int i = 0, count = 0;
-	
+
 	sprintf(filepath, "%s/%s", map->db_path, filename);
 	memset(&duplicate,0,sizeof(duplicate));
 	if( libconfig->read_file(&item_db_conf, filepath) || !(itdb = libconfig->setting_get_member(item_db_conf.root, "item_db")) ) {
@@ -1995,7 +1970,7 @@ int itemdb_readdb_libconfig(const char *filename) {
 	}
 	libconfig->destroy(&item_db_conf);
 	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
-		
+
 	return count;
 }
 
@@ -2008,7 +1983,7 @@ int itemdb_readdb_libconfig(const char *filename) {
  */
 int itemdb_readdb_sql(const char *tablename) {
 	int i = 0, count = 0;
-				
+
 	// retrieve all rows from the item database
 	if( SQL_ERROR == SQL->Query(map->mysql_handle, "SELECT `id`, `name_english`, `name_japanese`, `type`,"
 				" `price_buy`, `price_sell`, `weight`, `atk`,"
@@ -2053,7 +2028,7 @@ uint64 itemdb_unique_id(struct map_session_data *sd) {
 void itemdb_read(bool minimal) {
 	int i;
 	DBData prev;
-	
+
 	if (map->db_use_sql_item_db) {
 		const char* item_db_name[] = {
 			map->item_db_db,
@@ -2070,7 +2045,7 @@ void itemdb_read(bool minimal) {
 		for(i = 0; i < ARRAYLENGTH(filename); i++)
 			itemdb->readdb_libconfig(filename[i]);
 	}
-	
+
 	for( i = 0; i < ARRAYLENGTH(itemdb->array); ++i ) {
 		if( itemdb->array[i] ) {
 			if( itemdb->names->put(itemdb->names,DB->str2key(itemdb->array[i]->name),DB->ptr2data(itemdb->array[i]),&prev) ) {
@@ -2079,7 +2054,7 @@ void itemdb_read(bool minimal) {
 			}
 		}
 	}
-	
+
 	if (minimal)
 		return;
 
@@ -2164,7 +2139,7 @@ void itemdb_clear(bool total) {
 		if( itemdb->array[i] )
 			itemdb->destroy_item_data(itemdb->array[i], 1);
 	}
-	
+
 	if( itemdb->groups )
 	{
 		for( i = 0; i < itemdb->group_count; i++ ) {
@@ -2176,7 +2151,7 @@ void itemdb_clear(bool total) {
 
 	itemdb->groups = NULL;
 	itemdb->group_count = 0;
-	
+
 	if (itemdb->chains) {
 		for (i = 0; i < itemdb->chain_count; i++) {
 			if (itemdb->chains[i].items)
@@ -2187,7 +2162,7 @@ void itemdb_clear(bool total) {
 
 	itemdb->chains = NULL;
 	itemdb->chain_count = 0;
-	
+
 	if (itemdb->packages) {
 		for (i = 0; i < itemdb->package_count; i++) {
 			if (itemdb->packages[i].random_groups) {
@@ -2203,7 +2178,7 @@ void itemdb_clear(bool total) {
 		itemdb->packages = NULL;
 	}
 	itemdb->package_count = 0;
-	
+
 	if (itemdb->combos) {
 		for (i = 0; i < itemdb->combo_count; i++) {
 			if (itemdb->combos[i]->script) // Check if script was loaded
@@ -2215,28 +2190,28 @@ void itemdb_clear(bool total) {
 
 	itemdb->combos = NULL;
 	itemdb->combo_count = 0;
-	
+
 	if (total)
 		return;
-	
+
 	itemdb->other->clear(itemdb->other, itemdb->final_sub);
-	
+
 	memset(itemdb->array, 0, sizeof(itemdb->array));
-	
-	db_clear(itemdb->names);
 
+	db_clear(itemdb->names);
 }
+
 void itemdb_reload(void) {
 	struct s_mapiterator* iter;
 	struct map_session_data* sd;
 
 	int i,d,k;
-	
+
 	itemdb->clear(false);
 
 	// read new data
 	itemdb->read(false);
-	
+
 	//Epoque's awesome @reloaditemdb fix - thanks! [Ind]
 	//- Fixes the need of a @reloadmobdb after a @reloaditemdb to re-link monster drop data
 	for( i = 0; i < MAX_MOB_DB; i++ ) {
@@ -2257,7 +2232,7 @@ void itemdb_reload(void) {
 
 			if (k == MAX_SEARCH)
 				continue;
-			
+
 			if (id->mob[k].id != i && k != MAX_SEARCH - 1)
 				memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
 			id->mob[k].chance = entry->dropitem[d].p;
@@ -2287,7 +2262,7 @@ void itemdb_reload(void) {
 void itemdb_name_constants(void) {
 	DBIterator *iter = db_iterator(itemdb->names);
 	struct item_data *data;
-	
+
 #ifdef ENABLE_CASE_CHECK
 	script->parser_current_file = "Item Database (Likely an invalid or conflicting AegisName)";
 #endif // ENABLE_CASE_CHECK
@@ -2301,7 +2276,7 @@ void itemdb_name_constants(void) {
 }
 void do_final_itemdb(void) {
 	itemdb->clear(true);
-	
+
 	itemdb->other->destroy(itemdb->other, itemdb->final_sub);
 	itemdb->destroy_item_data(&itemdb->dummy, 0);
 	db_destroy(itemdb->names);
@@ -2318,14 +2293,14 @@ void do_init_itemdb(bool minimal) {
 		return;
 
 	clif->cashshop_load();
-	
+
 	/** it failed? we disable it **/
 	if( !clif->parse_roulette_db() )
 		battle_config.feature_roulette = 0;
 }
 void itemdb_defaults(void) {
 	itemdb = &itemdb_s;
-	
+
 	itemdb->init = do_init_itemdb;
 	itemdb->final = do_final_itemdb;
 	itemdb->reload = itemdb_reload;
diff --git a/src/map/log.c b/src/map/log.c
index 0c5977c05..a74cb27c5 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -54,7 +54,6 @@ char log_picktype2char(e_log_pick_type type) {
 	return 'X';
 }
 
-
 /// obtain log type character for chat logs
 char log_chattype2char(e_log_chat_type type) {
 	switch( type ) {
@@ -70,7 +69,6 @@ char log_chattype2char(e_log_chat_type type) {
 	return 'O';
 }
 
-
 /// check if this item should be logged according the settings
 bool should_log_item(int nameid, int amount, int refine, struct item_data *id) {
 	int filter = logs->config.filter;
@@ -112,7 +110,7 @@ void log_branch_sub_txt(struct map_session_data* sd) {
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_branch, "a") ) == NULL )
 		return;
 	time(&curtime);
@@ -145,7 +143,7 @@ void log_pick_sub_txt(int id, int16 m, e_log_pick_type type, int amount, struct
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_pick, "a") ) == NULL )
 		return;
 	time(&curtime);
@@ -174,7 +172,6 @@ void log_pick_pc(struct map_session_data* sd, e_log_pick_type type, int amount,
 	log_pick(sd->status.char_id, sd->bl.m, type, amount, itm, data ? data : itemdb->exists(itm->nameid));
 }
 
-
 /// logs item transactions (monsters)
 void log_pick_mob(struct mob_data* md, e_log_pick_type type, int amount, struct item* itm, struct item_data *data) {
 	nullpo_retv(md);
@@ -192,7 +189,7 @@ void log_zeny_sub_txt(struct map_session_data* sd, e_log_pick_type type, struct
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_zeny, "a") ) == NULL )
 		return;
 	time(&curtime);
@@ -222,7 +219,7 @@ void log_mvpdrop_sub_txt(struct map_session_data* sd, int monster_id, int* log_m
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_mvpdrop,"a") ) == NULL )
 		return;
 	time(&curtime);
@@ -243,7 +240,7 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp)
 
 void log_atcommand_sub_sql(struct map_session_data* sd, const char* message) {
 	SqlStmt* stmt;
-	
+
 	stmt = SQL->StmtMalloc(logs->mysql_handle);
 	if( SQL_SUCCESS != SQL->StmtPrepare(stmt, LOG_QUERY " INTO `%s` (`atcommand_date`, `account_id`, `char_id`, `char_name`, `map`, `command`) VALUES (NOW(), '%d', '%d', ?, '%s', ?)", logs->config.log_gm, sd->status.account_id, sd->status.char_id, mapindex_id2name(sd->mapindex) )
 	   ||  SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, sd->status.name, strnlen(sd->status.name, NAME_LENGTH))
@@ -260,7 +257,7 @@ void log_atcommand_sub_txt(struct map_session_data* sd, const char* message) {
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_gm, "a") ) == NULL )
 		return;
 	time(&curtime);
@@ -298,7 +295,7 @@ void log_npc_sub_txt(struct map_session_data *sd, const char *message) {
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_npc, "a") ) == NULL )
 		return;
 	time(&curtime);
@@ -319,7 +316,7 @@ void log_npc(struct map_session_data* sd, const char* message)
 
 void log_chat_sub_sql(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char* dst_charname, const char* message) {
 	SqlStmt* stmt;
-	
+
 	stmt = SQL->StmtMalloc(logs->mysql_handle);
 	if( SQL_SUCCESS != SQL->StmtPrepare(stmt, LOG_QUERY " INTO `%s` (`time`, `type`, `type_id`, `src_charid`, `src_accountid`, `src_map`, `src_map_x`, `src_map_y`, `dst_charname`, `message`) VALUES (NOW(), '%c', '%d', '%d', '%d', '%s', '%d', '%d', ?, ?)", logs->config.log_chat, logs->chattype2char(type), type_id, src_charid, src_accid, mapname, x, y)
 	 || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, (char*)dst_charname, safestrnlen(dst_charname, NAME_LENGTH))
@@ -336,7 +333,7 @@ void log_chat_sub_txt(e_log_chat_type type, int type_id, int src_charid, int src
 	char timestring[255];
 	time_t curtime;
 	FILE* logfp;
-	
+
 	if( ( logfp = fopen(logs->config.log_chat, "a") ) == NULL )
 		return;
 	time(&curtime);
@@ -363,12 +360,12 @@ void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid,
 void log_sql_init(void) {
 	// log db connection
 	logs->mysql_handle = SQL->Malloc();
-	
+
 	ShowInfo(""CL_WHITE"[SQL]"CL_RESET": Connecting to the Log Database "CL_WHITE"%s"CL_RESET" At "CL_WHITE"%s"CL_RESET"...\n",logs->db_name,logs->db_ip);
 	if ( SQL_ERROR == SQL->Connect(logs->mysql_handle, logs->db_id, logs->db_pw, logs->db_ip, logs->db_port, logs->db_name) )
 		exit(EXIT_FAILURE);
 	ShowStatus(""CL_WHITE"[SQL]"CL_RESET": Successfully '"CL_GREEN"connected"CL_RESET"' to Database '"CL_WHITE"%s"CL_RESET"'.\n", logs->db_name);
-	
+
 	if (map->default_codepage[0] != '\0')
 		if ( SQL_ERROR == SQL->SetEncoding(logs->mysql_handle, map->default_codepage) )
 			Sql_ShowDebug(logs->mysql_handle);
@@ -389,7 +386,6 @@ void log_set_defaults(void) {
 	logs->config.amount_items_log = 100;
 }
 
-
 int log_config_read(const char* cfgName) {
 	static int count = 0;
 	char line[1024], w1[1024], w2[1024];
@@ -506,7 +502,7 @@ void log_config_complete(void) {
 }
 void log_defaults(void) {
 	logs = &log_s;
-	
+
 	sprintf(logs->db_ip,"127.0.0.1");
 	sprintf(logs->db_id,"ragnarok");
 	sprintf(logs->db_pw,"ragnarok");
@@ -515,7 +511,7 @@ void log_defaults(void) {
 	logs->db_port = 3306;
 	logs->mysql_handle = NULL;
 	/* */
-	
+
 	logs->pick_pc = log_pick_pc;
 	logs->pick_mob = log_pick_mob;
 	logs->zeny = log_zeny;
@@ -524,7 +520,7 @@ void log_defaults(void) {
 	logs->atcommand = log_atcommand;
 	logs->branch = log_branch;
 	logs->mvpdrop = log_mvpdrop;
-	
+
 	/* will be modified in a few seconds once loading is complete. */
 	logs->pick_sub = log_pick_sub_txt;
 	logs->zeny_sub = log_zeny_sub_txt;
diff --git a/src/map/mail.c b/src/map/mail.c
index 8acfbdcb9..e952d9b63 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -195,7 +195,7 @@ bool mail_invalid_operation(struct map_session_data *sd) {
 void mail_defaults(void)
 {
 	mail = &mail_s;
-	
+
 	mail->clear = mail_clear;
 	mail->removeitem = mail_removeitem;
 	mail->removezeny = mail_removezeny;
diff --git a/src/map/map.c b/src/map/map.c
index 249108878..fe0922063 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -111,7 +111,7 @@ int map_usercount(void) {
  *------------------------------------------*/
 int map_freeblock (struct block_list *bl) {
 	nullpo_retr(map->block_free_lock, bl);
-		
+
 	if (map->block_free_lock == 0) {
 		if( bl->type == BL_ITEM )
 			ers_free(map->flooritem_ers, bl);
@@ -119,10 +119,9 @@ int map_freeblock (struct block_list *bl) {
 			aFree(bl);
 		bl = NULL;
 	} else {
-		
 		if( map->block_free_count >= map->block_free_list_size )
 			map_block_free_expand();
-		
+
 		map->block_free[map->block_free_count++] = bl;
 	}
 
@@ -139,7 +138,6 @@ int map_freeblock_lock (void) {
  * Remove the lock on map_bl
  *------------------------------------------*/
 int map_freeblock_unlock (void) {
-	
 	if ((--map->block_free_lock) == 0) {
 		int i;
 		for (i = 0; i < map->block_free_count; i++) {
@@ -375,8 +373,6 @@ int map_moveblock(struct block_list *bl, int x1, int y1, int64 tick) {
 				) {
 					sc->data[SC_PROPERTYWALK]->val3++;
 				}
-
-
 			}
 			/* Guild Aura Moving */
 			if( bl->type == BL_PC && ((TBL_PC*)bl)->state.gmaster_flag ) {
@@ -1366,7 +1362,6 @@ int map_clearflooritem_timer(int tid, int64 tick, int id, intptr_t data) {
 		return 1;
 	}
 
-
 	if (pet->search_petDB_index(fitem->item_data.nameid, PET_EGG) >= 0)
 		intif->delete_petdata(MakeDWord(fitem->item_data.card[1], fitem->item_data.card[2]));
 
@@ -1424,7 +1419,6 @@ int map_searchrandfreecell(int16 m, const struct block_list *bl, int16 *x, int16
 	return 1;
 }
 
-
 int map_count_sub(struct block_list *bl,va_list ap) {
 	return 1;
 }
@@ -1603,7 +1597,7 @@ int map_addflooritem(const struct block_list *bl, struct item *item_data, int am
 	r=rnd();
 
 	fitem = ers_alloc(map->flooritem_ers, struct flooritem_data);
-	
+
 	fitem->bl.type = BL_ITEM;
 	fitem->bl.prev = fitem->bl.next = NULL;
 	fitem->bl.m = m;
@@ -1789,7 +1783,7 @@ int map_quit(struct map_session_data *sd) {
 		//Non-active players should not have loaded any data yet (or it was cleared already) so no additional cleanups are needed.
 		return 0;
 	}
-	
+
 	if( sd->expiration_tid != INVALID_TIMER )
 		timer->delete(sd->expiration_tid,pc->expiration_timer);
 
@@ -1882,7 +1876,7 @@ int map_quit(struct map_session_data *sd) {
 	if( sd->state.vending ) {
 		idb_remove(vending->db, sd->status.char_id);
 	}
-	
+
 	party->booking_delete(sd); // Party Booking [Spiria]
 	pc->makesavestatus(sd);
 	pc->clean_skilltree(sd);
@@ -2663,14 +2657,11 @@ int map_getcellp(struct map_data* m, const struct block_list *bl, int16 x, int16
 		// base gat type checks
 	case CELL_CHKWALL:
 		return (!cell.walkable && !cell.shootable);
-
 	case CELL_CHKWATER:
 		return (cell.water);
-
 	case CELL_CHKCLIFF:
 		return (!cell.walkable && cell.shootable);
 
-
 		// base cell type checks
 	case CELL_CHKNPC:
 		return (cell.npc);
@@ -3045,7 +3036,6 @@ int map_readfromcache(struct map_data *m, char *buffer) {
 	return 0; // Not found
 }
 
-
 int map_addmap(const char* mapname) {
 	map->list[map->count].instance_id = -1;
 	mapindex->getmapname(mapname, map->list[map->count++].name);
@@ -3082,38 +3072,38 @@ int map_delmap(char* mapname) {
  **/
 void map_zone_clear_single(struct map_zone_data *zone) {
 	int i;
-	
+
 	for(i = 0; i < zone->disabled_skills_count; i++) {
 		aFree(zone->disabled_skills[i]);
 	}
-	
+
 	if( zone->disabled_skills )
 		aFree(zone->disabled_skills);
-	
+
 	if( zone->disabled_items )
 		aFree(zone->disabled_items);
-	
+
 	if( zone->cant_disable_items )
 		aFree(zone->cant_disable_items);
-	
+
 	for(i = 0; i < zone->mapflags_count; i++) {
 		aFree(zone->mapflags[i]);
 	}
-	
+
 	if( zone->mapflags )
 		aFree(zone->mapflags);
-	
+
 	for(i = 0; i < zone->disabled_commands_count; i++) {
 		aFree(zone->disabled_commands[i]);
 	}
-	
+
 	if( zone->disabled_commands )
 		aFree(zone->disabled_commands);
-	
+
 	for(i = 0; i < zone->capped_skills_count; i++) {
 		aFree(zone->capped_skills[i]);
 	}
-	
+
 	if( zone->capped_skills )
 		aFree(zone->capped_skills);
 }
@@ -3123,11 +3113,11 @@ void map_zone_clear_single(struct map_zone_data *zone) {
 void map_zone_db_clear(void) {
 	struct map_zone_data *zone;
 	DBIterator *iter = db_iterator(map->zone_db);
-	
+
 	for(zone = dbi_first(iter); dbi_exists(iter); zone = dbi_next(iter)) {
 		map->zone_clear_single(zone);
 	}
-	
+
 	dbi_destroy(iter);
 
 	db_destroy(map->zone_db);/* will aFree(zone) */
@@ -3245,10 +3235,10 @@ void do_final_maps(void) {
 
 		if( map->list[i].channel )
 			channel->delete(map->list[i].channel);
-		
+
 		if( map->list[i].qi_data )
 			aFree(map->list[i].qi_data);
-		
+
 		if( map->list[i].hdata )
 		{
 			for( v = 0; v < map->list[i].hdatac; v++ ) {
@@ -3324,10 +3314,10 @@ void map_flags_init(void) {
 		map->list[i].misc_damage_rate   = 100;
 		map->list[i].short_damage_rate  = 100;
 		map->list[i].long_damage_rate   = 100;
-		
+
 		if( map->list[i].qi_data )
 			aFree(map->list[i].qi_data);
-		
+
 		map->list[i].qi_data = NULL;
 		map->list[i].qi_count = 0;
 	}
@@ -3718,7 +3708,7 @@ int inter_config_read(char *cfgName) {
 	while (fgets(line, sizeof(line), fp)) {
 		if (line[0] == '/' && line[1] == '/')
 			continue;
-		
+
 		if (sscanf(line,"%1023[^:]: %1023[^\r\n]", w1, w2) < 2)
 			continue;
 		/* table names */
@@ -3856,34 +3846,31 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone
 	char newzone[MAP_ZONE_NAME_LENGTH];
 	struct map_zone_data *zone = NULL;
 	int cursor, i, j;
-	
+
 	sprintf(newzone, "%s+%s",main->name,other->name);
-	
+
 	if( (zone = strdb_get(map->zone_db, newzone)) )
 		return zone;/* this zone has already been merged */
-	
+
 	CREATE(zone, struct map_zone_data, 1);
-	
 	safestrncpy(zone->name, newzone, MAP_ZONE_NAME_LENGTH);
-	
 	zone->disabled_skills_count = main->disabled_skills_count + other->disabled_skills_count;
 	zone->disabled_items_count = main->disabled_items_count + other->disabled_items_count;
 	zone->mapflags_count = main->mapflags_count + other->mapflags_count;
 	zone->disabled_commands_count = main->disabled_commands_count + other->disabled_commands_count;
 	zone->capped_skills_count = main->capped_skills_count + other->capped_skills_count;
-	
+
 	CREATE(zone->disabled_skills, struct map_zone_disabled_skill_entry *, zone->disabled_skills_count );
-	
 	for(i = 0, cursor = 0; i < main->disabled_skills_count; i++, cursor++ ) {
 		CREATE(zone->disabled_skills[cursor], struct map_zone_disabled_skill_entry, 1 );
 		memcpy(zone->disabled_skills[cursor], main->disabled_skills[i], sizeof(struct map_zone_disabled_skill_entry));
 	}
-	
+
 	for(i = 0; i < other->disabled_skills_count; i++, cursor++ ) {
 		CREATE(zone->disabled_skills[cursor], struct map_zone_disabled_skill_entry, 1 );
 		memcpy(zone->disabled_skills[cursor], other->disabled_skills[i], sizeof(struct map_zone_disabled_skill_entry));
 	}
-	
+
 	for(j = 0; j < main->cant_disable_items_count; j++) {
 		for(i = 0; i < other->disabled_items_count; i++) {
 			if( other->disabled_items[i] == main->cant_disable_items[j] ) {
@@ -3894,11 +3881,10 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone
 	}
 
 	CREATE(zone->disabled_items, int, zone->disabled_items_count );
-	
 	for(i = 0, cursor = 0; i < main->disabled_items_count; i++, cursor++ ) {
 		zone->disabled_items[cursor] = main->disabled_items[i];
 	}
-	
+
 	for(i = 0; i < other->disabled_items_count; i++) {
 		for(j = 0; j < main->cant_disable_items_count; j++) {
 			if( other->disabled_items[i] == main->cant_disable_items[j] ) {
@@ -3912,45 +3898,40 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone
 	}
 
 	CREATE(zone->mapflags, char *, zone->mapflags_count );
-	
 	for(i = 0, cursor = 0; i < main->mapflags_count; i++, cursor++ ) {
 		CREATE(zone->mapflags[cursor], char, MAP_ZONE_MAPFLAG_LENGTH );
 		safestrncpy(zone->mapflags[cursor], main->mapflags[i], MAP_ZONE_MAPFLAG_LENGTH);
 	}
-	
+
 	for(i = 0; i < other->mapflags_count; i++, cursor++ ) {
 		CREATE(zone->mapflags[cursor], char, MAP_ZONE_MAPFLAG_LENGTH );
 		safestrncpy(zone->mapflags[cursor], other->mapflags[i], MAP_ZONE_MAPFLAG_LENGTH);
 	}
-	
+
 	CREATE(zone->disabled_commands, struct map_zone_disabled_command_entry *, zone->disabled_commands_count);
-	
 	for(i = 0, cursor = 0; i < main->disabled_commands_count; i++, cursor++ ) {
 		CREATE(zone->disabled_commands[cursor], struct map_zone_disabled_command_entry, 1);
 		memcpy(zone->disabled_commands[cursor], main->disabled_commands[i], sizeof(struct map_zone_disabled_command_entry));
 	}
-	
+
 	for(i = 0; i < other->disabled_commands_count; i++, cursor++ ) {
 		CREATE(zone->disabled_commands[cursor], struct map_zone_disabled_command_entry, 1);
 		memcpy(zone->disabled_commands[cursor], other->disabled_commands[i], sizeof(struct map_zone_disabled_command_entry));
 	}
-	
+
 	CREATE(zone->capped_skills, struct map_zone_skill_damage_cap_entry *, zone->capped_skills_count);
-	
 	for(i = 0, cursor = 0; i < main->capped_skills_count; i++, cursor++ ) {
 		CREATE(zone->capped_skills[cursor], struct map_zone_skill_damage_cap_entry, 1);
 		memcpy(zone->capped_skills[cursor], main->capped_skills[i], sizeof(struct map_zone_skill_damage_cap_entry));
 	}
-	
+
 	for(i = 0; i < other->capped_skills_count; i++, cursor++ ) {
 		CREATE(zone->capped_skills[cursor], struct map_zone_skill_damage_cap_entry, 1);
 		memcpy(zone->capped_skills[cursor], other->capped_skills[i], sizeof(struct map_zone_skill_damage_cap_entry));
 	}
-	
+
 	zone->info.special = 2;
-	
 	strdb_put(map->zone_db, newzone, zone);
-	
 	return zone;
 }
 
@@ -3959,17 +3940,17 @@ void map_zone_change2(int m, struct map_zone_data *zone) {
 
 	if( map->list[m].zone == zone )
 		return;
-	
+
 	if( map->list[m].zone->info.special != 2 ) /* we don't update it for merged zones! */
 		map->list[m].prev_zone = map->list[m].zone;
-	
+
 	if( map->list[m].zone_mf_count )
 		map->zone_remove(m);
 
 	if( zone->info.special ) {
 		zone = map->merge_zone(zone,map->list[m].prev_zone);
 	}
-	
+
 	map->zone_apply(m,zone,empty,empty,empty);
 }
 /* when changing from a mapflag to another during runtime */
@@ -4988,7 +4969,6 @@ void read_map_zone_db(void) {
 				if( (libconfig->setting_length(items) - disabled_items_count) > 0 ) { //Some are forcefully enabled
 					zone->cant_disable_items_count = libconfig->setting_length(items) - disabled_items_count;
 					CREATE(zone->cant_disable_items, int, zone->cant_disable_items_count);
-					
 				}
 				for(h = 0, v = 0, j = 0; h < libconfig->setting_length(items); h++) {
 					config_setting_t *item = libconfig->setting_get_elem(items, h);
@@ -5274,7 +5254,7 @@ void read_map_zone_db(void) {
 		}
 
 		ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' zones in '"CL_WHITE"%s"CL_RESET"'.\n", zone_count, config_filename);
-		
+
 		/* post-load processing */
 		if( (zone = strdb_get(map->zone_db, MAP_ZONE_PVP_NAME)) )
 			zone->info.special = 1;
@@ -5293,22 +5273,22 @@ int map_get_new_bonus_id (void) {
 
 void map_add_questinfo(int m, struct questinfo *qi) {
 	unsigned short i;
-	
+
 	/* duplicate, override */
 	for(i = 0; i < map->list[m].qi_count; i++) {
 		if( map->list[m].qi_data[i].nd == qi->nd )
 			break;
 	}
-		
+
 	if( i == map->list[m].qi_count )
 		RECREATE(map->list[m].qi_data, struct questinfo, ++map->list[m].qi_count);
-	
+
 	memcpy(&map->list[m].qi_data[i], qi, sizeof(struct questinfo));
 }
 
 bool map_remove_questinfo(int m, struct npc_data *nd) {
 	unsigned short i;
-	
+
 	for(i = 0; i < map->list[m].qi_count; i++) {
 		struct questinfo *qi = &map->list[m].qi_data[i];
 		if( qi->nd == nd ) {
@@ -5319,7 +5299,6 @@ bool map_remove_questinfo(int m, struct npc_data *nd) {
 			return true;
 		}
 	}
-	
 	return false;
 }
 
@@ -5398,10 +5377,10 @@ int do_final(void) {
 	struct s_mapiterator* iter;
 
 	ShowStatus("Terminating...\n");
-	
+
 	channel->config->closing = true;
 	HPM->event(HPET_FINAL);
-	
+
 	if (map->cpsd) aFree(map->cpsd);
 
 	//Ladies and babies first.
@@ -5462,7 +5441,7 @@ int do_final(void) {
 	vending->final();
 
 	HPM_map_do_final();
-	
+
 	map->map_db->destroy(map->map_db, map->db_final);
 
 	mapindex->final();
@@ -5488,8 +5467,7 @@ int do_final(void) {
 		aFree(map->block_free);
 	if( map->bl_list )
 		aFree(map->bl_list);
-	
-	
+
 	if( !map->enable_grf )
 		aFree(map->cache_buffer);
 
@@ -5501,7 +5479,7 @@ int do_final(void) {
 	aFree(map->GRF_PATH_FILENAME);
 	aFree(map->INTER_CONF_NAME);
 	aFree(map->LOG_CONF_NAME);
-	
+
 	HPM->event(HPET_POST_FINAL);
 
 	ShowStatus("Finished.\n");
@@ -5513,7 +5491,6 @@ int map_abort_sub(struct map_session_data* sd, va_list ap) {
 	return 1;
 }
 
-
 //------------------------------
 // Function called when the server
 // has received a crash signal.
@@ -5542,7 +5519,6 @@ void set_server_type(void) {
 	SERVER_TYPE = SERVER_TYPE_MAP;
 }
 
-
 /// Called when a terminate signal is received.
 void do_shutdown(void)
 {
@@ -5594,12 +5570,12 @@ CPCMD(gm_use) {
 	}
 
 	map->cpsd_active = true;
-	
+
 	if( !atcommand->exec(map->cpsd->fd, map->cpsd, line, false) )
 		ShowInfo("HCP: '"CL_WHITE"%s"CL_RESET"' failed\n",line);
 	else
 		ShowInfo("HCP: '"CL_WHITE"%s"CL_RESET"' was used\n",line);
-	
+
 	map->cpsd_active = false;
 }
 /* Hercules Console Parser */
@@ -5803,11 +5779,10 @@ static CMDLINEARG(loadscript)
  **/
 static CMDLINEARG(generatetranslations) {
 	script->lang_export_file = aStrdup("./generated_translations.pot");
-	
+
 	if( !(script->lang_export_fp = fopen(script->lang_export_file,"wb")) ) {
 		ShowError("export-dialog: failed to open '%s' for writing\n",script->lang_export_file);
 	}
-	
 	core->runflag = CORE_ST_STOP;
 	return true;
 }
@@ -5839,7 +5814,7 @@ int do_init(int argc, char *argv[])
 #ifdef GCOLLECT
 	GC_enable_incremental();
 #endif
-	
+
 	map_load_defaults();
 
 	map->INTER_CONF_NAME         = aStrdup("conf/inter-server.conf");
@@ -5854,9 +5829,9 @@ int do_init(int argc, char *argv[])
 	HPM_map_do_init();
 	cmdline->exec(argc, argv, CMDLINE_OPT_PREINIT);
 	HPM->config_read();
-	
+
 	HPM->event(HPET_PRE_INIT);
-	
+
 	cmdline->exec(argc, argv, CMDLINE_OPT_NORMAL);
 	minimal = map->minimal;/* temp (perhaps make minimal a mask with options of what to load? e.g. plugin 1 does minimal |= mob_db; */
 	if (!minimal) {
@@ -5937,7 +5912,6 @@ int do_init(int argc, char *argv[])
 
 	map->readallmaps();
 
-
 	if (!minimal) {
 		timer->add_func_list(map->freeblock_timer, "map_freeblock_timer");
 		timer->add_func_list(map->clearflooritem_timer, "map_clearflooritem_timer");
@@ -5991,19 +5965,19 @@ int do_init(int argc, char *argv[])
 		HPM->event(HPET_READY);
 		exit(EXIT_SUCCESS);
 	}
-	
+
 	npc->event_do_oninit( false ); // Init npcs (OnInit)
 	npc->market_fromsql(); /* after OnInit */
-	
+
 	if (battle_config.pk_mode)
 		ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n");
 
 	Sql_HerculesUpdateCheck(map->mysql_handle);
-	
+
 #ifdef CONSOLE_INPUT
 	console->input->setSQL(map->mysql_handle);
 #endif
-	
+
 	ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map->port);
 
 	if( core->runflag != CORE_ST_STOP ) {
@@ -6034,14 +6008,14 @@ void map_defaults(void) {
 
 	map->extra_scripts = NULL;
 	map->extra_scripts_count = 0;
-	
+
 	sprintf(map->db_path ,"db");
 	sprintf(map->help_txt ,"conf/help.txt");
 	sprintf(map->help2_txt ,"conf/help2.txt");
 	sprintf(map->charhelp_txt ,"conf/charhelp.txt");
-	
+
 	sprintf(map->wisp_server_name ,"Server"); // can be modified in char-server configuration file
-	
+
 	map->autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
 	map->minsave_interval = 100;
 	map->save_settings = 0xFFFF;
@@ -6049,18 +6023,18 @@ void map_defaults(void) {
 	map->agit2_flag = 0;
 	map->night_flag = 0; // 0=day, 1=night [Yor]
 	map->enable_spy = 0; //To enable/disable @spy commands, which consume too much cpu time when sending packets. [Skotlex]
-	
+
 	map->db_use_sql_item_db = 0;
 	map->db_use_sql_mob_db = 0;
 	map->db_use_sql_mob_skill_db = 0;
-	
+
 	sprintf(map->item_db_db, "item_db");
 	sprintf(map->item_db2_db, "item_db2");
 	sprintf(map->mob_db_db, "mob_db");
 	sprintf(map->mob_db2_db, "mob_db2");
 	sprintf(map->mob_skill_db_db, "mob_skill_db");
 	sprintf(map->mob_skill_db2_db, "mob_skill_db2");
-	
+
 	map->INTER_CONF_NAME="conf/inter-server.conf";
 	map->LOG_CONF_NAME="conf/logs.conf";
 	map->MAP_CONF_NAME = "conf/map-server.conf";
@@ -6069,7 +6043,7 @@ void map_defaults(void) {
 	map->SCRIPT_CONF_NAME = "conf/script.conf";
 	map->MSG_CONF_NAME = "conf/messages.conf";
 	map->GRF_PATH_FILENAME = "conf/grf-files.txt";
-	
+
 	map->default_codepage[0] = '\0';
 	map->server_port = 3306;
 	sprintf(map->server_ip,"127.0.0.1");
@@ -6080,15 +6054,15 @@ void map_defaults(void) {
 	map->default_lang_str[0] = '\0';
 
 	map->cpsd_active = false;
-	
+
 	map->port = 0;
 	map->users = 0;
 	map->ip_set = 0;
 	map->char_ip_set = 0;
 	map->enable_grf = 0;
-	
+
 	memset(&map->index2mapid, -1, sizeof(map->index2mapid));
-	
+
 	map->id_db = NULL;
 	map->pc_db = NULL;
 	map->mobid_db = NULL;
@@ -6107,16 +6081,16 @@ void map_defaults(void) {
 	map->bl_list = NULL;
 	map->bl_list_count = 0;
 	map->bl_list_size = 0;
-	
+
 	//all in a big chunk, respects order
 	memset(ZEROED_BLOCK_POS(map), 0, ZEROED_BLOCK_SIZE(map));
-	
+
 	map->cpsd = NULL;
 	map->list = NULL;
-	
+
 	map->iterator_ers = NULL;
 	map->cache_buffer = NULL;
-	
+
 	map->flooritem_ers = NULL;
 	/* */
 	map->bonus_id = SP_LAST_KNOWN;
@@ -6283,19 +6257,17 @@ void map_defaults(void) {
 	map->abort_sub = map_abort_sub;
 
 	map->update_cell_bl = map_update_cell_bl;
-	
 	map->get_new_bonus_id = map_get_new_bonus_id;
-	
+
 	map->add_questinfo = map_add_questinfo;
 	map->remove_questinfo = map_remove_questinfo;
-	
+
 	map->merge_zone = map_merge_zone;
 	map->zone_clear_single = map_zone_clear_single;
-		
+
 	/**
 	 * mapit interface
 	 **/
-	
 	mapit = &mapit_s;
 
 	mapit->alloc = mapit_alloc;
@@ -6305,5 +6277,4 @@ void map_defaults(void) {
 	mapit->next = mapit_next;
 	mapit->prev = mapit_prev;
 	mapit->exists = mapit_exists;
-	
 }
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index ff37f396d..b26876d39 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -471,7 +471,7 @@ bool read_mercenary_skilldb_sub(char* str[], int columns, int current)
 		ShowError("read_mercenary_skilldb : Class %d not found in mercenary_db for skill entry.\n", class_);
 		return false;
 	}
-	
+
 	skill_id = atoi(str[1]);
 	if( skill_id < MC_SKILLBASE || skill_id >= MC_SKILLBASE + MAX_MERCSKILL )
 	{
@@ -501,7 +501,7 @@ void do_init_mercenary(bool minimal) {
 
 	mercenary->read_db();
 	mercenary->read_skilldb();
-	
+
 	timer->add_func_list(mercenary->contract_end_timer, "merc_contract_end_timer");
 }
 
@@ -518,22 +518,21 @@ void mercenary_defaults(void) {
 	memset(mercenary->db, 0, sizeof(struct s_mercenary_db) * MAX_MERCENARY_CLASS);
 
 	/* funcs */
-	
 	mercenary->init = do_init_mercenary;
-	
+
 	mercenary->class = merc_class;
 	mercenary->get_viewdata = merc_get_viewdata;
-	
+
 	mercenary->create = merc_create;
 	mercenary->data_received = merc_data_received;
 	mercenary->save = mercenary_save;
-	
+
 	mercenary->heal = mercenary_heal;
 	mercenary->dead = mercenary_dead;
-	
+
 	mercenary->delete = merc_delete;
 	mercenary->contract_stop = merc_contract_stop;
-	
+
 	mercenary->get_lifetime = mercenary_get_lifetime;
 	mercenary->get_guild = mercenary_get_guild;
 	mercenary->get_faith = mercenary_get_faith;
@@ -541,14 +540,14 @@ void mercenary_defaults(void) {
 	mercenary->get_calls = mercenary_get_calls;
 	mercenary->set_calls = mercenary_set_calls;
 	mercenary->kills = mercenary_kills;
-	
+
 	mercenary->checkskill = mercenary_checkskill;
 	mercenary->read_db = read_mercenarydb;
 	mercenary->read_skilldb = read_mercenary_skilldb;
-	
+
 	mercenary->killbonus = mercenary_killbonus;
 	mercenary->search_index = merc_search_index;
-	
+
 	mercenary->contract_end_timer = merc_contract_end_timer;
 	mercenary->read_db_sub = read_mercenarydb_sub;
 	mercenary->read_skill_db_sub = read_mercenary_skilldb_sub;
diff --git a/src/map/mob.c b/src/map/mob.c
index b1f6e8c61..2fe9fe8fb 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -291,7 +291,7 @@ struct mob_data* mob_spawn_dataset(struct spawn_data *data) {
 	status->set_viewdata(&md->bl, md->class_);
 	status->change_init(&md->bl);
 	unit->dataset(&md->bl);
-	
+
 	map->addiddb(&md->bl);
 	return md;
 }
@@ -468,7 +468,7 @@ int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const
 	struct mob_data* md = NULL;
 	int count, lv;
 	bool no_guardian_data = false;
-	
+
 	if( ai && ai&0x200 ) {
 		no_guardian_data = true;
 		ai &=~ 0x200;
@@ -2371,7 +2371,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 				if( drop_rate < 1 )
 					drop_rate = 1;
 			}
-			
+
 			// attempt to drop the item
 			if (rnd() % 10000 >= drop_rate)
 					continue;
@@ -2390,14 +2390,14 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 				//MSG: "'%s' won %s's %s (chance: %0.02f%%)"
 				intif->broadcast(message, strlen(message)+1, BC_DEFAULT);
 			}
-			
+
 			/* heres the thing we got the feature set up however we're still discussing how to best define the ids,
 			 * so while we discuss, for a small period of time, the list is hardcoded (yes officially only those 2 use it,
 			 * thus why we're unsure on how to best place the setting) */
 			/* temp, will not be hardcoded for long thudu. */
 			if( it->nameid == 7782 || it->nameid == 7783 ) /* for when not hardcoded: add a check on mvp bonus drop as well */
 				clif->item_drop_announce(mvp_sd, it->nameid, md->name);
-			
+
 			// Announce first, or else ditem will be freed. [Lance]
 			// By popular demand, use base drop rate for autoloot code. [Skotlex]
 			mob->item_drop(md, dlist, ditem, 0, md->db->dropitem[i].p, homkillonly);
@@ -3308,7 +3308,7 @@ int mobskill_event(struct mob_data *md, struct block_list *src, int64 tick, int
 		md->state.alchemist = 1;
 		return mob->skill_use(md, timer->gettick(), MSC_ALCHEMIST);
 	}
-	
+
 	target_id = md->target_id;
 	if (!target_id || battle_config.mob_changetarget_byskill)
 		md->target_id = src->id;
@@ -3704,13 +3704,13 @@ bool mob_parse_dbrow(char** str) {
 	db->job_exp = (unsigned int)cap_value(exp, 0, UINT_MAX);
 
 	mstatus->rhw.range = atoi(str[9]);
-	
+
 	mstatus->rhw.atk = mob_parse_dbrow_cap_value(class_,UINT16_MIN,UINT16_MAX,atoi(str[10]));
 	mstatus->rhw.atk2 = mob_parse_dbrow_cap_value(class_,UINT16_MIN,UINT16_MAX,atoi(str[11]));
-	
+
 	mstatus->def  = mob_parse_dbrow_cap_value(class_,DEFTYPE_MIN,DEFTYPE_MAX,atoi(str[12]));
 	mstatus->mdef = mob_parse_dbrow_cap_value(class_,DEFTYPE_MIN,DEFTYPE_MAX,atoi(str[13]));
-	
+
 	mstatus->str  = mob_parse_dbrow_cap_value(class_,UINT16_MIN,UINT16_MAX,atoi(str[14]));
 	mstatus->agi  = mob_parse_dbrow_cap_value(class_,UINT16_MIN,UINT16_MAX,atoi(str[15]));
 	mstatus->vit  = mob_parse_dbrow_cap_value(class_,UINT16_MIN,UINT16_MAX,atoi(str[16]));
@@ -3945,7 +3945,7 @@ void mob_readdb(void) {
  * mob_db table reading
  *------------------------------------------*/
 int mob_read_sqldb(void) {
-	const char* mob_db_name[] = { 
+	const char* mob_db_name[] = {
 		map->mob_db_db,
 		map->mob_db2_db
 	};
@@ -4521,7 +4521,7 @@ void mob_readskilldb(void) {
  * seems to work though...
  */
 int mob_read_sqlskilldb(void) {
-	const char* mob_skill_db_name[] = { 
+	const char* mob_skill_db_name[] = {
 		map->mob_skill_db_db,
 		map->mob_skill_db2_db
 	};
@@ -4532,7 +4532,6 @@ int mob_read_sqlskilldb(void) {
 		return 0;
 	}
 
-
 	for( fi = 0; fi < ARRAYLENGTH(mob_skill_db_name); ++fi ) {
 		uint32 lines = 0, count = 0;
 
@@ -4647,7 +4646,7 @@ void mob_load(bool minimal) {
 
 void mob_reload(void) {
 	int i;
-	
+
 	//Mob skills need to be cleared before re-reading them. [Skotlex]
 	for (i = 0; i < MAX_MOB_DB; i++)
 		if (mob->db_data[i] && !mob->is_clone(i)) {
@@ -4766,13 +4765,13 @@ void mob_defaults(void) {
 	//Defines the Manuk/Splendide mob groups for the status reductions [Epoque]
 	const int mob_manuk[8] = { 1986, 1987, 1988, 1989, 1990, 1997, 1998, 1999 };
 	const int mob_splendide[5] = { 1991, 1992, 1993, 1994, 1995 };
-	
+
 	mob = &mob_s;
-	
+
 	memset(mob->db_data, 0, sizeof(mob->db_data));
 	mob->dummy = NULL;
 	memset(mob->chat_db, 0, sizeof(mob->chat_db));
-	
+
 	memcpy(mob->manuk, mob_manuk, sizeof(mob->manuk));
 	memcpy(mob->splendide, mob_splendide, sizeof(mob->splendide));
 	/* */
diff --git a/src/map/npc.c b/src/map/npc.c
index fe7ba693f..a0c14a058 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -271,7 +271,7 @@ int npc_rr_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) {
 		if( sd ) sd->npc_idle_timer = INVALID_TIMER;
 		return 0;//Not logged in anymore OR no longer attached to a npc
 	}
-	
+
 	switch( sd->npc_idle_type ) {
 		case NPCT_INPUT:
 			timeout = NPC_SECURE_TIMEOUT_INPUT;
@@ -281,7 +281,7 @@ int npc_rr_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) {
 			break;
 		//case NPCT_WAIT: var starts with this value
 	}
-	
+
 	if( DIFF_TICK(tick,sd->npc_idle_tick) > (timeout*1000) ) {
 		/**
 		 * If we still have the NPC script attached, tell it to stop.
@@ -1239,7 +1239,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd)
 
 	if ((nd = npc->checknear(sd,&nd->bl)) == NULL)
 		return 1;
-	
+
 	//Hidden/Disabled npc.
 	if (nd->class_ < 0 || nd->option&(OPTION_INVISIBLE|OPTION_HIDE))
 		return 1;
@@ -1281,7 +1281,7 @@ int npc_scriptcont(struct map_session_data* sd, int id, bool closing) {
 			nd?(char*)nd->name:"'Unknown NPC'", (int)id);
 		return 1;
 	}
-	
+
 	if(id != npc->fake_nd->bl.id) { // Not item script
 		if ((npc->checknear(sd,target)) == NULL){
 			ShowWarning("npc_scriptcont: failed npc->checknear test.\n");
@@ -1303,10 +1303,10 @@ int npc_scriptcont(struct map_session_data* sd, int id, bool closing) {
 	 **/
 	if( sd->progressbar.npc_id && DIFF_TICK(sd->progressbar.timeout,timer->gettick()) > 0 )
 		return 1;
-	
+
 	if( !sd->st )
 		return 1;
-	
+
 	if( closing && sd->st->state == CLOSE )
 		sd->st->state = END;
 
@@ -1327,12 +1327,11 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type) {
 		return 1;
 
 	if ( nd->subtype != SHOP && !(nd->subtype == SCRIPT && nd->u.scr.shop && nd->u.scr.shop->items) ) {
-		
 		if( nd->subtype == SCRIPT )
 			ShowError("npc_buysellsel: trader '%s' has no shop list!\n",nd->exname);
 		else
 			ShowError("npc_buysellsel: no such shop npc %d (%s)\n",id,nd->exname);
-		 
+
 		if (sd->npc_id == id)
 			sd->npc_id = 0;
 		return 1;
@@ -1340,7 +1339,7 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type) {
 
 	if (nd->option & OPTION_INVISIBLE) // can't buy if npc is not visible (hack?)
 		return 1;
-	
+
 	if( nd->class_ < 0 && !sd->state.callshop ) {// not called through a script and is not a visible NPC so an invalid call
 		return 1;
 	}
@@ -1354,7 +1353,6 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type) {
 	} else {
 		clif->selllist(sd);
 	}
-	
 	return 0;
 }
 
@@ -1372,13 +1370,13 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, uns
 
 	if( count <= 0 )
 		return ERROR_TYPE_ITEM_ID;
-	
+
 	if( points < 0 )
 		return ERROR_TYPE_MONEY;
-	
+
 	if( !(nd = (struct npc_data *)map->id2bl(sd->npc_shopid)) )
 		return ERROR_TYPE_NPC;
-	
+
 	if( nd->subtype != CASHSHOP ) {
 		if( nd->subtype == SCRIPT && nd->u.scr.shop && nd->u.scr.shop->type != NST_ZENY && nd->u.scr.shop->type != NST_MARKET ) {
 			shop = nd->u.scr.shop->item;
@@ -1389,7 +1387,7 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, uns
 		shop = nd->u.shop.shop_item;
 		shop_size = nd->u.shop.count;
 	}
-	
+
 	new_ = 0;
 	w = 0;
 	vt = 0; // Global Value
@@ -1426,10 +1424,10 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, uns
 
 	if( w + sd->weight > sd->max_weight )
 		return ERROR_TYPE_INVENTORY_WEIGHT;
-	
+
 	if( pc->inventoryblank(sd) < new_ )
 		return ERROR_TYPE_INVENTORY_WEIGHT;
-	
+
 	if( points > vt ) points = vt;
 
 	// Payment Process ----------------------------------------------------
@@ -1492,7 +1490,7 @@ void npc_market_fromsql(void) {
 	char name[NAME_LENGTH+1];
 	int itemid;
 	int amount;
-	
+
 	if ( SQL_ERROR == SQL->StmtPrepare(stmt, "SELECT `name`, `itemid`, `amount` FROM `%s`", map->npc_market_data_db)
 		|| SQL_ERROR == SQL->StmtExecute(stmt)
 		) {
@@ -1500,15 +1498,15 @@ void npc_market_fromsql(void) {
 		SQL->StmtFree(stmt);
 		return;
 	}
-	
+
 	SQL->StmtBindColumn(stmt, 0, SQLDT_STRING, &name[0], sizeof(name), NULL, NULL);
 	SQL->StmtBindColumn(stmt, 1, SQLDT_INT, &itemid, 0, NULL, NULL);
 	SQL->StmtBindColumn(stmt, 2, SQLDT_INT, &amount, 0, NULL, NULL);
-	
+
 	while ( SQL_SUCCESS == SQL->StmtNextRow(stmt) ) {
 		struct npc_data *nd = NULL;
 		unsigned short i;
-		
+
 		if( !(nd = npc->name2id(name)) ) {
 			ShowError("npc_market_fromsql: NPC '%s' not found! skipping...\n",name);
 			npc->market_delfromsql_sub(name, USHRT_MAX);
@@ -1518,22 +1516,20 @@ void npc_market_fromsql(void) {
 			npc->market_delfromsql_sub(name, USHRT_MAX);
 			continue;
 		}
-		
+
 		for(i = 0; i < nd->u.scr.shop->items; i++) {
 			if( nd->u.scr.shop->item[i].nameid == itemid ) {
 				nd->u.scr.shop->item[i].qty = amount;
 				break;
 			}
 		}
-		
+
 		if( i == nd->u.scr.shop->items ) {
 			ShowError("npc_market_fromsql: NPC '%s' does not sell item %d (qty %d), deleting...\n",name,itemid,amount);
 			npc->market_delfromsql_sub(name, itemid);
 			continue;
 		}
-		
 	}
-	
 	SQL->StmtFree(stmt);
 }
 /**
@@ -1567,10 +1563,9 @@ void npc_market_delfromsql(struct npc_data *nd, unsigned short index) {
  * Judges whether to allow and spawn a trader's window.
  **/
 bool npc_trader_open(struct map_session_data *sd, struct npc_data *nd) {
-	
 	if( !nd->u.scr.shop || !nd->u.scr.shop->items )
 		return false;
-		
+
 	switch( nd->u.scr.shop->type ) {
 		case NST_ZENY:
 			sd->state.callshop = 1;
@@ -1578,12 +1573,12 @@ bool npc_trader_open(struct map_session_data *sd, struct npc_data *nd) {
 			return true;/* we skip sd->npc_shopid, npc->buysell will set it then when the player selects */
 		case NST_MARKET: {
 				unsigned short i;
-				
+
 				for(i = 0; i < nd->u.scr.shop->items; i++) {
 					if( nd->u.scr.shop->item[i].qty )
 						break;
 				}
-			
+
 				/* nothing to display, no items available */
 				if (i == nd->u.scr.shop->items) {
 					clif->messagecolor_self(sd->fd, COLOR_RED, msg_sd(sd,881));
@@ -1597,9 +1592,7 @@ bool npc_trader_open(struct map_session_data *sd, struct npc_data *nd) {
 			clif->cashshop_show(sd,nd);
 			break;
 	}
-	
 	sd->npc_shopid = nd->bl.id;
-	
 	return true;
 }
 /**
@@ -1611,21 +1604,19 @@ void npc_trader_update(int master) {
 	DBIterator* iter;
 	struct block_list* bl;
 	struct npc_data *master_nd = map->id2nd(master);
-	
+
 	CREATE(master_nd->u.scr.shop,struct npc_shop_data,1);
-	
+
 	iter = db_iterator(map->id_db);
-	
 	for( bl = (struct block_list*)dbi_first(iter); dbi_exists(iter); bl = (struct block_list*)dbi_next(iter) ) {
 		if( bl->type == BL_NPC ) {
 			struct npc_data* nd = (struct npc_data*)bl;
-			
+
 			if( nd->src_id == master ) {
 				nd->u.scr.shop = master_nd->u.scr.shop;
 			}
 		}
 	}
-	
 	dbi_destroy(iter);
 }
 /**
@@ -1637,9 +1628,9 @@ void npc_trader_update(int master) {
 void npc_trader_count_funds(struct npc_data *nd, struct map_session_data *sd) {
 	char evname[EVENT_NAME_LENGTH];
 	struct event_data *ev = NULL;
-	
+
 	npc->trader_funds[0] = npc->trader_funds[1] = 0;/* clear */
-	
+
 	switch( nd->u.scr.shop->type ) {
 		case NST_CASH:
 			npc->trader_funds[0] = sd->cashPoints;
@@ -1651,14 +1642,14 @@ void npc_trader_count_funds(struct npc_data *nd, struct map_session_data *sd) {
 			ShowError("npc_trader_count_funds: unsupported shop type %d\n",nd->u.scr.shop->type);
 			return;
 	}
-	
+
 	snprintf(evname, EVENT_NAME_LENGTH, "%s::OnCountFunds",nd->exname);
-	
+
 	if ( (ev = strdb_get(npc->ev_db, evname)) )
 		script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
 	else
 		ShowError("npc_trader_count_funds: '%s' event '%s' not found, operation failed\n",nd->exname,evname);
-	
+
 	/* the callee will rely on npc->trader_funds, upon success script->run updates them */
 }
 /**
@@ -1674,19 +1665,17 @@ void npc_trader_count_funds(struct npc_data *nd, struct map_session_data *sd) {
 bool npc_trader_pay(struct npc_data *nd, struct map_session_data *sd, int price, int points) {
 	char evname[EVENT_NAME_LENGTH];
 	struct event_data *ev = NULL;
-	
+
 	npc->trader_ok = false;/* clear */
-	
+
 	snprintf(evname, EVENT_NAME_LENGTH, "%s::OnPayFunds",nd->exname);
-	
 	if ( (ev = strdb_get(npc->ev_db, evname)) ) {
 		pc->setreg(sd,script->add_str("@price"),price);
 		pc->setreg(sd,script->add_str("@points"),points);
-		
 		script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
 	} else
 		ShowError("npc_trader_pay: '%s' event '%s' not found, operation failed\n",nd->exname,evname);
-	
+
 	return npc->trader_ok;/* run script will deal with it */
 }
 /*==========================================
@@ -1698,7 +1687,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po
 	struct npc_item_list *shop = NULL;
 	int i, price, w;
 	unsigned short shop_size = 0;
-	
+
 	if( amount <= 0 )
 		return ERROR_TYPE_ITEM_ID;
 
@@ -1707,7 +1696,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po
 
 	if( sd->state.trading )
 		return ERROR_TYPE_EXCHANGE;
-	
+
 	if( !(nd = (struct npc_data *)map->id2bl(sd->npc_shopid)) )
 		return ERROR_TYPE_NPC;
 
@@ -1724,12 +1713,12 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po
 		shop = nd->u.shop.shop_item;
 		shop_size = nd->u.shop.count;
 	}
-	
+
 	ARR_FIND(0, shop_size, i, shop[i].nameid == nameid);
-	
+
 	if( i == shop_size )
 		return ERROR_TYPE_ITEM_ID;
-	
+
 	if( shop[i].value <= 0 )
 		return ERROR_TYPE_ITEM_ID;
 
@@ -1762,7 +1751,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po
 	}
 
 	price = shop[i].value * amount;
-	
+
 	if( points > price )
 		points = price;
 
@@ -1772,7 +1761,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po
 	} else {
 		if( (sd->kafraPoints < points) || (sd->cashPoints < price - points) )
 			return ERROR_TYPE_MONEY;
-			
+
 		pc->paycash(sd, price, points);
 	}
 
@@ -1798,14 +1787,14 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) {
 	double z;
 	int i,j,w,skill_t,new_, idx = skill->get_index(MC_DISCOUNT);
 	unsigned short shop_size = 0;
-	
+
 	nullpo_retr(3, sd);
 	nullpo_retr(3, item_list);
-	
+
 	nd = npc->checknear(sd,map->id2bl(sd->npc_shopid));
 	if( nd == NULL )
 		return 3;
-	
+
 	if( nd->subtype != SHOP ) {
 		if( nd->subtype == SCRIPT && nd->u.scr.shop && nd->u.scr.shop->type == NST_ZENY ) {
 			shop = nd->u.scr.shop->item;
@@ -1816,76 +1805,76 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) {
 		shop = nd->u.shop.shop_item;
 		shop_size = nd->u.shop.count;
 	}
-	
+
 	z = 0;
 	w = 0;
 	new_ = 0;
 	// process entries in buy list, one by one
 	for( i = 0; i < n; ++i ) {
 		int nameid, amount, value;
-		
+
 		// find this entry in the shop's sell list
 		ARR_FIND( 0, shop_size, j,
 				 item_list[i*2+1] == shop[j].nameid || //Normal items
 				 item_list[i*2+1] == itemdb_viewid(shop[j].nameid) //item_avail replacement
 				 );
-		
+
 		if( j == shop_size )
 			return 3; // no such item in shop
-		
+
 		amount = item_list[i*2+0];
 		nameid = item_list[i*2+1] = shop[j].nameid; //item_avail replacement
 		value = shop[j].value;
-		
+
 		if( !itemdb->exists(nameid) )
 			return 3; // item no longer in itemdb
-		
+
 		if( !itemdb->isstackable(nameid) && amount > 1 ) {
 			//Exploit? You can't buy more than 1 of equipment types o.O
 			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of non-stackable item %d!\n",
 						sd->status.name, sd->status.account_id, sd->status.char_id, amount, nameid);
 			amount = item_list[i*2+0] = 1;
 		}
-		
+
 		if( nd->master_nd ) {
 			// Script-controlled shops decide by themselves, what can be bought and for what price.
 			continue;
 		}
-		
+
 		switch( pc->checkadditem(sd,nameid,amount) ) {
 			case ADDITEM_EXIST:
 				break;
-				
+
 			case ADDITEM_NEW:
 				new_++;
 				break;
-				
+
 			case ADDITEM_OVERAMOUNT:
 				return 2;
 		}
-		
+
 		value = pc->modifybuyvalue(sd,value);
-		
+
 		z += (double)value * amount;
 		w += itemdb_weight(nameid) * amount;
 	}
-	
+
 	if( nd->master_nd != NULL ) //Script-based shops.
 		return npc->buylist_sub(sd,n,item_list,nd->master_nd);
-	
+
 	if( z > (double)sd->status.zeny )
 		return 1; // Not enough Zeny
 	if( w + sd->weight > sd->max_weight )
 		return 2; // Too heavy
 	if( pc->inventoryblank(sd) < new_ )
 		return 3; // Not enough space to store items
-	
+
 	pc->payzeny(sd,(int)z,LOG_TYPE_NPC, NULL);
-	
+
 	for( i = 0; i < n; ++i ) {
 		int nameid = item_list[i*2+1];
 		int amount = item_list[i*2+0];
-		
+
 		if (itemdb_type(nameid) == IT_PETEGG) {
 			pet->create_egg(sd, nameid);
 		} else {
@@ -1893,16 +1882,16 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) {
 			memset(&item_tmp,0,sizeof(item_tmp));
 			item_tmp.nameid = nameid;
 			item_tmp.identify = 1;
-			
+
 			pc->additem(sd,&item_tmp,amount,LOG_TYPE_NPC);
 		}
 	}
-	
+
 	// custom merchant shop exp bonus
 	if( battle_config.shop_exp > 0 && z > 0 && (skill_t = pc->checkskill2(sd,idx)) > 0 ) {
 		if( sd->status.skill[idx].flag >= SKILL_FLAG_REPLACED_LV_0 )
 			skill_t = sd->status.skill[idx].flag - SKILL_FLAG_REPLACED_LV_0;
-		
+
 		if( skill_t > 0 ) {
 			z = z * (double)skill_t * (double)battle_config.shop_exp/10000.;
 			if( z < 1 )
@@ -1910,7 +1899,7 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) {
 			pc->gainexp(sd,NULL,0,(int)z, false);
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -1923,7 +1912,7 @@ int npc_market_buylist(struct map_session_data* sd, unsigned short list_size, st
 	double z;
 	int i,j,w,new_;
 	unsigned short shop_size = 0;
-	
+
 	nullpo_retr(1, sd);
 	nullpo_retr(1, p);
 
@@ -1934,21 +1923,21 @@ int npc_market_buylist(struct map_session_data* sd, unsigned short list_size, st
 
 	shop = nd->u.scr.shop->item;
 	shop_size = nd->u.scr.shop->items;
-	
+
 	z = 0;
 	w = 0;
 	new_ = 0;
-	
+
 	// process entries in buy list, one by one
 	for( i = 0; i < list_size; ++i ) {
 		int nameid, amount, value;
-		
+
 		// find this entry in the shop's sell list
 		ARR_FIND( 0, shop_size, j,
 				 p->list[i].ITID == shop[j].nameid || //Normal items
 				 p->list[i].ITID == itemdb_viewid(shop[j].nameid) //item_avail replacement
 				 );
-		
+
 		if( j == shop_size ) /* TODO find official response for this */
 			return 1; // no such item in shop
 
@@ -1962,26 +1951,24 @@ int npc_market_buylist(struct map_session_data* sd, unsigned short list_size, st
 
 		if( !itemdb->exists(nameid) ) /* TODO find official response for this */
 			return 1; // item no longer in itemdb
-		
+
 		if( !itemdb->isstackable(nameid) && amount > 1 ) {
 			//Exploit? You can't buy more than 1 of equipment types o.O
 			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of non-stackable item %d!\n",
 						sd->status.name, sd->status.account_id, sd->status.char_id, amount, nameid);
 			amount = p->list[i].qty = 1;
 		}
-				
+
 		switch( pc->checkadditem(sd,nameid,amount) ) {
 			case ADDITEM_EXIST:
 				break;
-				
 			case ADDITEM_NEW:
 				new_++;
 				break;
-				
 			case ADDITEM_OVERAMOUNT: /* TODO find official response for this */
 				return 1;
 		}
-				
+
 		z += (double)value * amount;
 		w += itemdb_weight(nameid) * amount;
 	}
@@ -1996,20 +1983,20 @@ int npc_market_buylist(struct map_session_data* sd, unsigned short list_size, st
 		return 1; // Not enough space to store items
 
 	pc->payzeny(sd,(int)z,LOG_TYPE_NPC, NULL);
-	
+
 	for( i = 0; i < list_size; ++i ) {
 		int nameid = p->list[i].ITID;
 		int amount = p->list[i].qty;
-		
+
 		j = npc_market_qty[i];
-		
+
 		if( p->list[i].qty > shop[j].qty ) /* wohoo someone tampered with the packet. */
 			return 1;
-		
+
 		shop[j].qty -= amount;
-		
+
 		npc->market_tosql(nd,j);
-		
+
 		if (itemdb_type(nameid) == IT_PETEGG) {
 			pet->create_egg(sd, nameid);
 		} else {
@@ -2017,7 +2004,7 @@ int npc_market_buylist(struct map_session_data* sd, unsigned short list_size, st
 			memset(&item_tmp,0,sizeof(item_tmp));
 			item_tmp.nameid = nameid;
 			item_tmp.identify = 1;
-			
+
 			pc->additem(sd,&item_tmp,amount,LOG_TYPE_NPC);
 		}
 	}
@@ -2058,18 +2045,18 @@ int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short* item_li
 
 		script->setarray_pc(sd, "@sold_nameid", i, (void*)(intptr_t)sd->status.inventory[idx].nameid, &key_nameid);
 		script->setarray_pc(sd, "@sold_quantity", i, (void*)(intptr_t)item_list[i*2+1], &key_amount);
-		
+
 		// process item based information into the arrays
 		script->setarray_pc(sd, "@sold_refine", i, (void*)(intptr_t)sd->status.inventory[idx].refine, &key_refine);
 		script->setarray_pc(sd, "@sold_attribute", i, (void*)(intptr_t)sd->status.inventory[idx].attribute, &key_attribute);
 		script->setarray_pc(sd, "@sold_identify", i, (void*)(intptr_t)sd->status.inventory[idx].identify, &key_identify);
-		
+
 		for (j = 0; j < MAX_SLOTS; j++) {
 			// store each of the cards/special info from the item in the array
 			snprintf(card_slot, sizeof(card_slot), "@sold_card%d", j + 1);
 			script->setarray_pc(sd, card_slot, i, (void*)(intptr_t)sd->status.inventory[idx].card[j], &key_card[j]);
 		}
-		
+
 	}
 
 	// invoke event
@@ -2078,7 +2065,6 @@ int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short* item_li
 	return 0;
 }
 
-
 /// Player item selling to npc shop.
 ///
 /// @param item_list 'n' pairs <index,amount>
@@ -2100,7 +2086,6 @@ int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list)
 			return 1;
 	}
 
-	
 	z = 0;
 
 	// verify the sell list
@@ -2246,7 +2231,7 @@ int npc_unload(struct npc_data* nd, bool single)
 	if( nd->ud && nd->ud != &npc->base_ud ) {
 		skill->clear_unitgroup(&nd->bl);
 	}
-	
+
 	npc->remove_map(nd);
 	map->deliddb(&nd->bl);
 	if( single )
@@ -2270,7 +2255,7 @@ int npc_unload(struct npc_data* nd, bool single)
 			aFree(nd->path);/* remove now that no other instances exist */
 		}
 	}
-	
+
 	if( single && nd->bl.m != -1 )
 		map->remove_questinfo(nd->bl.m,nd);
 
@@ -2284,7 +2269,7 @@ int npc_unload(struct npc_data* nd, bool single)
 			npc->ev_db->foreach(npc->ev_db,npc->unload_ev,nd->exname); //Clean up all events related
 			npc->ev_label_db->foreach(npc->ev_label_db,npc->unload_ev_label,nd);
 		}
-		
+
 		iter = mapit_geteachpc();
 		for( bl = (struct block_list*)mapit->first(iter); mapit->exists(iter); bl = (struct block_list*)mapit->next(iter) ) {
 			struct map_session_data *sd = ((TBL_PC*)bl);
@@ -2646,7 +2631,7 @@ const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const char* s
 		if (retval) *retval = EXIT_FAILURE;
 		return strchr(start,'\n');;//try next
 	}
-	
+
 	nd = npc->create_npc(m, x, y);
 	map->addnpc(m, nd);
 	npc->parsename(nd, w3, start, buffer, filepath);
@@ -2722,7 +2707,7 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
 		if (retval) *retval = EXIT_FAILURE;
 		return strchr(start,'\n');//try next
 	}
-	
+
 	if( strcmp(w2,"cashshop") == 0 )
 		type = CASHSHOP;
 	else
@@ -2820,14 +2805,14 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
 
 void npc_convertlabel_db(struct npc_label_list* label_list, const char *filepath) {
 	int i;
-	
+
 	for( i = 0; i < script->label_count; i++ ) {
 		const char* lname = script->get_str(script->labels[i].key);
 		int lpos = script->labels[i].pos;
 		struct npc_label_list* label;
 		const char *p;
 		size_t len;
-				
+
 		// In case of labels not terminated with ':', for user defined function support
 		p = lname;
 
@@ -2840,9 +2825,9 @@ void npc_convertlabel_db(struct npc_label_list* label_list, const char *filepath
 			ShowError("npc_parse_script: label name longer than 23 chars! (%s) in file '%s'.\n", lname, filepath);
 			return;
 		}
-		
+
 		label = &label_list[i];
-				
+
 		safestrncpy(label->name, lname, sizeof(label->name));
 		label->pos = lpos;
 	}
@@ -2958,13 +2943,10 @@ const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, const char*
 	if( end == NULL )
 		return NULL;// (simple) parse error, don't continue
 
-	
 	script->parser_current_npc_name = w3;
-	
 	scriptroot = script->parse(script_start, filepath, strline(buffer,script_start-buffer), SCRIPT_USE_LABEL_DB, retval);
-
 	script->parser_current_npc_name = NULL;
-	
+
 	label_list = NULL;
 	label_list_num = 0;
 	if( script->label_count ) {
@@ -2994,7 +2976,7 @@ const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, const char*
 	if( options&NPO_TRADER )
 		nd->u.scr.trader = true;
 	nd->u.scr.shop = NULL;
-	
+
 	++npc_script;
 	nd->bl.type = BL_NPC;
 	nd->subtype = SCRIPT;
@@ -3116,7 +3098,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
 		if (retval) *retval = EXIT_FAILURE;
 		return end;//try next
 	}
-	
+
 	if( type == WARP && sscanf(w4, "%d,%d", &xs, &ys) == 2 );// <spanx>,<spany>
 	else if( type == SCRIPT && sscanf(w4, "%*[^,],%d,%d", &xs, &ys) == 2);// <sprite id>,<triggerX>,<triggerY>
 	else if( type == WARP ) {
@@ -3485,7 +3467,7 @@ const char* npc_parse_function(char* w1, char* w2, char* w3, char* w4, const cha
 	scriptroot = script->parse(script_start, filepath, strline(buffer,start-buffer), SCRIPT_RETURN_EMPTY_SCRIPT, retval);
 
 	script->parser_current_npc_name = NULL;
-	
+
 	if( scriptroot == NULL )// parse error, continue
 		return end;
 
@@ -3501,7 +3483,6 @@ const char* npc_parse_function(char* w1, char* w2, char* w3, char* w4, const cha
 	return end;
 }
 
-
 /*==========================================
  * Parse Mob 1 - Parse mob list into each map
  * Parse Mob 2 - Actually Spawns Mob
@@ -3823,7 +3804,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 		map->list[m].flag.pvp_nocalcrank=state;
 	else if (!strcmpi(w3,"gvg")) {
 		struct map_zone_data *zone;
-		
+
 		map->list[m].flag.gvg = state;
 		if( state && map->list[m].flag.pvp ) {
 			map->list[m].flag.pvp = 0;
@@ -3872,7 +3853,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 			ShowWarning("npc_parse_mapflag: You can't set GvG and BattleGround flags for the same map! Removing GvG flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;
 		}
-		
+
 		if( state && (zone = strdb_get(map->zone_db, MAP_ZONE_BG_NAME)) != NULL && map->list[m].zone != zone ) {
 			map->zone_change(m,zone,start,buffer,filepath);
 		}
@@ -3958,11 +3939,11 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 		int skill_id, k;
 		char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH];
 		size_t len = w4 ? strlen(w4) : 0;
-		
+
 		modifier[0] = '\0';
 		if( w4 )
 			memcpy(skill_name, w4, MAP_ZONE_MAPFLAG_LENGTH);
-		
+
 		for(k = 0; k < len; k++) {
 			if( skill_name[k] == '\t' ) {
 				memcpy(modifier, &skill_name[k+1], len - k);
@@ -3970,7 +3951,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 				break;
 			}
 		}
-		
+
 		if( modifier[0] == '\0' ) {
 			ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_unit_duration' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;
@@ -3982,9 +3963,9 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 			if (retval) *retval = EXIT_FAILURE;
 		} else {
 			int idx = map->list[m].unit_count;
-			
+
 			ARR_FIND(0, idx, k, map->list[m].units[k]->skill_id == skill_id);
-			
+
 			if( k < idx ) {
 				if( atoi(modifier) != 100 )
 					map->list[m].units[k]->modifier = (unsigned short)atoi(modifier);
@@ -3995,9 +3976,9 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 					for( k = 0; k < idx; k++ ) {
 						if( map->list[m].units[k] == NULL )
 							continue;
-						
+
 						map->list[m].units[cursor] = map->list[m].units[k];
-												
+
 						cursor++;
 					}
 					if( !( map->list[m].unit_count = cursor ) ) {
@@ -4016,12 +3997,12 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 		int skill_id, k;
 		char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH];
 		size_t len = w4 ? strlen(w4) : 0;
-		
+
 		modifier[0] = '\0';
-		
+
 		if( w4 )
 			memcpy(skill_name, w4, MAP_ZONE_MAPFLAG_LENGTH);
-		
+
 		for(k = 0; k < len; k++) {
 			if( skill_name[k] == '\t' ) {
 				memcpy(modifier, &skill_name[k+1], len - k);
@@ -4029,7 +4010,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 				break;
 			}
 		}
-				
+
 		if( modifier[0] == '\0' ) {
 			ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_skill_damage' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;
@@ -4041,9 +4022,9 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 			if (retval) *retval = EXIT_FAILURE;
 		} else {
 			int idx = map->list[m].skill_count;
-			
+
 			ARR_FIND(0, idx, k, map->list[m].skills[k]->skill_id == skill_id);
-			
+
 			if( k < idx ) {
 				if( atoi(modifier) != 100 )
 					map->list[m].skills[k]->modifier = (unsigned short)atoi(modifier);
@@ -4054,9 +4035,9 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 					for( k = 0; k < idx; k++ ) {
 						if( map->list[m].skills[k] == NULL )
 							continue;
-						
+
 						map->list[m].skills[cursor] = map->list[m].skills[k];
-												
+
 						cursor++;
 					}
 					if( !( map->list[m].skill_count = cursor ) ) {
@@ -4070,11 +4051,10 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
 				map->list[m].skills[idx]->skill_id = (unsigned short)skill_id;
 				map->list[m].skills[idx]->modifier = (unsigned short)atoi(modifier);
 			}
-			
 		}
 	} else if (!strcmpi(w3,"zone")) {
 		struct map_zone_data *zone;
-		
+
 		if( !(zone = strdb_get(map->zone_db, w4)) ) {
 			ShowWarning("npc_parse_mapflag: Invalid zone '%s'! removing flag from %s in file '%s', line '%d'.\n", w4, map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;
@@ -4451,9 +4431,8 @@ int npc_reload(void) {
 	npc_last_npd = NULL;
 	npc_last_path = NULL;
 	npc_last_ref = NULL;
-	
-	//Remove all npcs/mobs. [Skotlex]
 
+	//Remove all npcs/mobs. [Skotlex]
 	iter = mapit_geteachiddb();
 	for( bl = (struct block_list*)mapit->first(iter); mapit->exists(iter); bl = (struct block_list*)mapit->next(iter) ) {
 		switch(bl->type) {
@@ -4617,7 +4596,7 @@ int do_init_npc(bool minimal) {
 	npc->base_ud.attackabletime =
 	npc->base_ud.canact_tick    =
 	npc->base_ud.canmove_tick   = timer->gettick();
-	
+
 	//Stock view data for normal npcs.
 	memset(&npc_viewdb, 0, sizeof(npc_viewdb));
 
@@ -4645,12 +4624,12 @@ int do_init_npc(bool minimal) {
 
 		npc_process_files(START_NPC_NUM);
 	}
-	
+
 	if (!minimal) {
 		map->zone_init();
-	
+
 		npc->motd = npc->name2id("HerculesMOTD"); /* [Ind/Hercules] */
-	
+
 		// set up the events cache
 		memset(script_event, 0, sizeof(script_event));
 		npc->read_event_script();
@@ -4662,7 +4641,7 @@ int do_init_npc(bool minimal) {
 		timer->add_func_list(npc->event_do_clock,"npc_event_do_clock");
 		timer->add_func_list(npc->timerevent,"npc_timerevent");
 	}
-	
+
 	if( script->lang_export_fp ) {
 		ShowInfo("Lang exported to '%s'\n",script->lang_export_file);
 		fclose(script->lang_export_fp);
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 0b9023ede..503dbd845 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -80,7 +80,6 @@ struct pcre_interface *libpcre;
  *  deletes a pset
  */
 
-
 /**
  * delete everything associated with a entry
  *
@@ -102,9 +101,9 @@ struct pcrematch_set* lookup_pcreset(struct npc_data* nd, int setid) {
 	struct npc_parse *npcParse = nd->chatdb;
 	if (npcParse == NULL)
 		nd->chatdb = npcParse = (struct npc_parse *)aCalloc(sizeof(struct npc_parse), 1);
-	
+
 	pcreset = npcParse->active;
-	
+
 	while (pcreset != NULL) {
 		if (pcreset->setid == setid)
 		break;
@@ -112,13 +111,13 @@ struct pcrematch_set* lookup_pcreset(struct npc_data* nd, int setid) {
 	}
 	if (pcreset == NULL)
 		pcreset = npcParse->inactive;
-	
+
 	while (pcreset != NULL) {
 		if (pcreset->setid == setid)
 		break;
 		pcreset = pcreset->next;
 	}
-	
+
 	if (pcreset == NULL) {
 		pcreset = (struct pcrematch_set *)aCalloc(sizeof(struct pcrematch_set), 1);
 		pcreset->next = npcParse->inactive;
@@ -128,7 +127,6 @@ struct pcrematch_set* lookup_pcreset(struct npc_data* nd, int setid) {
 		npcParse->inactive = pcreset;
 		pcreset->setid = setid;
 	}
-	
 	return pcreset;
 }
 
@@ -157,7 +155,7 @@ void activate_pcreset(struct npc_data* nd, int setid)
 		pcreset->prev->next = pcreset->next;
 	else
 		npcParse->inactive = pcreset->next;
-	
+
 	pcreset->prev = NULL;
 	pcreset->next = npcParse->active;
 	if (pcreset->next != NULL)
@@ -195,7 +193,7 @@ void deactivate_pcreset(struct npc_data* nd, int setid)
 		pcreset->prev->next = pcreset->next;
 	else
 		npcParse->active = pcreset->next;
-	
+
 	pcreset->prev = NULL;
 	pcreset->next = npcParse->inactive;
 	if (pcreset->next != NULL)
@@ -230,27 +228,26 @@ void delete_pcreset(struct npc_data* nd, int setid)
 	}
 	if (pcreset == NULL)
 		return;
-	
+
 	if (pcreset->next != NULL)
 		pcreset->next->prev = pcreset->prev;
 	if (pcreset->prev != NULL)
 		pcreset->prev->next = pcreset->next;
-	
+
 	if(active)
 		npcParse->active = pcreset->next;
 	else
 		npcParse->inactive = pcreset->next;
-	
+
 	pcreset->prev = NULL;
 	pcreset->next = NULL;
-	
+
 	while (pcreset->head) {
 		struct pcrematch_entry* n = pcreset->head->next;
 		npc_chat->finalize_pcrematch_entry(pcreset->head);
 		aFree(pcreset->head); // Cleaning the last ones.. [Lance]
 		pcreset->head = n;
 	}
-	
 	aFree(pcreset);
 }
 
@@ -261,25 +258,25 @@ struct pcrematch_entry* create_pcrematch_entry(struct pcrematch_set* set)
 {
 	struct pcrematch_entry * e =  (struct pcrematch_entry *) aCalloc(sizeof(struct pcrematch_entry), 1);
 	struct pcrematch_entry * last = set->head;
-	
+
 	// Normally we would have just stuck it at the end of the list but
 	// this doesn't sink up with peoples usage pattern.  They wanted
 	// the items defined first to have a higher priority then the
 	// items defined later. as a result, we have to do some work up front.
-	
+
 	/*  if we are the first pattern, stick us at the end */
 	if (last == NULL) {
 		set->head = e;
 		return e;
 	}
-	
+
 	/* Look for the last entry */
 	while (last->next != NULL)
 		last = last->next;
-	
+
 	last->next = e;
 	e->next = NULL;
-	
+
 	return e;
 }
 
@@ -290,7 +287,7 @@ void npc_chat_def_pattern(struct npc_data* nd, int setid, const char* pattern, c
 {
 	const char *err;
 	int erroff;
-	
+
 	struct pcrematch_set * s = npc_chat->lookup_pcreset(nd, setid);
 	struct pcrematch_entry *e = npc_chat->create_pcrematch_entry(s);
 	e->pattern = aStrdup(pattern);
@@ -310,13 +307,13 @@ void npc_chat_finalize(struct npc_data* nd)
 	struct npc_parse *npcParse = nd->chatdb;
 	if (npcParse == NULL)
 		return;
-	
+
 	while(npcParse->active)
 		npc_chat->delete_pcreset(nd, npcParse->active->setid);
-	
+
 	while(npcParse->inactive)
 		npc_chat->delete_pcreset(nd, npcParse->inactive->setid);
-	
+
 	// Additional cleaning up [Lance]
 	aFree(npcParse);
 }
@@ -334,15 +331,15 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 	struct npc_label_list* lst;
 	struct pcrematch_set* pcreset;
 	struct pcrematch_entry* e;
-	
+
 	// Not interested in anything you might have to say...
 	if (npcParse == NULL || npcParse->active == NULL)
 		return 0;
-	
+
 	msg = va_arg(ap,char*);
 	len = va_arg(ap,int);
 	sd = va_arg(ap,struct map_session_data *);
-	
+
 	// iterate across all active sets
 	for (pcreset = npcParse->active; pcreset != NULL; pcreset = pcreset->next)
 	{
@@ -350,7 +347,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 		for (e = pcreset->head; e != NULL; e = e->next)
 		{
 			int offsets[2*10 + 10]; // 1/3 reserved for temp space required by pcre_exec
-			
+
 			// perform pattern match
 			int r = libpcre->exec(e->pcre_, e->pcre_extra_, msg, len, 0, 0, offsets, ARRAYLENGTH(offsets));
 			if (r > 0)
@@ -363,7 +360,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 					libpcre->copy_substring(msg, offsets, r, i, val, sizeof(val));
 					script->set_var(sd, var, val);
 				}
-				
+
 				// find the target label.. this sucks..
 				lst = nd->u.scr.label_list;
 				ARR_FIND(0, nd->u.scr.label_list_num, i, strncmp(lst[i].name, e->label, sizeof(lst[i].name)) == 0);
@@ -371,14 +368,13 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 					ShowWarning("npc_chat_sub: Unable to find label: %s\n", e->label);
 					return 0;
 				}
-				
+
 				// run the npc script
 				script->run_npc(nd->u.scr.script,lst[i].pos,sd->bl.id,nd->bl.id);
 				return 0;
 			}
 		}
 	}
-	
 	return 0;
 }
 
@@ -388,7 +384,7 @@ BUILDIN(defpattern) {
 	const char* pattern = script_getstr(st,3);
 	const char* label = script_getstr(st,4);
 	struct npc_data* nd = (struct npc_data *)map->id2bl(st->oid);
-	
+
 	npc_chat->def_pattern(nd, setid, pattern, label);
 
 	return true;
@@ -397,7 +393,7 @@ BUILDIN(defpattern) {
 BUILDIN(activatepset) {
 	int setid = script_getnum(st,2);
 	struct npc_data* nd = (struct npc_data *)map->id2bl(st->oid);
-	
+
 	npc_chat->activate_pcreset(nd, setid);
 
 	return true;
@@ -406,16 +402,16 @@ BUILDIN(activatepset) {
 BUILDIN(deactivatepset) {
 	int setid = script_getnum(st,2);
 	struct npc_data* nd = (struct npc_data *)map->id2bl(st->oid);
-	
+
 	npc_chat->deactivate_pcreset(nd, setid);
-	
+
 	return true;
 }
 
 BUILDIN(deletepset) {
 	int setid = script_getnum(st,2);
 	struct npc_data* nd = (struct npc_data *)map->id2bl(st->oid);
-	
+
 	npc_chat->delete_pcreset(nd, setid);
 
 	return true;
@@ -423,7 +419,7 @@ BUILDIN(deletepset) {
 
 void npc_chat_defaults(void) {
 	npc_chat = &npc_chat_s;
-	
+
 	npc_chat->sub = npc_chat_sub;
 	npc_chat->finalize = npc_chat_finalize;
 	npc_chat->def_pattern = npc_chat_def_pattern;
@@ -433,9 +429,9 @@ void npc_chat_defaults(void) {
 	npc_chat->activate_pcreset = activate_pcreset;
 	npc_chat->lookup_pcreset = lookup_pcreset;
 	npc_chat->finalize_pcrematch_entry = finalize_pcrematch_entry;
-	
+
 	libpcre = &libpcre_s;
-	
+
 	libpcre->compile = pcre_compile;
 	libpcre->study = pcre_study;
 	libpcre->exec = pcre_exec;
diff --git a/src/map/packets.h b/src/map/packets.h
index 1f465b833..ffa40ff7c 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2818,7 +2818,6 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x0A22,5);                           // HEADER_ZC_RECV_ROULETTE_ITEM
 #endif
 
-
 // 2014-10-22bRagexe - YomRawr
 #if PACKETVER >= 20141022
 	packet(0x0369,7,clif->pActionRequest,2,6);
@@ -2896,7 +2895,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x0923,36,clif->pStoragePassword,0);
 	packet(0x09e8,11,clif->pDull);	//CZ_OPEN_MAILBOX
 	packet(0x0a2e,6,clif->pDull);	//TITLE
-#endif         
+#endif
 
 /* PacketKeys: http://herc.ws/board/topic/1105-hercules-wpe-free-june-14th-patch/ */
 #if PACKETVER >= 20110817
diff --git a/src/map/party.c b/src/map/party.c
index 472c03423..db285a4b4 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -98,7 +98,7 @@ TBL_PC* party_sd_check(int party_id, int account_id, int char_id) {
 }
 int party_db_final(DBKey key, DBData *data, va_list ap) {
 	struct party_data *p;
-	
+
 	if ((p = DB->data2ptr(data))) {
 		if (p->instance)
 			aFree(p->instance);
@@ -114,7 +114,6 @@ int party_db_final(DBKey key, DBData *data, va_list ap) {
 			aFree(p->hdata);
 		}
 	}
-	
 	return 0;
 }
 /// Party data lookup using party id.
@@ -168,7 +167,6 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
 	return 0;
 }
 
-
 void party_created(int account_id,int char_id,int fail,int party_id,char *name) {
 	struct map_session_data *sd;
 	sd=map->id2sd(account_id);
@@ -500,7 +498,6 @@ int party_member_added(int party_id,int account_id,int char_id, int flag) {
 			break;
 		}
 	}
-	
 	return 0;
 }
 
@@ -600,7 +597,7 @@ int party_broken(int party_id)
 			instance->list[p->instance[j]].owner_id = 0;
 		}
 	}
-	
+
 	for( i = 0; i < MAX_PARTY; i++ ) {
 		if( p->data[i].sd!=NULL ) {
 			clif->party_withdraw(p,p->data[i].sd,p->party.member[i].account_id,p->party.member[i].name,0x10);
@@ -690,7 +687,7 @@ bool party_changeleader(struct map_session_data *sd, struct map_session_data *ts
 	//Change leadership.
 	p->party.member[mi].leader = 0;
 	p->party.member[tmi].leader = 1;
-	
+
 	/** update members **/
 	clif->PartyLeaderChanged(p->data[mi].sd, p->data[mi].sd->status.account_id, p->data[tmi].sd->status.account_id);
 
@@ -955,13 +952,13 @@ int party_exp_share(struct party_data* p, struct block_list* src, unsigned int b
 	base_exp_bonus = base_exp;
 	job_exp_bonus  = job_exp;
 #endif
-	
+
 	for (i = 0; i < c; i++) {
 #ifdef RENEWAL_EXP
 		if( !(src && src->type == BL_MOB && ((TBL_MOB*)src)->db->mexp) ){
 			struct mob_data *md = (TBL_MOB*)src;
 			int rate = pc->level_penalty_mod(md->level - (sd[i])->status.base_level, md->status.race, md->status.mode, 1);
-			
+
 			base_exp = (unsigned int)cap_value(base_exp_bonus * rate / 100, 1, UINT_MAX);
 			job_exp = (unsigned int)cap_value(job_exp_bonus * rate / 100, 1, UINT_MAX);
 		}
@@ -1118,7 +1115,7 @@ int party_sub_count_chorus(struct block_list *bl, va_list ap) {
 
 	if (sd->state.autotrade)
 		return 0;
-	
+
 	if (battle_config.idle_no_share && pc_isidle(sd))
 		return 0;
 
@@ -1189,9 +1186,8 @@ void party_booking_register(struct map_session_data *sd, short level, short mapi
 #ifndef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
 	int i;
-	
+
 	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
-	
 	if( pb_ad == NULL )
 	{
 		pb_ad = party->create_booking_data();
@@ -1202,17 +1198,17 @@ void party_booking_register(struct map_session_data *sd, short level, short mapi
 		clif->PartyBookingRegisterAck(sd, 2);
 		return;
 	}
-	
+
 	memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH);
 	pb_ad->expiretime = (int)time(NULL);
 	pb_ad->p_detail.level = level;
 	pb_ad->p_detail.mapid = mapid;
-	
+
 	for(i=0;i<PARTY_BOOKING_JOBS;i++)
 		if(job[i] != 0xFF)
 			pb_ad->p_detail.job[i] = job[i];
 		else pb_ad->p_detail.job[i] = -1;
-	
+
 	clif->PartyBookingRegisterAck(sd, 0);
 	clif->PartyBookingInsertNotify(sd, pb_ad); // Notice
 #else
@@ -1244,26 +1240,25 @@ void party_booking_update(struct map_session_data *sd, short* job) {
 #ifndef PARTY_RECRUIT
 	int i;
 	struct party_booking_ad_info *pb_ad;
-	
+
 	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
-	
+
 	if( pb_ad == NULL )
 		return;
-	
+
 	pb_ad->expiretime = (int)time(NULL);// Update time.
-	
+
 	for(i=0;i<PARTY_BOOKING_JOBS;i++)
 		if(job[i] != 0xFF)
 			pb_ad->p_detail.job[i] = job[i];
 		else pb_ad->p_detail.job[i] = -1;
-	
+
 	clif->PartyBookingUpdateNotify(sd, pb_ad);
 #else
 	return;
 #endif
 }
 
-
 void party_recruit_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount) {
 #ifdef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
@@ -1302,9 +1297,9 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 	struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS];
 	bool more_result = false;
 	DBIterator* iter = db_iterator(party->booking_db);
-	
+
 	memset(result_list, 0, sizeof(result_list));
-	
+
 	for( pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter) ) {
 		if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
 			continue;
@@ -1334,7 +1329,6 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 #endif
 }
 
-
 bool party_booking_delete(struct map_session_data *sd)
 {
 	struct party_booking_ad_info* pb_ad;
@@ -1384,7 +1378,7 @@ void party_defaults(void) {
 	party->searchname = party_searchname;
 	party->getmemberid = party_getmemberid;
 	party->getavailablesd = party_getavailablesd;
-	
+
 	party->create = party_create;
 	party->created = party_created;
 	party->request_info = party_request_info;
diff --git a/src/map/path.c b/src/map/path.c
index 7d6cd5490..a482fc473 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -256,7 +256,7 @@ bool path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, int1
 	// Check destination cell
 	if (x1 < 0 || x1 >= md->xs || y1 < 0 || y1 >= md->ys || md->getcellp(md, bl, x1, y1, cell))
 		return false;
-	
+
 	if( x0 == x1 && y0 == y1 ) {
 		wpd->path_len = 0;
 		wpd->path_pos = 0;
@@ -409,7 +409,6 @@ bool path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, int1
 	return false;
 }
 
-
 //Distance functions, taken from http://www.flipcode.com/articles/article_fastdistance.shtml
 bool check_distance(int dx, int dy, int distance)
 {
@@ -489,7 +488,7 @@ int distance_client(int dx, int dy)
 
 void path_defaults(void) {
 	path = &path_s;
-	
+
 	path->blownpos = path_blownpos;
 	path->search_long = path_search_long;
 	path->search = path_search;
diff --git a/src/map/pc.c b/src/map/pc.c
index cc4b598bd..dc7014701 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -127,7 +127,7 @@ void pc_setinvincibletimer(struct map_session_data* sd, int val) {
 	nullpo_retv(sd);
 
 	val += map->list[sd->bl.m].invincible_time_inc;
-	
+
 	if( sd->invincible_timer != INVALID_TIMER )
 		timer->delete(sd->invincible_timer,pc->invincible_timer);
 	sd->invincible_timer = timer->add(timer->gettick()+val,pc->invincible_timer,sd->bl.id,0);
@@ -188,7 +188,7 @@ int pc_getmaxspiritball(struct map_session_data *sd, int min) {
 	nullpo_ret(sd);
 
 	result = pc->checkskill(sd, MO_CALLSPIRITS);
-	
+
 	if ( min && result < min )
 		result = min;
 	else if ( sd->sc.data[SC_RAISINGDRAGON] )
@@ -517,7 +517,7 @@ void pc_rental_expire(struct map_session_data *sd, int i) {
 			}
 			break;
 	}
-	
+
 	clif->rental_expired(sd->fd, i, sd->status.inventory[i].nameid);
 	pc->delitem(sd, i, sd->status.inventory[i].amount, 0, DELITEM_NORMAL, LOG_TYPE_OTHER);
 }
@@ -623,14 +623,12 @@ int pc_makesavestatus(struct map_session_data *sd)
 		sd->status.last_point.x = 0;
 		sd->status.last_point.y = 0;
 	}
-	
+
 	if( sd->status.save_point.map == 0 ) {
 		sd->status.save_point.map = 1;
 		sd->status.save_point.x = 0;
 		sd->status.save_point.y = 0;
 	}
-
-
 	return 0;
 }
 
@@ -916,7 +914,7 @@ int pc_isequip(struct map_session_data *sd,int n)
 
 	if(pc_has_permission(sd, PC_PERM_USE_ALL_EQUIPMENT))
 		return 1;
-	
+
 	if (item->elv && sd->status.base_level < (unsigned int)item->elv) {
 		clif->msgtable(sd, MSG_ITEM_CANT_EQUIP_LVL);
 		return 0;
@@ -1048,7 +1046,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	if( sd->status.clothes_color < MIN_CLOTH_COLOR || sd->status.clothes_color > MAX_CLOTH_COLOR ) {
 		sd->status.clothes_color = MIN_CLOTH_COLOR;
 	}
-	
+
 	//Initializations to null/0 unneeded since map_session_data was filled with 0 upon allocation.
 	if(!sd->status.hp) pc_setdead(sd);
 	sd->state.connect_new = 1;
@@ -1080,7 +1078,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	sd->hchsysch_tick = tick;
 
 	sd->idletime = sockt->last_tick;
-	
+
 	for(i = 0; i < MAX_SPIRITBALL; i++)
 		sd->spirit_timer[i] = INVALID_TIMER;
 	for(i = 0; i < ARRAYLENGTH(sd->autobonus); i++)
@@ -1106,11 +1104,11 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 
 	if( sd->status.option & OPTION_INVISIBLE && !pc->can_use_command(sd, "@hide") )
 		sd->status.option &=~ OPTION_INVISIBLE;
-	
+
 	status->change_init(&sd->bl);
-	
+
 	sd->sc.option = sd->status.option; //This is the actual option used in battle.
-		
+
 	//Set here because we need the inventory data for weapon sprite parsing.
 	status->set_viewdata(&sd->bl, sd->status.class_);
 	unit->dataset(&sd->bl);
@@ -1119,25 +1117,25 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	sd->guild_y = -1;
 
 	sd->disguise = -1;
-	
+
 	sd->instance = NULL;
 	sd->instances = 0;
-	
+
 	sd->bg_queue.arena = NULL;
 	sd->bg_queue.ready = 0;
 	sd->bg_queue.client_has_bg_data = 0;
 	sd->bg_queue.type = 0;
-	
+
 	sd->queues = NULL;
 	sd->queues_count = 0;
-	
+
 	sd->state.dialog = 0;
-	
+
 	sd->delayed_damage = 0;
-	
+
 	if( battle_config.item_check )
 		sd->state.itemcheck = 1;
-	
+
 	// Event Timers
 	for( i = 0; i < MAX_EVENTTIMER; i++ )
 		sd->eventtimer[i] = INVALID_TIMER;
@@ -1157,9 +1155,9 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	sd->vars_dirty = false;
 	sd->vars_ok = false;
 	sd->vars_received = 0x0;
-	
+
 	sd->lang_id = map->default_lang_id;
-	
+
 	//warp player
 	if ((i=pc->setpos(sd,sd->status.last_point.map, sd->status.last_point.x, sd->status.last_point.y, CLR_OUTSIGHT)) != 0) {
 		ShowError ("Last_point_map %s - id %d not found (error code %d)\n", mapindex_id2name(sd->status.last_point.map), sd->status.last_point.map, i);
@@ -1194,7 +1192,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 			sprintf(buf, msg_sd(sd,1295), sysinfo->vcstype(), sysinfo->vcsrevision_src(), sysinfo->vcsrevision_scripts()); // %s revision '%s' (src) / '%s' (scripts)
 			clif->message(sd->fd, buf);
 		}
-		
+
 		if (expiration_time != 0) {
 			sd->expiration_time = expiration_time;
 		}
@@ -1223,7 +1221,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	/* [Ind/Hercules] */
 	sd->sc_display = NULL;
 	sd->sc_display_count = 0;
-	
+
 	// Request all registries (auth is considered completed whence they arrive)
 	intif->request_registry(sd,7);
 	return true;
@@ -1324,7 +1322,7 @@ int pc_reg_received(struct map_session_data *sd)
 			sd->status.skill[idx].flag = SKILL_FLAG_PLAGIARIZED;
 		}
 	}
-	
+
 	//Weird... maybe registries were reloaded?
 	if (sd->state.active)
 		return 0;
@@ -1370,7 +1368,7 @@ int pc_reg_received(struct map_session_data *sd)
 		clif->message(sd->fd, msg_sd(sd,11)); // Invisible: On
 		// decrement the number of pvp players on the map
 		map->list[sd->bl.m].users_pvp--;
-		
+
 		if( map->list[sd->bl.m].flag.pvp && !map->list[sd->bl.m].flag.pvp_nocalcrank && sd->pvp_timer != INVALID_TIMER ) {// unregister the player for ranking
 			timer->delete( sd->pvp_timer, pc->calc_pvprank_timer );
 			sd->pvp_timer = INVALID_TIMER;
@@ -1380,7 +1378,7 @@ int pc_reg_received(struct map_session_data *sd)
 
 	if( npc->motd ) /* [Ind/Hercules] */
 		script->run(npc->motd->u.scr.script, 0, sd->bl.id, npc->fake_nd->bl.id);
-	
+
 	return 1;
 }
 
@@ -1407,7 +1405,6 @@ int pc_calc_skillpoint(struct map_session_data* sd) {
 	return skill_point;
 }
 
-
 /*==========================================
  * Calculation of skill level.
  *------------------------------------------*/
@@ -1425,7 +1422,7 @@ int pc_calc_skilltree(struct map_session_data *sd)
 		return 1;
 	}
 	c = pc->class2idx(c);
-	
+
 	for( i = 0; i < MAX_SKILL; i++ ) {
 		if( sd->status.skill[i].flag != SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].flag != SKILL_FLAG_PERM_GRANTED ) //Don't touch these
 			sd->status.skill[i].id = 0; //First clear skills.
@@ -1543,7 +1540,7 @@ int pc_calc_skilltree(struct map_session_data *sd)
 			if( f ) {
 				int inf2;
 				inf2 = skill->dbs->db[idx].inf2;
-				
+
 				if(!sd->status.skill[idx].lv && (
 					(inf2&INF2_QUEST_SKILL && !battle_config.quest_skill_learn) ||
 					inf2&INF2_WEDDING_SKILL ||
@@ -1552,7 +1549,7 @@ int pc_calc_skilltree(struct map_session_data *sd)
 					continue; //Cannot be learned via normal means. Note this check DOES allows raising already known skills.
 
 				sd->status.skill[idx].id = id;
-				
+
 				if(inf2&INF2_SPIRIT_SKILL) { //Spirit skills cannot be learned, they will only show up on your tree when you get buffed.
 					sd->status.skill[idx].lv = 1; // need to manually specify a skill level
 					sd->status.skill[idx].flag = SKILL_FLAG_TEMPORARY; //So it is not saved, and tagged as a "bonus" skill.
@@ -1690,7 +1687,7 @@ int pc_calc_skilltree_normalize_job(struct map_session_data *sd)
 	novice_skills = pc->max_level[pc->class2idx(JOB_NOVICE)][1] - 1;
 
 	sd->sktree.second = sd->sktree.third = 0;
-	
+
 	// limit 1st class and above to novice job levels
 	if(skill_point < novice_skills) {
 		c = MAPID_NOVICE;
@@ -1745,7 +1742,7 @@ int pc_calc_skilltree_normalize_job(struct map_session_data *sd)
 
 	// restore non-limiting flags
 	c |= sd->class_&(JOBL_UPPER|JOBL_BABY);
-	
+
 	return c;
 }
 
@@ -4476,7 +4473,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount,e_l
 				break;
 		}
 	}
-	
+
 	i = MAX_INVENTORY;
 
 	// Stackable | Non Rental
@@ -4495,7 +4492,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount,e_l
 			}
 		}
 	}
-	
+
 	if ( i >= MAX_INVENTORY ) {
 		i = pc->search_inventory(sd,0);
 		if (i == INDEX_NOT_FOUND)
@@ -4822,7 +4819,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 			return 0;
 		}
 	}
-	
+
 	//Gender check
 	if(item->sex != 2 && sd->status.sex != item->sex)
 		return 0;
@@ -4843,7 +4840,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 		(item->class_base[(sd->class_&JOBL_2_1) ? 1 : ((sd->class_&JOBL_2_2) ? 2 : 0)])
 	))
 		return 0;
-	
+
 	//Not usable by upper class. [Haru]
 	while( 1 ) {
 		// Normal classes (no upper, no baby, no third classes)
@@ -4925,7 +4922,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
 		(itemdb_iscashfood(nameid) && DIFF_TICK(sd->canusecashfood_tick, tick) > 0)
 	)
 		return 0;
-	
+
 	/* Items with delayed consume are not meant to work while in mounts except reins of mount(12622) */
 	if( sd->inventory_data[n]->flag.delay_consume && nameid != ITEMID_REINS_OF_MOUNT ) {
 		if( sd->sc.data[SC_ALL_RIDING] )
@@ -4979,11 +4976,11 @@ int pc_useitem(struct map_session_data *sd,int n) {
 			return 0;
 		}
 	}
-	
+
 	//Dead Branch & Bloody Branch & Porings Box
 	if( nameid == ITEMID_BRANCH_OF_DEAD_TREE || nameid == ITEMID_BLOODY_DEAD_BRANCH || nameid == ITEMID_PORING_BOX )
 		logs->branch(sd);
-	
+
 	sd->itemid = sd->status.inventory[n].nameid;
 	sd->itemindex = n;
 	if(sd->catch_target_class != -1) //Abort pet catching.
@@ -5187,7 +5184,7 @@ int pc_getitemfromcart(struct map_session_data *sd,int idx,int amount)
 
 	if(item_data->nameid==0 || amount < 1 || item_data->amount<amount || sd->state.vending )
 		return 1;
-	
+
 	if((flag = pc->additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0)
 		return pc->cart_delitem(sd,idx,amount,0,LOG_TYPE_NONE);
 
@@ -5195,7 +5192,7 @@ int pc_getitemfromcart(struct map_session_data *sd,int idx,int amount)
 }
 void pc_bound_clear(struct map_session_data *sd, enum e_item_bound_type type) {
 	int i;
-	
+
 	switch( type ) {
 		/* both restricted to inventory */
 		case IBT_PARTY:
@@ -5211,7 +5208,7 @@ void pc_bound_clear(struct map_session_data *sd, enum e_item_bound_type type) {
 			break;
 		case IBT_GUILD: {
 				struct guild_storage *gstor = idb_get(gstorage->db,sd->status.guild_id);
-				
+
 				for( i = 0; i < MAX_INVENTORY; i++ ){
 					if(sd->status.inventory[i].bound == type) {
 						if( gstor )
@@ -5224,7 +5221,6 @@ void pc_bound_clear(struct map_session_data *sd, enum e_item_bound_type type) {
 			}
 			break;
 	}
-	
 }
 /*==========================================
  *  Display item stolen msg to player sd
@@ -5448,7 +5444,7 @@ int pc_setpos(struct map_session_data* sd, unsigned short map_index, int x, int
 	if( sd->state.changemap ) { // Misc map-changing settings
 		int i;
 		sd->state.pmap = sd->bl.m;
-		
+
 		for( i = 0; i < sd->queues_count; i++ ) {
 			struct hQueue *queue;
 			if( (queue = script->queue(sd->queues[i])) && queue->onMapChange[0] != '\0' ) {
@@ -5456,7 +5452,7 @@ int pc_setpos(struct map_session_data* sd, unsigned short map_index, int x, int
 				npc->event(sd, queue->onMapChange, 0);
 			}
 		}
-		
+
 		if( map->list[m].cell == (struct mapcell *)0xdeadbeaf )
 			map->cellfromcache(&map->list[m]);
 		if (sd->sc.count) { // Cancel some map related stuff.
@@ -5499,7 +5495,7 @@ int pc_setpos(struct map_session_data* sd, unsigned short map_index, int x, int
 			clif->message (sd->fd, msg_sd(sd,276)); // "You can't open a shop on this map"
 			vending->close(sd);
 		}
-		
+
 		if (map->list[sd->bl.m].channel) {
 			channel->leave(map->list[sd->bl.m].channel,sd);
 		}
@@ -5585,7 +5581,7 @@ int pc_setpos(struct map_session_data* sd, unsigned short map_index, int x, int
 		sd->md->bl.y = sd->md->ud.to_y = y;
 		sd->md->ud.dir = sd->ud.dir;
 	}
-	
+
 	/* given autotrades have no clients you have to trigger this manually otherwise they get stuck in memory limbo bugreport:7495 */
 	if( sd->state.autotrade )
 		clif->pLoadEndAck(0,sd);
@@ -5703,14 +5699,14 @@ int pc_checkskill2(struct map_session_data *sd,uint16 index) {
 	}
 	if( skill->dbs->db[index].nameid >= GD_SKILLBASE && skill->dbs->db[index].nameid < GD_MAX ) {
 		struct guild *g;
-		
+
 		if( sd->status.guild_id>0 && (g=sd->guild)!=NULL)
 			return guild->checkskill(g,skill->dbs->db[index].nameid);
 		return 0;
 	}
 	if(sd->status.skill[index].id == skill->dbs->db[index].nameid)
 		return (sd->status.skill[index].lv);
-	
+
 	return 0;
 }
 
@@ -6483,7 +6479,7 @@ int pc_stop_following (struct map_session_data *sd)
 	sd->ud.target_to = 0;
 
 	unit->stop_walking(&sd->bl, STOPWALKING_FLAG_FIXPOS);
-	
+
 	return 0;
 }
 
@@ -6622,8 +6618,6 @@ void pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsigned in
 		*job_exp  = (unsigned int) cap_value((double)*job_exp  * sd->status.mod_exp/100., 1, UINT_MAX);
 
 	}
-	
-	return;
 }
 
 /**
@@ -6704,7 +6698,7 @@ bool pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned in
 	if(job_exp)
 		clif->displayexp(sd, job_exp,  SP_JOBEXP, is_quest);
 #endif
-	
+
 	if(sd->state.showexp) {
 		char output[256];
 		sprintf(output,
@@ -6752,7 +6746,6 @@ unsigned int pc_thisbaseexp(struct map_session_data *sd)
 	return pc->exp_table[pc->class2idx(sd->status.class_)][0][sd->status.base_level-2];
 }
 
-
 /*==========================================
  * job level exp lookup
  * Return:
@@ -7002,7 +6995,7 @@ int pc_skillup(struct map_session_data *sd,uint16 skill_id) {
 
 	if( !(index = skill->get_index(skill_id)) )
 		return 0;
-	
+
 	if( sd->status.skill_point > 0 &&
 		sd->status.skill[index].id &&
 		sd->status.skill[index].flag == SKILL_FLAG_PERMANENT && //Don't allow raising while you have granted skills. [Skotlex]
@@ -7302,9 +7295,9 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 
 		if( inf2&(INF2_WEDDING_SKILL|INF2_SPIRIT_SKILL) ) //Avoid reseting wedding/linker skills.
 			continue;
-		
+
 		skill_id = skill->dbs->db[i].nameid;
-		
+
 		// Don't reset trick dead if not a novice/baby
 		if( skill_id == NV_TRICKDEAD && (sd->class_&(MAPID_BASEMASK|JOBL_2)) != MAPID_NOVICE ) {
 			sd->status.skill[i].lv = 0;
@@ -7318,7 +7311,7 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 
 		if( sd->status.skill[i].flag == SKILL_FLAG_PERM_GRANTED )
 			continue;
-		
+
 		if( flag&PCRESETSKILL_CHSEX && !skill_ischangesex(i) )
 			continue;
 
@@ -7345,7 +7338,6 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 
 	sd->status.skill_point += skill_point;
 
-
 	if (!(flag&PCRESETSKILL_RECOUNT)) {
 		// Remove all SCs that can't be inactivated without a skill
 		if( sd->sc.data[SC_STORMKICK_READY] )
@@ -7551,7 +7543,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 
 	if (sd->npc_id && sd->st && sd->st->state != RUN)
 		npc->event_dequeue(sd);
-	
+
 	pc_setglobalreg(sd,script->add_str("PC_DIE_COUNTER"),sd->die_counter+1);
 	pc->setparam(sd, SP_KILLERRID, src?src->id:0);
 
@@ -7560,15 +7552,15 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 		if( (bgd = bg->team_search(sd->bg_id)) != NULL && bgd->die_event[0] )
 			npc->event(sd, bgd->die_event, 0);
 	}
-	
+
 	for( i = 0; i < sd->queues_count; i++ ) {
 		struct hQueue *queue;
 		if( (queue = script->queue(sd->queues[i])) && queue->onDeath[0] != '\0' )
 			npc->event(sd, queue->onDeath, 0);
 	}
-	
+
 	npc->script_event(sd,NPCE_DIE);
-		
+
 	// Clear anything NPC-related when you die and was interacting with one.
 	if ( (sd->npc_id || sd->npc_shopid) && sd->state.dialog) {
 		if (sd->state.using_fake_npc) {
@@ -7666,7 +7658,6 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 			else if (sd->status.karma < ssd->status.karma) // If player killed was more good
 				ssd->status.karma++;
 
-
 			// or the PK System way...
 
 			if (sd->status.karma > 0) // player killed is dishonourable?
@@ -7718,7 +7709,6 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 	   ) {
 		unsigned int base_penalty = 0;
 		if (battle_config.death_penalty_base > 0) {
-			
 			switch (battle_config.death_penalty_type) {
 				case 1:
 					base_penalty = (unsigned int) ((double)pc->nextbaseexp(sd) * (double)battle_config.death_penalty_base/10000);
@@ -7727,7 +7717,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 					base_penalty = (unsigned int) ((double)sd->status.base_exp * (double)battle_config.death_penalty_base/10000);
 					break;
 			}
-			
+
 			if(base_penalty) {
 				if (battle_config.pk_mode && src && src->type==BL_PC)
 					base_penalty*=2;
@@ -7737,10 +7727,10 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 				clif->updatestatus(sd,SP_BASEEXP);
 			}
 		}
-		
+
 		if(battle_config.death_penalty_job > 0) {
 			base_penalty = 0;
-			
+
 			switch (battle_config.death_penalty_type) {
 				case 1:
 					base_penalty = (unsigned int) ((double)pc->nextjobexp(sd) * (double)battle_config.death_penalty_job/10000);
@@ -7749,7 +7739,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 					base_penalty = (unsigned int) ((double)sd->status.job_exp * (double)battle_config.death_penalty_job/10000);
 					break;
 			}
-			
+
 			if(base_penalty) {
 				if (battle_config.pk_mode && src && src->type==BL_PC)
 					base_penalty*=2;
@@ -7759,7 +7749,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 				clif->updatestatus(sd,SP_JOBEXP);
 			}
 		}
-		
+
 		if(battle_config.zeny_penalty > 0 && !map->list[sd->bl.m].flag.nozenypenalty) {
 			base_penalty = (unsigned int)((double)sd->status.zeny * (double)battle_config.zeny_penalty / 10000.);
 			if(base_penalty)
@@ -8026,7 +8016,6 @@ int pc_readparam(struct map_session_data* sd,int type)
 		case SP_VARCASTRATE:     val = sd->bonus.varcastrate; break;
 		case SP_ADD_VARIABLECAST:val = sd->bonus.add_varcast; break;
 #endif
-			
 	}
 
 	return val;
@@ -8432,7 +8421,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper)
 		/* going off star glad lineage, reset feel to not store no-longer-used vars in the database */
 		pc->resetfeel(sd);
 	}
-	
+
 	sd->status.class_ = job;
 	fame_flag = pc->famerank(sd->status.char_id,sd->class_&MAPID_UPPERMASK);
 	sd->class_ = (unsigned short)b_class;
@@ -8695,7 +8684,7 @@ int pc_setoption(struct map_session_data *sd,int type)
 		new_look = JOB_STAR_GLADIATOR2;
 	else if (!(type&OPTION_FLYING) && p_type&OPTION_FLYING)
 		new_look = -1;
-	
+
 	if (sd->disguise != -1 || !new_look)
 		return 0; //Disguises break sprite changes
 
@@ -8941,7 +8930,7 @@ int pc_readreg(struct map_session_data* sd, int64 reg) {
  **/
 void pc_setreg(struct map_session_data* sd, int64 reg, int val) {
 	unsigned int index = script_getvaridx(reg);
-	
+
 	if( val ) {
 		i64db_iput(sd->regs.vars, reg, val);
 		if( index )
@@ -8960,7 +8949,7 @@ char* pc_readregstr(struct map_session_data* sd, int64 reg) {
 	struct script_reg_str *p = NULL;
 
 	p = i64db_get(sd->regs.vars, reg);
-	
+
 	return p ? p->value : NULL;
 }
 /**
@@ -8973,10 +8962,10 @@ void pc_setregstr(struct map_session_data* sd, int64 reg, const char* str) {
 
 	if( str[0] ) {
 		p = ers_alloc(pc->str_reg_ers, struct script_reg_str);
-		
+
 		p->value = aStrdup(str);
 		p->flag.type = 1;
-		
+
 		if( sd->regs.vars->put(sd->regs.vars, DB->i642key(reg), DB->ptr2data(p), &prev) ) {
 			p = DB->data2ptr(&prev);
 			if( p->value )
@@ -9005,7 +8994,7 @@ void pc_setregstr(struct map_session_data* sd, int64 reg, const char* str) {
  **/
 int pc_readregistry(struct map_session_data *sd, int64 reg) {
 	struct script_reg_num *p = NULL;
-	
+
 	if (!sd->vars_ok) {
 		ShowError("pc_readregistry: Trying to read reg %s before it's been loaded!\n", script->get_str(script_getvarid(reg)));
 		//This really shouldn't happen, so it's possible the data was lost somewhere, we should request it again.
@@ -9013,7 +9002,7 @@ int pc_readregistry(struct map_session_data *sd, int64 reg) {
 		sockt->eof(sd->fd);
 		return 0;
 	}
-	
+
 	p = i64db_get(sd->regs.vars, reg);
 
 	return p ? p->value : 0;
@@ -9026,7 +9015,7 @@ int pc_readregistry(struct map_session_data *sd, int64 reg) {
  **/
 char* pc_readregistry_str(struct map_session_data *sd, int64 reg) {
 	struct script_reg_str *p = NULL;
-	
+
 	if (!sd->vars_ok) {
 		ShowError("pc_readregistry_str: Trying to read reg %s before it's been loaded!\n", script->get_str(script_getvarid(reg)));
 		//This really shouldn't happen, so it's possible the data was lost somewhere, we should request it again.
@@ -9036,7 +9025,7 @@ char* pc_readregistry_str(struct map_session_data *sd, int64 reg) {
 	}
 
 	p = i64db_get(sd->regs.vars, reg);
-	
+
 	return p ? p->value : NULL;
 }
 /**
@@ -9073,12 +9062,12 @@ int pc_setregistry(struct map_session_data *sd, int64 reg, int val) {
 			}
 			break;
 	}
-	
+
 	if ( !pc->reg_load && !sd->vars_ok ) {
 		ShowError("pc_setregistry : refusing to set %s until vars are received.\n", regname);
 		return 0;
 	}
-	
+
 	if( (p = i64db_get(sd->regs.vars, reg) ) ) {
 		if( val ) {
 			if( !p->value && index ) /* its a entry that was deleted, so we reset array */
@@ -9093,22 +9082,22 @@ int pc_setregistry(struct map_session_data *sd, int64 reg, int val) {
 			p->flag.update = 1;/* either way, it will require either delete or replace */
 	} else if( val ) {
 		DBData prev;
-		
+
 		if( index )
 			script->array_update(&sd->regs, reg, false);
-		
+
 		p = ers_alloc(pc->num_reg_ers, struct script_reg_num);
-		
+
 		p->value = val;
 		if( !pc->reg_load )
 			p->flag.update = 1;
-		
+
 		if( sd->regs.vars->put(sd->regs.vars, DB->i642key(reg), DB->ptr2data(p), &prev) ) {
 			p = DB->data2ptr(&prev);
 			ers_free(pc->num_reg_ers, p);
 		}
 	}
-	
+
 	if( !pc->reg_load && p )
 		sd->vars_dirty = true;
 
@@ -9151,12 +9140,12 @@ int pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
 			script->array_update(&sd->regs, reg, false);
 
 		p = ers_alloc(pc->str_reg_ers, struct script_reg_str);
-		
+
 		p->value = aStrdup(val);
 		if( !pc->reg_load )
 			p->flag.update = 1;
 		p->flag.type = 1;
-		
+
 		if( sd->regs.vars->put(sd->regs.vars, DB->i642key(reg), DB->ptr2data(p), &prev) ) {
 			p = DB->data2ptr(&prev);
 			if( p->value )
@@ -9164,10 +9153,10 @@ int pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
 			ers_free(pc->str_reg_ers, p);
 		}
 	}
-	
+
 	if( !pc->reg_load && p )
 		sd->vars_dirty = true;
-	
+
 	return 1;
 }
 
@@ -9295,7 +9284,7 @@ int pc_checkcombo(struct map_session_data *sd, struct item_data *data ) {
 		/* ensure this isn't a duplicate combo */
 		if( sd->combos != NULL ) {
 			int x;
-			
+
 			ARR_FIND( 0, sd->combo_count, x, sd->combos[x].id == data->combos[i]->id );
 
 			/* found a match, skip this combo */
@@ -9316,7 +9305,7 @@ int pc_checkcombo(struct map_session_data *sd, struct item_data *data ) {
 
 				if(!sd->inventory_data[index])
 					continue;
-				
+
 				if ( itemdb_type(id) != IT_CARD ) {
 					if ( sd->inventory_data[index]->nameid != id )
 						continue;
@@ -9351,15 +9340,13 @@ int pc_checkcombo(struct map_session_data *sd, struct item_data *data ) {
 		/* we got here, means all items in the combo are matching */
 
 		RECREATE(sd->combos, struct pc_combos, ++sd->combo_count);
-		
 		combo = &sd->combos[sd->combo_count - 1];
-		
 		combo->bonus = data->combos[i]->script;
 		combo->id = data->combos[i]->id;
-		
+
 		success++;
 	}
-	
+
 	return success;
 }
 
@@ -9369,11 +9356,11 @@ int pc_removecombo(struct map_session_data *sd, struct item_data *data ) {
 
 	if( !sd->combos )
 		return 0;/* nothing to do here, player has no combos */
-	
+
 	for( i = 0; i < data->combos_count; i++ ) {
 		/* check if this combo exists in this user */
 		int x = 0, cursor = 0, j;
-		
+
 		ARR_FIND( 0, sd->combo_count, x, sd->combos[x].id == data->combos[i]->id );
 		/* no match, skip this combo */
 		if( x == sd->combo_count )
@@ -9381,9 +9368,9 @@ int pc_removecombo(struct map_session_data *sd, struct item_data *data ) {
 
 		sd->combos[x].bonus = NULL;
 		sd->combos[x].id = 0;
-		
+
 		retval++;
-		
+
 		for( j = 0, cursor = 0; j < sd->combo_count; j++ ) {
 			if( sd->combos[j].bonus == NULL )
 				continue;
@@ -9395,7 +9382,7 @@ int pc_removecombo(struct map_session_data *sd, struct item_data *data ) {
 
 			cursor++;
 		}
-		
+
 		/* it's empty, we can clear all the memory */
 		if( (sd->combo_count = cursor) == 0 ) {
 			aFree(sd->combos);
@@ -9403,7 +9390,7 @@ int pc_removecombo(struct map_session_data *sd, struct item_data *data ) {
 			break;
 		}
 	}
-	
+
 	/* check if combo requirements still fit -- don't touch retval! */
 	pc->checkcombo( sd, data );
 
@@ -9569,7 +9556,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
 		sd->status.inventory[n].bound = (unsigned char)IBT_CHARACTER;
 		clif->notify_bounditem(sd,n);
 	}
-	
+
 	if(pos == EQP_ACC) { //Accesories should only go in one of the two,
 		pos = req_pos&EQP_ACC;
 		if (pos == EQP_ACC) //User specified both slots..
@@ -9640,7 +9627,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
 	status_calc_pc(sd,SCO_NONE);
 	if (flag) //Update skill data
 		clif->skillinfoblock(sd);
-	
+
 	//OnEquip script [Skotlex]
 	if (id->equip_script)
 		script->run_item_equip_script(sd, id, npc->fake_nd->bl.id);
@@ -9907,7 +9894,7 @@ int pc_checkitem(struct map_session_data *sd)
 			if ( !sd->status.cart[i].unique_id && !itemdb->isstackable(id) )
 				sd->status.cart[i].unique_id = itemdb->unique_id(sd);
 		}
-		
+
 		for( i = 0; i < MAX_STORAGE; i++ ) {
 			id = sd->status.storage.items[i].nameid;
 
@@ -9924,7 +9911,7 @@ int pc_checkitem(struct map_session_data *sd)
 			if ( !sd->status.storage.items[i].unique_id && !itemdb->isstackable(id) )
 				sd->status.storage.items[i].unique_id = itemdb->unique_id(sd);
 		}
-		
+
 		if (sd->guild) {
 			struct guild_storage *guild_storage = idb_get(gstorage->db,sd->guild->guild_id);
 			if (guild_storage) {
@@ -10399,7 +10386,7 @@ bool pc_can_use_command(struct map_session_data *sd, const char *command) {
 
 /**
  * Spirit Charm expiration timer.
- * 
+ *
  * @see TimerFunc
  */
 int pc_charm_timer(int tid, int64 tick, int id, intptr_t data)
@@ -10437,7 +10424,7 @@ int pc_charm_timer(int tid, int64 tick, int id, intptr_t data)
 
 /**
  * Adds a spirit charm.
- * 
+ *
  * @param sd       Target character.
  * @param interval Duration.
  * @param max      Maximum amount of charms to add.
@@ -10480,7 +10467,7 @@ void pc_add_charm(struct map_session_data *sd, int interval, int max, int type)
 
 /**
  * Removes one or more spirit charms.
- * 
+ *
  * @param sd    The target character.
  * @param count Amount of charms to remove.
  * @param type  Type of charm to remove.
@@ -10622,32 +10609,32 @@ void pc_read_skill_tree(void) {
 	int i = 0;
 	struct s_mapiterator *iter;
 	struct map_session_data *sd;
-	
+
 	if (libconfig->read_file(&skill_tree_conf, config_filename)) {
 		ShowError("can't read %s\n", config_filename);
 		return;
 	}
-		
+
 	while ((skt = libconfig->setting_get_elem(skill_tree_conf.root,i++))) {
 		int k;
 		const char *name = config_setting_name(skt);
-		
+
 		if ( (k = pc->check_job_name(name)) == -1 ) {
 			ShowWarning("pc_read_skill_tree: '%s' unknown job name!\n", name);
 			continue;
 		}
-				
+
 		if( ( skills = libconfig->setting_get_member(skt,"skills") ) ) {
 			int c = 0;
 			int idx = pc->class2idx(k);
-			
+
 			while ((sk = libconfig->setting_get_elem(skills,c++))) {
 				const char *sk_name = config_setting_name(sk);
 				int skill_id;
-				
+
 				if( ( skill_id = skill->name2id(sk_name) ) ) {
 					int skidx, offset = 0, h = 0, rlen = 0;
-					
+
 					ARR_FIND( 0, MAX_SKILL_TREE, skidx, pc->skill_tree[idx][skidx].id == 0 || pc->skill_tree[idx][skidx].id == skill_id );
 					if (skidx == MAX_SKILL_TREE) {
 						ShowWarning("pc_read_skill_tree: Unable to load skill %d (%s) into '%s's tree. Maximum number of skills per class has been reached.\n", skill_id, sk_name, name);
@@ -10655,10 +10642,10 @@ void pc_read_skill_tree(void) {
 					} else if (pc->skill_tree[idx][skidx].id) {
 						ShowNotice("pc_read_skill_tree: Overwriting %d for '%s' (%d)\n", skill_id, name, k);
 					}
-					
+
 					pc->skill_tree[idx][skidx].id    = skill_id;
 					pc->skill_tree[idx][skidx].idx   = skill->get_index(skill_id);
-					
+
 					if( config_setting_is_group(sk) ) {
 						int max = 0, jlevel = 0;
 						libconfig->setting_lookup_int(sk, "MaxLevel", &max);
@@ -10671,7 +10658,7 @@ void pc_read_skill_tree(void) {
 						pc->skill_tree[idx][skidx].max = (unsigned char)libconfig->setting_get_int(sk);
 						pc->skill_tree[idx][skidx].joblv = 0;
 					}
-					
+
 					for (h = offset; h < rlen && h < MAX_PC_SKILL_REQUIRE; h++) {
 						config_setting_t *rsk = libconfig->setting_get_elem(sk,h);
 						int rskid;
@@ -10685,19 +10672,18 @@ void pc_read_skill_tree(void) {
 							ShowWarning("pc_read_skill_tree: error for '%s' in '%s'\n",sk_name,name);
 						}
 					}
-					
 				} else {
 					ShowWarning("pc_read_skill_tree: unknown skill '%s' in '%s'\n",sk_name,name);
 				}
 			}
 		}
 	}
-	
+
 	i = 0;
 	while( (skt = libconfig->setting_get_elem(skill_tree_conf.root,i++)) ) {
 		int k, idx;
 		const char *name = config_setting_name(skt);
-		
+
 		if ( (k = pc->check_job_name(name)) == -1 ) {
 			ShowWarning("pc_read_skill_tree: '%s' unknown job name!\n", name);
 			continue;
@@ -10735,9 +10721,8 @@ void pc_read_skill_tree(void) {
 
 			}
 		}
-		
 	}
-	
+
 	libconfig->destroy(&skill_tree_conf);
 
 	/* lets update all players skill tree */
@@ -11024,7 +11009,7 @@ void pc_itemcd_do(struct map_session_data *sd, bool load) {
 
 void pc_bank_deposit(struct map_session_data *sd, int money) {
 	unsigned int limit_check = money+sd->status.bank_vault;
-	
+
 	if( money <= 0 || limit_check > MAX_BANK_ZENY ) {
 		clif->bank_deposit(sd,BDA_OVERFLOW);
 		return;
@@ -11044,7 +11029,7 @@ void pc_bank_deposit(struct map_session_data *sd, int money) {
 }
 void pc_bank_withdraw(struct map_session_data *sd, int money) {
 	unsigned int limit_check = money+sd->status.zeny;
-	
+
 	if (money <= 0) {
 		clif->bank_withdraw(sd,BWA_UNKNOWN_ERROR);
 		return;
@@ -11056,7 +11041,7 @@ void pc_bank_withdraw(struct map_session_data *sd, int money) {
 		clif->messagecolor_self(sd->fd, COLOR_RED, msg_sd(sd,1482));
 		return;
 	}
-	
+
 	if( pc->getzeny(sd,money, LOG_TYPE_BANK, NULL) )
 		clif->bank_withdraw(sd,BWA_NO_MONEY);
 	else {
@@ -11070,16 +11055,16 @@ void pc_bank_withdraw(struct map_session_data *sd, int money) {
 void pc_scdata_received(struct map_session_data *sd) {
 	pc->inventory_rentals(sd);
 	clif->show_modifiers(sd);
-	
+
 	if (sd->expiration_time != 0) { // don't display if it's unlimited or unknow value
 		time_t exp_time = sd->expiration_time;
 		char tmpstr[1024];
 		strftime(tmpstr, sizeof(tmpstr) - 1, msg_sd(sd,501), localtime(&exp_time)); // "Your account time limit is: %d-%m-%Y %H:%M:%S."
 		clif->wis_message(sd->fd, map->wisp_server_name, tmpstr, strlen(tmpstr)+1);
-		
+
 		pc->expire_check(sd);
 	}
-	
+
 	if( sd->state.standalone ) {
 		clif->pLoadEndAck(0,sd);
 		pc->autotrade_populate(sd);
@@ -11088,16 +11073,16 @@ void pc_scdata_received(struct map_session_data *sd) {
 }
 int pc_expiration_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd = map->id2sd(id);
-	
+
 	if( !sd ) return 0;
-	
+
 	sd->expiration_tid = INVALID_TIMER;
-	
+
 	if( sd->fd )
 		clif->authfail_fd(sd->fd,10);
-	
+
 	map->quit(sd);
-	
+
 	return 0;
 }
 /* This timer exists only when a character with an expire timer > 24h is online */
@@ -11107,30 +11092,26 @@ int pc_global_expiration_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data* sd;
 
 	iter = mapit_getallusers();
-	
 	for( sd = (TBL_PC*)mapit->first(iter); mapit->exists(iter); sd = (TBL_PC*)mapit->next(iter) ) {
 		if( sd->expiration_time )
 			pc->expire_check(sd);
 	}
-	
 	mapit->free(iter);
-	
+
 	return 0;
 }
 void pc_expire_check(struct map_session_data *sd) {
 	/* ongoing timer */
 	if( sd->expiration_tid != INVALID_TIMER )
 		return;
-	
+
 	/* not within the next 24h, enable the global check */
 	if( sd->expiration_time > ( time(NULL) + ( ( 60 * 60 ) * 24 ) ) ) {
-		
 		/* global check not running, enable */
 		if( pc->expiration_tid == INVALID_TIMER ) {
 			/* starts in 1h, repeats every hour */
 			pc->expiration_tid = timer->add_interval(timer->gettick() + ((1000*60)*60), pc->global_expiration_timer, 0, 0, ((1000*60)*60));
 		}
-		
 		return;
 	}
 
@@ -11142,33 +11123,31 @@ void pc_expire_check(struct map_session_data *sd) {
 void pc_autotrade_load(void)
 {
 	char *data;
-	
+
 	if (SQL_ERROR == SQL->Query(map->mysql_handle, "SELECT `account_id`,`char_id`,`sex`,`title` FROM `%s`",map->autotrade_merchants_db))
 		Sql_ShowDebug(map->mysql_handle);
-	
+
 	while (SQL_SUCCESS == SQL->NextRow(map->mysql_handle)) {
 		struct map_session_data *sd;
 		int account_id, char_id;
 		char title[MESSAGE_SIZE];
 		unsigned char sex;
-		
+
 		SQL->GetData(map->mysql_handle, 0, &data, NULL); account_id = atoi(data);
 		SQL->GetData(map->mysql_handle, 1, &data, NULL); char_id = atoi(data);
 		SQL->GetData(map->mysql_handle, 2, &data, NULL); sex = atoi(data);
 		SQL->GetData(map->mysql_handle, 3, &data, NULL); safestrncpy(title, data, sizeof(title));
 
 		CREATE(sd, TBL_PC, 1);
-		
+
 		pc->setnewpc(sd, account_id, char_id, 0, 0, sex, 0);
-		
+
 		safestrncpy(sd->message, title, MESSAGE_SIZE);
-		
 		sd->state.standalone = 1;
 		sd->group = pcg->get_dummy_group();
-		
+
 		chrif->authreq(sd,true);
 	}
-		
 	SQL->FreeResult(map->mysql_handle);
 }
 /**
@@ -11184,17 +11163,16 @@ void pc_autotrade_start(struct map_session_data *sd) {
 
 	while( SQL_SUCCESS == SQL->NextRow(map->mysql_handle) ) {
 		int itemkey, amount, price;
-		
+
 		SQL->GetData(map->mysql_handle, 0, &data, NULL); itemkey = atoi(data);
 		SQL->GetData(map->mysql_handle, 1, &data, NULL); amount = atoi(data);
 		SQL->GetData(map->mysql_handle, 2, &data, NULL); price = atoi(data);
 
 		ARR_FIND(0, MAX_CART, i, sd->status.cart[i].id == itemkey);
-				
 		if( i != MAX_CART && itemdb_cantrade(&sd->status.cart[i], 0, 0) ) {
 			if( amount > sd->status.cart[i].amount )
 				amount = sd->status.cart[i].amount;
-			
+
 			if( amount ) {
 				sd->vending[count].index = i;
 				sd->vending[count].amount = amount;
@@ -11204,7 +11182,7 @@ void pc_autotrade_start(struct map_session_data *sd) {
 			}
 		}
 	}
-		
+
 	if( !count ) {
 		pc->autotrade_update(sd,PAUC_REMOVE);
 		map->quit(sd);
@@ -11223,13 +11201,13 @@ void pc_autotrade_start(struct map_session_data *sd) {
  **/
 void pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_update_action action) {
 	int i;
-	
+
 	/* either way, this goes down */
 	if( action != PAUC_START ) {
 		if (SQL_ERROR == SQL->Query(map->mysql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'",map->autotrade_data_db,sd->status.char_id))
 			Sql_ShowDebug(map->mysql_handle);
 	}
-	
+
 	switch( action ) {
 		case PAUC_REMOVE:
 			if (SQL_ERROR == SQL->Query(map->mysql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d' LIMIT 1",map->autotrade_merchants_db,sd->status.char_id))
@@ -11237,7 +11215,7 @@ void pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_update
 			break;
 		case PAUC_START: {
 			char title[MESSAGE_SIZE*2+1];
-			
+
 			SQL->EscapeStringLen(map->mysql_handle, title, sd->message, strnlen(sd->message, MESSAGE_SIZE));
 
 			if (SQL_ERROR == SQL->Query(map->mysql_handle, "INSERT INTO `%s` (`account_id`,`char_id`,`sex`,`title`) VALUES ('%d','%d','%d','%s')",
@@ -11254,7 +11232,7 @@ void pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_update
 			for( i = 0; i < sd->vend_num; i++ ) {
 				if( sd->vending[i].amount == 0 )
 					continue;
-				
+
 				if (SQL_ERROR == SQL->Query(map->mysql_handle, "INSERT INTO `%s` (`char_id`,`itemkey`,`amount`,`price`) VALUES ('%d','%d','%d','%d')",
 											map->autotrade_data_db,
 											sd->status.char_id,
@@ -11278,25 +11256,25 @@ void pc_autotrade_prepare(struct map_session_data *sd) {
 	unsigned char sex;
 
 	CREATE(data, struct autotrade_vending, 1);
-	
+
 	memcpy(data->vending, sd->vending, sizeof(sd->vending));
-	
+
 	for(i = 0; i < sd->vend_num; i++) {
 		if( sd->vending[i].amount ) {
 			memcpy(&data->list[cursor],&sd->status.cart[sd->vending[i].index],sizeof(struct item));
 			cursor++;
 		}
 	}
-	
+
 	data->vend_num = (unsigned char)cursor;
-	
+
 	idb_put(pc->at_db, sd->status.char_id, data);
-	
+
 	account_id = sd->status.account_id;
 	char_id = sd->status.char_id;
 	sex = sd->status.sex;
 	safestrncpy(title, sd->message, sizeof(title));
-	
+
 	sd->npc_id = 0;
 	sd->npc_shopid = 0;
 	if (sd->st) {
@@ -11307,11 +11285,10 @@ void pc_autotrade_prepare(struct map_session_data *sd) {
 	chrif->auth_delete(account_id, char_id, ST_LOGOUT);
 
 	CREATE(sd, TBL_PC, 1);
-	
+
 	pc->setnewpc(sd, account_id, char_id, 0, 0, sex, 0);
-	
+
 	safestrncpy(sd->message, title, MESSAGE_SIZE);
-	
 	sd->state.standalone = 1;
 	sd->group = pcg->get_dummy_group();
 
@@ -11330,7 +11307,7 @@ void pc_autotrade_populate(struct map_session_data *sd) {
 	for(i = 0; i < data->vend_num; i++) {
 		if( !data->vending[i].amount )
 			continue;
-		
+
 		for(j = 0; j < MAX_CART; j++) {
 			if( !memcmp((char*)(&data->list[i]) + sizeof(data->list[0].id), (char*)(&sd->status.cart[j]) + sizeof(data->list[0].id), sizeof(struct item) - sizeof(data->list[0].id)) ) {
 				if( cursor ) {
@@ -11341,20 +11318,20 @@ void pc_autotrade_populate(struct map_session_data *sd) {
 				break;
 			}
 		}
-		
+
 		if( j != MAX_CART ) {
 			sd->vending[cursor].index = j;
 			sd->vending[cursor].amount = data->vending[i].amount;
 			sd->vending[cursor].value = data->vending[i].value;
-			
+
 			cursor++;
 		}
 	}
-	
+
 	sd->vend_num = cursor;
 
 	pc->autotrade_update(sd,PAUC_START);
-	
+
 	for(i = 0; i < data->hdatac; i++ ) {
 		if( data->hdata[i]->flag.free ) {
 			aFree(data->hdata[i]->data);
@@ -11363,7 +11340,7 @@ void pc_autotrade_populate(struct map_session_data *sd) {
 	}
 	if( data->hdata )
 		aFree(data->hdata);
-	
+
 	idb_remove(pc->at_db, sd->status.char_id);
 }
 
@@ -11399,12 +11376,11 @@ bool pc_db_checkid(unsigned int class_)
 }
 
 void do_final_pc(void) {
-	
 	db_destroy(pc->itemcd_db);
 	pc->at_db->destroy(pc->at_db,pc->autotrade_final);
-	
+
 	pcg->final();
-	
+
 	ers_destroy(pc->sc_display_ers);
 	ers_destroy(pc->num_reg_ers);
 	ers_destroy(pc->str_reg_ers);
@@ -11415,12 +11391,12 @@ void do_final_pc(void) {
 void do_init_pc(bool minimal) {
 	if (minimal)
 		return;
-	
+
 	pc->itemcd_db = idb_alloc(DB_OPT_RELEASE_DATA);
 	pc->at_db = idb_alloc(DB_OPT_RELEASE_DATA);
-	
+
 	pc->readdb();
-	
+
 	timer->add_func_list(pc->invincible_timer, "pc_invincible_timer");
 	timer->add_func_list(pc->eventtimer, "pc_eventtimer");
 	timer->add_func_list(pc->inventory_rental_end, "pc_inventory_rental_end");
@@ -11432,25 +11408,25 @@ void do_init_pc(bool minimal) {
 	timer->add_func_list(pc->charm_timer, "pc_charm_timer");
 	timer->add_func_list(pc->global_expiration_timer,"pc_global_expiration_timer");
 	timer->add_func_list(pc->expiration_timer,"pc_expiration_timer");
-	
+
 	timer->add(timer->gettick() + map->autosave_interval, pc->autosave, 0, 0);
-	
+
 	// 0=day, 1=night [Yor]
 	map->night_flag = battle_config.night_at_start ? 1 : 0;
-	
+
 	if (battle_config.day_duration > 0 && battle_config.night_duration > 0) {
 		int day_duration = battle_config.day_duration;
 		int night_duration = battle_config.night_duration;
 		// add night/day timer [Yor]
 		timer->add_func_list(pc->map_day_timer, "pc_map_day_timer");
 		timer->add_func_list(pc->map_night_timer, "pc_map_night_timer");
-		
+
 		pc->day_timer_tid   = timer->add_interval(timer->gettick() + (map->night_flag ? 0 : day_duration) + night_duration, pc->map_day_timer,   0, 0, day_duration + night_duration);
 		pc->night_timer_tid = timer->add_interval(timer->gettick() + day_duration + (map->night_flag ? night_duration : 0), pc->map_night_timer, 0, 0, day_duration + night_duration);
 	}
-	
+
 	pcg->init();
-	
+
 	pc->sc_display_ers = ers_new(sizeof(struct sc_display_entry), "pc.c:sc_display_ers", ERS_OPT_FLEX_CHUNK);
 	pc->num_reg_ers = ers_new(sizeof(struct script_reg_num), "pc.c::num_reg_ers", ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK);
 	pc->str_reg_ers = ers_new(sizeof(struct script_reg_str), "pc.c::str_reg_ers", ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK);
@@ -11503,7 +11479,7 @@ void pc_defaults(void) {
 
 	pc->get_dummy_sd = pc_get_dummy_sd;
 	pc->class2idx = pc_class2idx;
-	
+
 	pc->can_use_command = pc_can_use_command;
 	pc->set_group = pc_set_group;
 	pc->should_log_commands = pc_should_log_commands;
@@ -11515,25 +11491,25 @@ void pc_defaults(void) {
 	pc->authok = pc_authok;
 	pc->authfail = pc_authfail;
 	pc->reg_received = pc_reg_received;
-	
+
 	pc->isequip = pc_isequip;
 	pc->equippoint = pc_equippoint;
 	pc->setinventorydata = pc_setinventorydata;
-	
+
 	pc->checkskill = pc_checkskill;
 	pc->checkskill2 = pc_checkskill2;
 	pc->checkallowskill = pc_checkallowskill;
 	pc->checkequip = pc_checkequip;
-	
+
 	pc->calc_skilltree = pc_calc_skilltree;
 	pc->calc_skilltree_normalize_job = pc_calc_skilltree_normalize_job;
 	pc->clean_skilltree = pc_clean_skilltree;
-	
+
 	pc->setpos = pc_setpos;
 	pc->setsavepoint = pc_setsavepoint;
 	pc->randomwarp = pc_randomwarp;
 	pc->memo = pc_memo;
-	
+
 	pc->checkadditem = pc_checkadditem;
 	pc->inventoryblank = pc_inventoryblank;
 	pc->search_inventory = pc_search_inventory;
@@ -11544,47 +11520,47 @@ void pc_defaults(void) {
 	// Special Shop System
 	pc->paycash = pc_paycash;
 	pc->getcash = pc_getcash;
-	
+
 	pc->cart_additem = pc_cart_additem;
 	pc->cart_delitem = pc_cart_delitem;
 	pc->putitemtocart = pc_putitemtocart;
 	pc->getitemfromcart = pc_getitemfromcart;
 	pc->cartitem_amount = pc_cartitem_amount;
-	
+
 	pc->takeitem = pc_takeitem;
 	pc->dropitem = pc_dropitem;
-	
+
 	pc->isequipped = pc_isequipped;
 	pc->can_Adopt = pc_can_Adopt;
 	pc->adoption = pc_adoption;
-	
+
 	pc->updateweightstatus = pc_updateweightstatus;
-	
+
 	pc->addautobonus = pc_addautobonus;
 	pc->exeautobonus = pc_exeautobonus;
 	pc->endautobonus = pc_endautobonus;
 	pc->delautobonus = pc_delautobonus;
-	
+
 	pc->bonus = pc_bonus;
 	pc->bonus2 = pc_bonus2;
 	pc->bonus3 = pc_bonus3;
 	pc->bonus4 = pc_bonus4;
 	pc->bonus5 = pc_bonus5;
 	pc->skill = pc_skill;
-	
+
 	pc->insert_card = pc_insert_card;
 	pc->can_insert_card = pc_can_insert_card;
 	pc->can_insert_card_into = pc_can_insert_card_into;
 
 	pc->steal_item = pc_steal_item;
 	pc->steal_coin = pc_steal_coin;
-	
+
 	pc->modifybuyvalue = pc_modifybuyvalue;
 	pc->modifysellvalue = pc_modifysellvalue;
-	
+
 	pc->follow = pc_follow; // [MouseJstr]
 	pc->stop_following = pc_stop_following;
-	
+
 	pc->maxbaselv = pc_maxbaselv;
 	pc->maxjoblv = pc_maxjoblv;
 	pc->checkbaselevelup = pc_checkbaselevelup;
@@ -11612,11 +11588,11 @@ void pc_defaults(void) {
 	pc->unequipitem_pos = pc_unequipitem_pos;
 	pc->checkitem = pc_checkitem;
 	pc->useitem = pc_useitem;
-	
+
 	pc->skillatk_bonus = pc_skillatk_bonus;
 	pc->skillheal_bonus = pc_skillheal_bonus;
 	pc->skillheal2_bonus = pc_skillheal2_bonus;
-	
+
 	pc->damage = pc_damage;
 	pc->dead = pc_dead;
 	pc->revive = pc_revive;
@@ -11633,7 +11609,7 @@ void pc_defaults(void) {
 	pc->setridingwug = pc_setridingwug;
 	pc->changelook = pc_changelook;
 	pc->equiplookall = pc_equiplookall;
-	
+
 	pc->readparam = pc_readparam;
 	pc->setparam = pc_setparam;
 	pc->readreg = pc_readreg;
@@ -11644,15 +11620,15 @@ void pc_defaults(void) {
 	pc->setregistry = pc_setregistry;
 	pc->readregistry_str = pc_readregistry_str;
 	pc->setregistry_str = pc_setregistry_str;
-	
+
 	pc->addeventtimer = pc_addeventtimer;
 	pc->deleventtimer = pc_deleventtimer;
 	pc->cleareventtimer = pc_cleareventtimer;
 	pc->addeventtimercount = pc_addeventtimercount;
-	
+
 	pc->calc_pvprank = pc_calc_pvprank;
 	pc->calc_pvprank_timer = pc_calc_pvprank_timer;
-	
+
 	pc->ismarried = pc_ismarried;
 	pc->marriage = pc_marriage;
 	pc->divorce = pc_divorce;
@@ -11660,30 +11636,30 @@ void pc_defaults(void) {
 	pc->get_father = pc_get_father;
 	pc->get_mother = pc_get_mother;
 	pc->get_child = pc_get_child;
-	
+
 	pc->bleeding = pc_bleeding;
 	pc->regen = pc_regen;
-	
+
 	pc->setstand = pc_setstand;
 	pc->candrop = pc_candrop;
 	pc->can_talk = pc_can_talk;
 	pc->can_attack = pc_can_attack;
-	
+
 	pc->jobid2mapid = pc_jobid2mapid; // Skotlex
 	pc->mapid2jobid = pc_mapid2jobid; // Skotlex
-	
+
 	pc->job_name = job_name;
-	
+
 	pc->setinvincibletimer = pc_setinvincibletimer;
 	pc->delinvincibletimer = pc_delinvincibletimer;
-	
+
 	pc->addspiritball = pc_addspiritball;
 	pc->delspiritball = pc_delspiritball;
 	pc->addfame = pc_addfame;
 	pc->famerank = pc_famerank;
 	pc->set_hate_mob = pc_set_hate_mob;
 	pc->getmaxspiritball = pc_getmaxspiritball;
-	
+
 	pc->readdb = pc_readdb;
 	pc->map_day_timer = map_day_timer; // by [yor]
 	pc->map_night_timer = map_night_timer; // by [yor]
@@ -11691,26 +11667,24 @@ void pc_defaults(void) {
 	pc->inventory_rentals = pc_inventory_rentals;
 	pc->inventory_rental_clear = pc_inventory_rental_clear;
 	pc->inventory_rental_add = pc_inventory_rental_add;
-	
+
 	pc->disguise = pc_disguise;
 	pc->isautolooting = pc_isautolooting;
-	
+
 	pc->overheat = pc_overheat;
-	
 	pc->banding = pc_banding;
-	
+
 	pc->itemcd_do = pc_itemcd_do;
-	
 	pc->load_combo = pc_load_combo;
-	
+
 	pc->add_charm = pc_add_charm;
 	pc->del_charm = pc_del_charm;
-	
+
 	pc->baselevelchanged = pc_baselevelchanged;
 	pc->level_penalty_mod = pc_level_penalty_mod;
-	
+
 	pc->calc_skillpoint = pc_calc_skillpoint;
-	
+
 	pc->invincible_timer = pc_invincible_timer;
 	pc->spiritball_timer = pc_spiritball_timer;
 	pc->check_banding = pc_check_banding;
@@ -11738,15 +11712,15 @@ void pc_defaults(void) {
 	pc->checkcombo = pc_checkcombo;
 	pc->calcweapontype = pc_calcweapontype;
 	pc->removecombo = pc_removecombo;
-	
+
 	pc->bank_withdraw = pc_bank_withdraw;
 	pc->bank_deposit = pc_bank_deposit;
-	
+
 	pc->rental_expire = pc_rental_expire;
 	pc->scdata_received = pc_scdata_received;
-	
+
 	pc->bound_clear = pc_bound_clear;
-	
+
 	pc->expiration_timer = pc_expiration_timer;
 	pc->global_expiration_timer = pc_global_expiration_timer;
 	pc->expire_check = pc_expire_check;
diff --git a/src/map/pc.h b/src/map/pc.h
index 26df30527..e6e95978d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -569,7 +569,7 @@ END_ZEROED_BLOCK;
 	} roulette;
 
 	uint8 lang_id;
-	
+
 	// temporary debugging of bug #3504
 	const char* delunit_prevfile;
 	int delunit_prevline;
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index 28bef6a85..7efcd7e26 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -51,7 +51,7 @@ static void read_config(void) {
 	config_setting_t *groups = NULL;
 	const char *config_filename = "conf/groups.conf"; // FIXME hardcoded name
 	int group_count = 0;
-	
+
 	if (libconfig->read_file(&pc_group_config, config_filename))
 		return;
 
@@ -125,11 +125,10 @@ static void read_config(void) {
 
 			strdb_put(pcg->name_db, groupname, group_settings);
 			idb_put(pcg->db, id, group_settings);
-			
 		}
 		group_count = libconfig->setting_length(groups); // Save number of groups
 		assert(group_count == db_size(pcg->db));
-		
+
 		// Check if all commands and permissions exist
 		iter = db_iterator(pcg->db);
 		for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
@@ -182,7 +181,7 @@ static void read_config(void) {
 				                 *commands = group_settings->commands,
 					             *permissions = group_settings->permissions;
 				int j, inherit_count = 0, done = 0;
-				
+
 				if (group_settings->inheritance_done) // group already processed
 					continue;
 
@@ -192,7 +191,7 @@ static void read_config(void) {
 					group_settings->inheritance_done = true;
 					continue;
 				}
-				
+
 				for (j = 0; j < inherit_count; ++j) {
 					GroupSettings *inherited_group = NULL;
 					const char *groupname = libconfig->setting_get_string_elem(inherit, j);
@@ -225,7 +224,7 @@ static void read_config(void) {
 
 					++done; // copied commands and permissions from one of inherited groups
 				}
-				
+
 				if (done == inherit_count) { // copied commands from all of inherited groups
 					++i;
 					group_settings->inheritance_done = true; // we're done with this group
@@ -239,7 +238,7 @@ static void read_config(void) {
 				break;
 			}
 		} // while(i < group_count)
-		
+
 		// Pack permissions into GroupSettings.e_permissions for faster checking
 		iter = db_iterator(pcg->db);
 		for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
@@ -365,28 +364,28 @@ int pc_group_get_idx(GroupSettings *group)
 unsigned int pc_groups_add_permission(const char *name) {
 	uint64 key = 0x1;
 	unsigned char i;
-	
+
 	for(i = 0; i < pcg->permission_count; i++) {
 		if( strcmpi(name,pcg->permissions[i].name) == 0 ) {
 			ShowError("pc_groups_add_permission(%s): failed! duplicate permission name!\n",name);
 			return 0;
 		}
 	}
-	
+
 	if( i != 0 )
 		key = (uint64)pcg->permissions[i - 1].permission << 1;
-	
+
 	if( key >= UINT_MAX ) {
 		ShowError("pc_groups_add_permission(%s): failed! not enough room, too many permissions!\n",name);
 		return 0;
 	}
-	
+
 	i = pcg->permission_count;
 	RECREATE(pcg->permissions, struct pc_groups_permission_table, ++pcg->permission_count);
-	
+
 	pcg->permissions[i].name = aStrdup(name);
 	pcg->permissions[i].permission = (unsigned int)key;
-	
+
 	return (unsigned int)key;
 }
 /**
@@ -427,23 +426,23 @@ void do_init_pc_groups(void) {
 		{ "disable_skill_usage", PC_PERM_DISABLE_SKILL_USAGE },
 	};
 	unsigned char i, len = ARRAYLENGTH(pc_g_defaults);
-	
+
 	for(i = 0; i < len; i++) {
 		unsigned int p;
 		if( ( p = pc_groups_add_permission(pc_g_defaults[i].name) ) != pc_g_defaults[i].permission )
 			ShowError("do_init_pc_groups: %s error : %d != %d\n",pc_g_defaults[i].name,p,pc_g_defaults[i].permission);
 	}
-	
+
 	/**
 	 * Handle plugin-provided permissions
 	 **/
 	for(i = 0; i < pcg->HPMpermissions_count; i++) {
 		*pcg->HPMpermissions[i].mask = pc_groups_add_permission(pcg->HPMpermissions[i].name);
 	}
-	
+
 	pcg->db = idb_alloc(DB_OPT_RELEASE_DATA);
 	pcg->name_db = stridb_alloc(DB_OPT_DUP_KEY, 0);
-	
+
 	read_config();
 }
 
@@ -468,7 +467,7 @@ void do_final_pc_groups(void)
 		pcg->db->destroy(pcg->db, group_db_clear_sub);
 	if (pcg->name_db != NULL)
 		db_destroy(pcg->name_db);
-	
+
 	if(pcg->permissions != NULL) {
 		unsigned char i;
 		for(i = 0; i < pcg->permission_count; i++)
@@ -490,7 +489,7 @@ void pc_groups_reload(void) {
 
 	pcg->final();
 	pcg->init();
-	
+
 	/* refresh online users permissions */
 	iter = mapit_getallusers();
 	for (sd = (TBL_PC*)mapit->first(iter); mapit->exists(iter); sd = (TBL_PC*)mapit->next(iter)) {
@@ -508,7 +507,6 @@ void pc_groups_reload(void) {
  **/
 void pc_groups_defaults(void) {
 	pcg = &pcg_s;
-	
 	/* */
 	pcg->db = NULL;
 	pcg->name_db = NULL;
diff --git a/src/map/pet.c b/src/map/pet.c
index 6a7924a16..2865cc901 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -107,7 +107,7 @@ int pet_attackskill(struct pet_data *pd, int target_id) {
 
 	if (DIFF_TICK(pd->ud.canact_tick, timer->gettick()) > 0)
 		return 0;
-	
+
 	if (rnd()%100 < (pd->a_skill->rate +pd->pet.intimate*pd->a_skill->bonusrate/1000)) {
 		//Skotlex: Use pet's skill
 		int inf;
@@ -133,7 +133,7 @@ int pet_target_check(struct map_session_data *sd,struct block_list *bl,int type)
 	int rate;
 
 	pd = sd->pd;
-	
+
 	Assert_ret(pd->msd == 0 || pd->msd->pd == pd);
 
 	if( bl == NULL || bl->type != BL_MOB || bl->prev == NULL
@@ -186,7 +186,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
 		return 1;
 
 	pd->recovery->timer = timer->add(timer->gettick()+pd->recovery->delay*1000,pet->recovery_timer,sd->bl.id,0);
-	
+
 	return 0;
 }
 
@@ -211,7 +211,7 @@ int pet_hungry(int tid, int64 tick, int id, intptr_t data) {
 
 	if (pd->pet.intimate <= 0)
 		return 1; //You lost the pet already, the rest is irrelevant.
-	
+
 	pd->pet.hungry--;
 	if( pd->pet.hungry < 0 )
 	{
@@ -337,7 +337,7 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *petinfo)
 		//The pet_id value was lost? odd... restore it.
 		sd->status.pet_id = petinfo->pet_id;
 	}
-	
+
 	i = pet->search_petDB_index(petinfo->class_,PET_CLASS);
 	if(i < 0) {
 		sd->status.pet_id = 0;
@@ -367,10 +367,10 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *petinfo)
 
 	pd->last_thinktime = timer->gettick();
 	pd->state.skillbonus = 0;
-	
+
 	if( battle_config.pet_status_support )
 		script->run_pet(pet->db[i].pet_script,0,sd->bl.id,0);
-	
+
 	if( pd->petDB ) {
 		if( pd->petDB->equip_script )
 			status_calc_pc(sd,SCO_NONE);
@@ -380,7 +380,7 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *petinfo)
 		else
 			interval = pd->petDB->hungry_delay;
 	}
-	
+
 	if( interval <= 0 )
 		interval = 1;
 	pd->pet_hungry_timer = timer->add(timer->gettick() + interval, pet->hungry, sd->bl.id, 0);
@@ -567,7 +567,7 @@ bool pet_get_egg(int account_id, short pet_class, int pet_id ) {
 	// the first request. [Panikon]
 	i = pet->search_petDB_index(pet_class,PET_CLASS);
 	sd->catch_target_class = -1;
-	
+
 	if(i < 0) {
 		intif->delete_petdata(pet_id);
 		return false;
@@ -594,11 +594,11 @@ int pet_menu(struct map_session_data *sd,int menunum)
 	nullpo_ret(sd);
 	if (sd->pd == NULL)
 		return 1;
-	
+
 	//You lost the pet already.
 	if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incubate)
 		return 1;
-		
+
 	egg_id = itemdb->exists(sd->pd->petDB->EggID);
 	if (egg_id) {
 		if ((egg_id->flag.trade_restriction&ITR_NODROP) && !pc->inventoryblank(sd)) {
@@ -606,7 +606,7 @@ int pet_menu(struct map_session_data *sd,int menunum)
 			return 1;
 		}
 	}
-	
+
 	switch(menunum) {
 		case 0:
 			clif->send_petstatus(sd);
@@ -672,9 +672,9 @@ int pet_equipitem(struct map_session_data *sd,int index) {
 	nullpo_retr(1, sd);
 	pd = sd->pd;
 	if (!pd)  return 1;
-	
+
 	nameid = sd->status.inventory[index].nameid;
-	
+
 	if(pd->petDB->AcceID == 0 || nameid != pd->petDB->AcceID || pd->pet.equip != 0) {
 		clif->equipitemack(sd,0,0,EIA_FAIL);
 		return 1;
@@ -843,7 +843,7 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick
 		pet->randomwalk(pd,tick);
 		return 0;
 	}
-	
+
 	if (!check_distance_bl(&sd->bl, &pd->bl, pd->db->range3)) {
 		//Master too far, chase.
 		if(pd->target_id)
@@ -867,7 +867,7 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick
 		pd->status.speed = pd->petDB->speed;
 		pd->ud.state.change_walk_target = pd->ud.state.speed_changed = 1;
 	}
-	
+
 	if (pd->target_id) {
 		target= map->id2bl(pd->target_id);
 		if (!target || pd->bl.m != target->m || status->isdead(target)
@@ -877,13 +877,13 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick
 			pet->unlocktarget(pd);
 		}
 	}
-	
+
 	if(!target && pd->loot && pd->msd && pc_has_permission(pd->msd, PC_PERM_TRADE) && pd->loot->count < pd->loot->max && DIFF_TICK(tick,pd->ud.canact_tick)>0) {
 		//Use half the pet's range of sight.
 		map->foreachinrange(pet->ai_sub_hard_lootsearch,&pd->bl,
 			pd->db->range2/2, BL_ITEM,pd,&target);
 	}
-	
+
 	if (!target) {
 	//Just walk around.
 		if (check_distance_bl(&sd->bl, &pd->bl, 3))
@@ -898,7 +898,7 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick
 
 		return 0;
 	}
-	
+
 	if(pd->ud.target == target->id &&
 		(pd->ud.attacktimer != INVALID_TIMER || pd->ud.walktimer != INVALID_TIMER))
 		return 0; //Target already locked.
@@ -962,7 +962,7 @@ int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap)
 
 	if(sd_charid && sd_charid != pd->msd->status.char_id)
 		return 0;
-	
+
 	if(unit->can_reach_bl(&pd->bl,bl, pd->db->range2, 1, NULL, NULL) &&
 		((*target) == NULL || //New target closer than previous one.
 		!check_distance_bl(&pd->bl, *target, distance_bl(&pd->bl, bl))))
@@ -1047,18 +1047,18 @@ int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct pet_data *pd;
 	int bonus;
 	int duration = 0;
-	
+
 	if(sd == NULL || sd->pd==NULL || sd->pd->bonus == NULL)
 		return 1;
-	
+
 	pd=sd->pd;
-	
+
 	if(pd->bonus->timer != tid) {
 		ShowError("pet_skill_bonus_timer %d != %d\n",pd->bonus->timer,tid);
 		pd->bonus->timer = INVALID_TIMER;
 		return 0;
 	}
-	
+
 	// determine the time for the next timer
 	if (pd->state.skillbonus && pd->bonus->delay > 0) {
 		bonus = 0;
@@ -1070,7 +1070,7 @@ int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) {
 		pd->bonus->timer = INVALID_TIMER;
 		return 0;
 	}
-	
+
 	if (pd->state.skillbonus != bonus) {
 		pd->state.skillbonus = bonus;
 		status_calc_pc(sd, SCO_NONE);
@@ -1086,10 +1086,10 @@ int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) {
 int pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
-	
+
 	if(sd==NULL || sd->pd == NULL || sd->pd->recovery == NULL)
 		return 1;
-	
+
 	pd=sd->pd;
 
 	if(pd->recovery->timer != tid) {
@@ -1106,7 +1106,7 @@ int pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) {
 	}
 
 	pd->recovery->timer = INVALID_TIMER;
-	
+
 	return 0;
 }
 
@@ -1120,14 +1120,14 @@ int pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
 	short rate = 100;
 	if(sd==NULL || sd->pd == NULL || sd->pd->s_skill == NULL)
 		return 1;
-	
+
 	pd=sd->pd;
-	
+
 	if(pd->s_skill->timer != tid) {
 		ShowError("pet_skill_support_timer %d != %d\n",pd->s_skill->timer,tid);
 		return 0;
 	}
-	
+
 	st = status->get_status_data(&sd->bl);
 
 	if (DIFF_TICK(pd->ud.canact_tick, tick) > 0) {
@@ -1135,7 +1135,7 @@ int pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
 		pd->s_skill->timer=timer->add(pd->ud.canact_tick,pet->skill_support_timer,sd->bl.id,0);
 		return 0;
 	}
-	
+
 	if(pc_isdead(sd) ||
 		(rate = get_percentage(st->sp, st->max_sp)) > pd->s_skill->sp ||
 		(rate = get_percentage(st->hp, st->max_hp)) > pd->s_skill->hp ||
@@ -1144,7 +1144,7 @@ int pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
 		pd->s_skill->timer=timer->add(tick+(rate>10?rate:10)*100,pet->skill_support_timer,sd->bl.id,0);
 		return 0;
 	}
-	
+
 	pet_stop_attack(pd);
 	pet_stop_walking(pd, STOPWALKING_FLAG_FIXPOS);
 	pd->s_skill->timer=timer->add(tick+pd->s_skill->delay*1000,pet->skill_support_timer,sd->bl.id,0);
@@ -1307,7 +1307,7 @@ int do_init_pet(bool minimal) {
 
 	pet->item_drop_ers = ers_new(sizeof(struct item_drop),"pet.c::item_drop_ers",ERS_OPT_NONE);
 	pet->item_drop_list_ers = ers_new(sizeof(struct item_drop_list),"pet.c::item_drop_list_ers",ERS_OPT_NONE);
-	
+
 	timer->add_func_list(pet->hungry,"pet_hungry");
 	timer->add_func_list(pet->ai_hard,"pet_ai_hard");
 	timer->add_func_list(pet->skill_bonus_timer,"pet_skill_bonus_timer"); // [Valaris]
@@ -1341,16 +1341,14 @@ int do_final_pet(void)
 }
 void pet_defaults(void) {
 	pet = &pet_s;
-	
+
 	memset(pet->db,0,sizeof(pet->db));
 	pet->item_drop_ers = NULL;
 	pet->item_drop_list_ers = NULL;
-	
-	/* */
+
 	pet->init = do_init_pet;
 	pet->final = do_final_pet;
-	
-	/* */
+
 	pet->hungry_val = pet_hungry_val;
 	pet->set_intimate = pet_set_intimate;
 	pet->create_egg = pet_create_egg;
diff --git a/src/map/script.c b/src/map/script.c
index c59a4db45..30f0bad85 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -87,7 +87,6 @@ static inline void script_string_buf_addb(struct script_string_buf *buf,uint8 b)
 		buf->size += 512;
 		RECREATE(buf->ptr, char, buf->size);
 	}
-	
 	buf->ptr[buf->pos++] = b;
 }
 
@@ -267,7 +266,6 @@ void script_reportdata(struct script_data* data)
 	}
 }
 
-
 /// Reports on the console information about the current built-in function.
 void script_reportfunc(struct script_state* st)
 {
@@ -301,7 +299,6 @@ void script_reportfunc(struct script_state* st)
 	}
 }
 
-
 /*==========================================
  * Output error message
  *------------------------------------------*/
@@ -398,7 +395,6 @@ unsigned int calc_hash_ci(const char* p) {
 	return h % SCRIPT_HASH_SIZE;
 }
 
-
 /*==========================================
  * script->str_data manipulation functions
  *------------------------------------------*/
@@ -590,7 +586,6 @@ int script_add_str(const char* p)
 	return script->str_num++;
 }
 
-
 /// Appends 1 byte to the script buffer.
 void add_scriptb(int a)
 {
@@ -807,19 +802,19 @@ const char* parse_callfunc(const char* p, int require_paren, int is_custom)
 		else { //Nested function call
 			script->syntax.nested_call++;
 			nested_call = true;
-			
+
 			if( script->str_data[func].val == script->buildin_lang_macro_offset ) {
 				script->syntax.lang_macro_active = true;
 				macro = true;
 			}
 		}
-		
+
 		if( !macro ) {
 			// buildin function
 			script->addl(func);
 			script->addc(C_ARG);
 		}
-		
+
 		arg = script->buildin[script->str_data[func].val];
 		if (script->str_data[func].deprecated)
 			DeprecationWarning(p);
@@ -903,17 +898,17 @@ const char* parse_callfunc(const char* p, int require_paren, int is_custom)
 		if( *p != ')' )
 			disp_error_message("parse_callfunc: expected ')' to close argument list",p);
 		++p;
-		
+
 		if( script->str_data[func].val == script->buildin_lang_macro_offset )
 			script->syntax.lang_macro_active = false;
 	}
-	
+
 	if( nested_call )
 		script->syntax.nested_call--;
-	
+
 	if( !script->syntax.nested_call )
 		script->syntax.last_func = -1;
-	
+
 	if( !macro )
 		script->addc(C_FUNC);
 	return p;
@@ -1149,15 +1144,15 @@ bool is_number(const char *p) {
 int script_string_dup(char *str) {
 	size_t len = strlen(str);
 	int pos = script->string_list_pos;
- 
+
 	while( pos+len+1 >= script->string_list_size ) {
 		script->string_list_size += (1024*1024)/2;
 		RECREATE(script->string_list,char,script->string_list_size);
 	}
-	
+
 	safestrncpy(script->string_list+pos, str, len+1);
 	script->string_list_pos += len+1;
-	
+
 	return pos;
 }
 
@@ -1208,7 +1203,7 @@ const char* parse_simpleexpr(const char *p)
 		const char *start_point = p;
 		bool duplicate = true;
 		struct script_string_buf *sbuf = &script->parse_simpleexpr_str;
-		
+
 		do {
 			p++;
 			while( *p && *p != '"' ) {
@@ -1231,19 +1226,19 @@ const char* parse_simpleexpr(const char *p)
 			p++; //'"'
 			p = script->skip_space(p);
 		} while( *p && *p == '"' );
-		
+
 		script_string_buf_addb(sbuf, 0);
-		
+
 		if (!(script->syntax.translation_db && (st = strdb_get(script->syntax.translation_db, sbuf->ptr)) != NULL)) {
 			script->addc(C_STR);
-			
+
 			if( script->pos+sbuf->pos >= script->size ) {
 				do {
 					script->size += SCRIPT_BLOCK_SIZE;
 				} while( script->pos+sbuf->pos >= script->size );
 				RECREATE(script->buf,unsigned char,script->size);
 			}
-			
+
 			memcpy(script->buf+script->pos, sbuf->ptr, sbuf->pos);
 			script->pos += sbuf->pos;
 
@@ -1253,19 +1248,19 @@ const char* parse_simpleexpr(const char *p)
 			unsigned int st_cursor = 0;
 
 			script->addc(C_LSTR);
-		
+
 			expand += (sizeof(char*) + sizeof(uint8)) * st->translations;
-			
+
 			while( script->pos+expand >= script->size ) {
 				script->size += SCRIPT_BLOCK_SIZE;
 				RECREATE(script->buf,unsigned char,script->size);
 			}
-			
+
 			*((int *)(&script->buf[script->pos])) = st->string_id;
 			*((uint8 *)(&script->buf[script->pos + sizeof(int)])) = st->translations;
 
 			script->pos += sizeof(int) + sizeof(uint8);
-			
+
 			for(j = 0; j < st->translations; j++) {
 				*((uint8 *)(&script->buf[script->pos])) = RBUFB(st->buf, st_cursor);
 				*((char **)(&script->buf[script->pos+sizeof(uint8)])) = &st->buf[st_cursor + sizeof(uint8)];
@@ -1275,19 +1270,19 @@ const char* parse_simpleexpr(const char *p)
 				st_cursor += sizeof(uint8);
 			}
 		}
-		
+
 		/* When exporting we don't know what is a translation and what isn't */
 		if( script->lang_export_fp && sbuf->pos > 1 ) {//sbuf->pos will always be at least 1 because of the '\0'
 			if( !script->syntax.strings ) {
 				script->syntax.strings = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_ALLOW_NULL_DATA, 0);
 			}
-			
+
 			if( !strdb_exists(script->syntax.strings,sbuf->ptr) ) {
 				strdb_put(script->syntax.strings, sbuf->ptr, NULL);
 				duplicate = false;
 			}
 		}
-		
+
 		if( script->lang_export_fp && !duplicate &&
 			( ( ( script->syntax.last_func == script->buildin_mes_offset ||
 				 script->syntax.last_func == script->buildin_select_offset ) && !script->syntax.nested_call
@@ -1304,44 +1299,41 @@ const char* parse_simpleexpr(const char *p)
 				else
 					break;
 			}
-			
+
 			while( *line_end != '\n' && *line_end != '\0' )
 				line_end++;
-			
+
 			line_length = (size_t)(line_end - line_start);
-			
 			if( line_length > 0 ) {
 				script_string_buf_ensure(lbuf,line_length + 1);
-				
+
 				memcpy(lbuf->ptr, line_start, line_length);
 				lbuf->pos = line_length;
 				script_string_buf_addb(lbuf, 0);
-				
+
 				normalize_name(lbuf->ptr, "\r\n\t ");
 			}
-			
+
 			for(cursor = 0; cursor < sbuf->pos; cursor++) {
 				if( sbuf->ptr[cursor] == '"' )
 					script_string_buf_addb(ubuf, '\\');
 				script_string_buf_addb(ubuf, sbuf->ptr[cursor]);
 			}
 			script_string_buf_addb(ubuf, 0);
-			
+
 			fprintf(script->lang_export_fp, "#: %s\n"
-											"# %s\n"
-											"msgctxt \"%s\"\n"
-											"msgid \"%s\"\n"
-											"msgstr \"\"\n",
+					"# %s\n"
+					"msgctxt \"%s\"\n"
+					"msgid \"%s\"\n"
+					"msgstr \"\"\n",
 					script->parser_current_file ? script->parser_current_file : "Unknown File",
 					lbuf->ptr,
 					script->parser_current_npc_name ? script->parser_current_npc_name : "Unknown NPC",
 					ubuf->ptr
 			);
-			
 			lbuf->pos = 0;
 			ubuf->pos = 0;
 		}
-		
 		sbuf->pos = 0;
 	} else {
 		int l;
@@ -2423,10 +2415,10 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
 	if( script->parse_cleanup_timer_id == INVALID_TIMER ) {
 		script->parse_cleanup_timer_id = timer->add(timer->gettick() + 10, script->parse_cleanup_timer, 0, 0);
 	}
-	
+
 	if( script->syntax.strings ) /* used only when generating translation file */
 		db_destroy(script->syntax.strings);
-	
+
 	memset(&script->syntax,0,sizeof(script->syntax));
 	script->syntax.last_func = -1;/* as valid values are >= 0 */
 	if( script->parser_current_npc_name ) {
@@ -2822,14 +2814,13 @@ void script_array_ensure_zero(struct script_state *st, struct map_session_data *
 		struct script_array *sa = idb_get(src->arrays, script_getvarid(uid));
 		if (sa) {
 			unsigned int i;
-			
+
 			ARR_FIND(0, sa->size, i, sa->members[i] == 0);
 			if( i != sa->size ) {
 				if( !insert )
 					script->array_remove_member(src,sa,i);
 				return;
 			}
-			
 			script->array_add_member(sa,0);
 		} else if (insert) {
 			script->array_update(src,reference_uid(script_getvarid(uid), 0),false);
@@ -2842,10 +2833,10 @@ void script_array_ensure_zero(struct script_state *st, struct map_session_data *
 unsigned int script_array_size(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref) {
 	struct script_array *sa = NULL;
 	struct reg_db *src = script->array_src(st, sd, name, ref);
-	
+
 	if( src && src->arrays )
 		sa = idb_get(src->arrays, script->search_str(name));
-	
+
 	return sa ? sa->size : 0;
 }
 /**
@@ -2854,25 +2845,22 @@ unsigned int script_array_size(struct script_state *st, struct map_session_data
 unsigned int script_array_highest_key(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref) {
 	struct script_array *sa = NULL;
 	struct reg_db *src = script->array_src(st, sd, name, ref);
-	
-	
+
 	if( src && src->arrays ) {
 		int key = script->add_word(name);
-		
+
 		script->array_ensure_zero(st,sd,reference_uid(key, 0),ref);
-		
+
 		if( ( sa = idb_get(src->arrays, key) ) ) {
 			unsigned int i, highest_key = 0;
-			
+
 			for(i = 0; i < sa->size; i++) {
 				if( sa->members[i] > highest_key )
 					highest_key = sa->members[i];
 			}
-			
 			return sa->size ? highest_key + 1 : 0;
 		}
 	}
-	
 	return 0;
 }
 int script_free_array_db(DBKey key, DBData *data, va_list ap) {
@@ -2896,15 +2884,15 @@ void script_array_delete(struct reg_db *src, struct script_array *sa) {
  **/
 void script_array_remove_member(struct reg_db *src, struct script_array *sa, unsigned int idx) {
 	unsigned int i, cursor;
-	
+
 	/* its the only member left, no need to do anything other than delete the array data */
 	if( sa->size == 1 ) {
 		script->array_delete(src,sa);
 		return;
 	}
-	
+
 	sa->members[idx] = UINT_MAX;
-	
+
 	for(i = 0, cursor = 0; i < sa->size; i++) {
 		if( sa->members[i] == UINT_MAX )
 			continue;
@@ -2912,7 +2900,7 @@ void script_array_remove_member(struct reg_db *src, struct script_array *sa, uns
 			sa->members[cursor] = sa->members[i];
 		cursor++;
 	}
-	
+
 	sa->size = cursor;
 }
 /**
@@ -2921,11 +2909,9 @@ void script_array_remove_member(struct reg_db *src, struct script_array *sa, uns
  * @param idx the index of the array member being inserted
  **/
 void script_array_add_member(struct script_array *sa, unsigned int idx) {
-	
 	RECREATE(sa->members, unsigned int, ++sa->size);
-	
-	sa->members[sa->size - 1] = idx;
 
+	sa->members[sa->size - 1] = idx;
 }
 /**
  * Obtains the source of the array database for this type and scenario
@@ -2933,7 +2919,7 @@ void script_array_add_member(struct script_array *sa, unsigned int idx) {
  **/
 struct reg_db *script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref) {
 	struct reg_db *src = NULL;
-	
+
 	switch( name[0] ) {
 		/* from player */
 		default: /* char reg */
@@ -2956,13 +2942,12 @@ struct reg_db *script_array_src(struct script_state *st, struct map_session_data
 			}
 			break;
 	}
-	
+
 	if( src ) {
 		if( !src->arrays )
 			src->arrays = idb_alloc(DB_OPT_BASE);
 		return src;
 	}
-	
 	return NULL;
 }
 
@@ -2977,7 +2962,7 @@ void script_array_update(struct reg_db *src, int64 num, bool empty) {
 	struct script_array *sa = NULL;
 	int id = script_getvarid(num);
 	unsigned int index = script_getvaridx(num);
-	
+
 	if (!src->arrays) {
 		src->arrays = idb_alloc(DB_OPT_BASE);
 	} else {
@@ -2986,13 +2971,13 @@ void script_array_update(struct reg_db *src, int64 num, bool empty) {
 
 	if( sa ) {
 		unsigned int i;
-		
+
 		/* search */
 		for(i = 0; i < sa->size; i++) {
 			if( sa->members[i] == index )
 				break;
 		}
-		
+
 		/* if existent */
 		if( i != sa->size ) {
 			/* if empty, we gotta remove it */
@@ -3029,7 +3014,7 @@ void script_array_update(struct reg_db *src, int64 num, bool empty) {
  *------------------------------------------*/
 int set_reg(struct script_state* st, TBL_PC* sd, int64 num, const char* name, const void* value, struct reg_db *ref) {
 	char prefix = name[0];
-	
+
 	if( is_string_variable(name) ) {// string variable
 		const char *str = (const char*)value;
 
@@ -3432,7 +3417,7 @@ struct script_state* script_alloc_state(struct script_code* rootscript, int pos,
 	st->oid = oid;
 	st->sleep.timer = INVALID_TIMER;
 	st->npc_item_flag = battle_config.item_enabled_npc;
-	
+
 	if( st->script->instances != USHRT_MAX )
 		st->script->instances++;
 	else {
@@ -3457,11 +3442,11 @@ struct script_state* script_alloc_state(struct script_code* rootscript, int pos,
 void script_free_state(struct script_state* st) {
 	if( idb_exists(script->st_db,st->id) ) {
 		struct map_session_data *sd = st->rid ? map->id2sd(st->rid) : NULL;
-		
+
 		if(st->bk_st) {// backup was not restored
 			ShowDebug("script_free_state: Previous script state lost (rid=%d, oid=%d, state=%d, bk_npcid=%d).\n", st->bk_st->rid, st->bk_st->oid, st->bk_st->state, st->bk_npcid);
 		}
-		
+
 		if(sd && sd->st == st) { //Current script is aborted.
 			if(sd->state.using_fake_npc){
 				clif->clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd);
@@ -3864,7 +3849,6 @@ void op_1(struct script_state* st, int op)
 	script_pushint(st, i1);
 }
 
-
 /// Checks the type of all arguments passed to a built-in function.
 ///
 /// @param st Script state whose stack arguments should be inspected.
@@ -3945,7 +3929,6 @@ void script_check_buildin_argtype(struct script_state* st, int func)
 	}
 }
 
-
 /// Executes a buildin command.
 /// Stack: C_NAME(<command>) C_ARG <arg0> <arg1> ... <argN>
 int run_func(struct script_state *st)
@@ -4207,15 +4190,15 @@ void run_script_main(struct script_state *st) {
 				int string_id = *((int *)(&st->script->script_buf[st->pos]));
 				uint8 translations = *((uint8 *)(&st->script->script_buf[st->pos+sizeof(int)]));
 				struct map_session_data *lsd = NULL;
-				
+
 				st->pos += sizeof(int) + sizeof(uint8);
-				
+
 				if( (!st->rid || !(lsd = map->id2sd(st->rid)) || !lsd->lang_id) && !map->default_lang_id )
 					script->push_str(stack,C_CONSTSTR,script->string_list+string_id);
 				else {
 					uint8 k, wlang_id = lsd ? lsd->lang_id : map->default_lang_id;
 					int offset = st->pos;
-					
+
 					for(k = 0; k < translations; k++) {
 						uint8 lang_id = *(uint8 *)(&st->script->script_buf[offset]);
 						offset += sizeof(uint8);
@@ -4223,12 +4206,9 @@ void run_script_main(struct script_state *st) {
 							break;
 						offset += sizeof(char*);
 					}
-					
 					script->push_str(stack,C_CONSTSTR,
-									 ( k == translations ) ? script->string_list+string_id : *(char**)(&st->script->script_buf[offset]) );
-					
+							( k == translations ) ? script->string_list+string_id : *(char**)(&st->script->script_buf[offset]) );
 				}
-				
 				st->pos += ( ( sizeof(char*) + sizeof(uint8) ) * translations );
 			}
 				break;
@@ -4342,7 +4322,6 @@ int script_config_read(char *cfgName) {
 	char line[1024],w1[1024],w2[1024];
 	FILE *fp;
 
-
 	if( !( fp = fopen(cfgName,"r") ) ) {
 		ShowError("File not found: %s\n", cfgName);
 		return 1;
@@ -4417,7 +4396,6 @@ void script_add_autobonus(const char *autobonus)
 	}
 }
 
-
 /// resets a temporary character array variable to given value
 void script_cleararray_pc(struct map_session_data* sd, const char* varname, void* value) {
 	struct script_array *sa = NULL;
@@ -4426,39 +4404,38 @@ void script_cleararray_pc(struct map_session_data* sd, const char* varname, void
 	int key;
 
 	key = script->add_str(varname);
-	
+
 	if( !(src = script->array_src(NULL,sd,varname,NULL) ) )
 		return;
-	
+
 	if( value )
 		script->array_ensure_zero(NULL,sd,reference_uid(key,0),NULL);
-	
+
 	if( !(sa = idb_get(src->arrays, key)) ) /* non-existent array, nothing to empty */
 		return;
-	
+
 	size = sa->size;
 	list = script->array_cpy_list(sa);
-	
+
 	for(i = 0; i < size; i++) {
 		script->set_reg(NULL,sd,reference_uid(key, list[i]),varname,value,NULL);
 	}
 }
 
-
 /// sets a temporary character array variable element idx to given value
 /// @param refcache Pointer to an int variable, which keeps a copy of the reference to varname and must be initialized to 0. Can be NULL if only one element is set.
 void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32 idx, void* value, int* refcache) {
 	int key;
-	
+
 	if( idx >= SCRIPT_MAX_ARRAYSIZE ) {
 		ShowError("script_setarray_pc: Variable '%s' has invalid index '%u' (char_id=%d).\n", varname, idx, sd->status.char_id);
 		return;
 	}
 
 	key = ( refcache && refcache[0] ) ? refcache[0] : script->add_str(varname);
-	
+
 	script->set_reg(NULL,sd,reference_uid(key, idx),varname,value,NULL);
-	
+
 	if( refcache )
 	{// save to avoid repeated script->add_str calls
 		refcache[0] = key;
@@ -4469,23 +4446,22 @@ void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32
  **/
 int script_reg_destroy(DBKey key, DBData *data, va_list ap) {
 	struct script_reg_state *src;
-	
+
 	if( data->type != DB_DATA_PTR )/* got no need for those! */
 		return 0;
-	
+
 	src = DB->data2ptr(data);
-	
+
 	if( src->type ) {
 		struct script_reg_str *p = (struct script_reg_str *)src;
-		
+
 		if( p->value )
 			aFree(p->value);
-		
+
 		ers_free(pc->str_reg_ers,p);
 	} else {
 		ers_free(pc->num_reg_ers,(struct script_reg_num*)src);
 	}
-	
 	return 0;
 }
 /**
@@ -4496,10 +4472,10 @@ void script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct sc
 
 	if( data->type ) {
 		struct script_reg_str *p = (struct script_reg_str*)data;
-		
+
 		if( p->value )
 			aFree(p->value);
-		
+
 		ers_free(pc->str_reg_ers,p);
 	} else {
 		ers_free(pc->num_reg_ers,(struct script_reg_num*)data);
@@ -4643,16 +4619,15 @@ void do_final_script(void) {
 
 	if( script->labels != NULL )
 		aFree(script->labels);
-	
+
 	ers_destroy(script->array_ers);
-	
+
 	if( script->generic_ui_array )
 		aFree(script->generic_ui_array);
-	
+
 	script->clear_translations(false);
-	
 	script->parser_clean_leftovers();
-	
+
 	if( script->lang_export_file )
 		aFree(script->lang_export_file);
 }
@@ -4662,11 +4637,10 @@ void do_final_script(void) {
  **/
 uint8 script_add_language(const char *name) {
 	uint8 lang_id = script->max_lang_id;
-	
+
 	RECREATE(script->languages, char *, ++script->max_lang_id);
-	
 	script->languages[lang_id] = aStrdup(name);
-	
+
 	return lang_id;
 }
 /**
@@ -4682,9 +4656,9 @@ void script_load_translations(void) {
 
 	if (map->minimal) // No translations in minimal mode
 		return;
-	
+
 	script->translation_db = strdb_alloc(DB_OPT_DUP_KEY, NAME_LENGTH*2+1);
-	
+
 	if( script->languages ) {
 		for(i = 0; i < script->max_lang_id; i++)
 			aFree(script->languages[i]);
@@ -4692,31 +4666,30 @@ void script_load_translations(void) {
 	}
 	script->languages = NULL;
 	script->max_lang_id = 0;
-	
+
 	script->add_language("English");/* 0 is default, which is whatever is in the npc files hardcoded (in our case, English) */
-	
+
 	if (libconfig->read_file(&translations_conf, config_filename)) {
 		ShowError("load_translations: can't read '%s'\n", config_filename);
 		return;
 	}
-	
+
 	if( !(translations = libconfig->lookup(&translations_conf, "translations")) ) {
 		ShowError("load_translations: invalid format on '%s'\n",config_filename);
 		return;
 	}
-	
+
 	if( script->string_list )
 		aFree(script->string_list);
-	
+
 	script->string_list = NULL;
 	script->string_list_pos = 0;
 	script->string_list_size = 0;
-	
+
 	size = libconfig->setting_length(translations);
-	
+
 	for(i = 0; i < size; i++) {
 		const char *translation_file = libconfig->setting_get_string_elem(translations, i);
-		
 		script->load_translation(translation_file, ++lang_id, &total);
 	}
 	libconfig->destroy(&translations_conf);
@@ -4727,32 +4700,27 @@ void script_load_translations(void) {
 		DBMap *string_db;
 		struct string_translation *st = NULL;
 		uint32 j = 0;
-		
-		
+
 		CREATE(script->translation_buf, char *, total);
 		script->translation_buf_size = total;
-		
+
 		main_iter = db_iterator(script->translation_db);
-		
 		for( string_db = dbi_first(main_iter); dbi_exists(main_iter); string_db = dbi_next(main_iter) ) {
 			sub_iter = db_iterator(string_db);
-			
 			for( st = dbi_first(sub_iter); dbi_exists(sub_iter); st = dbi_next(sub_iter) ) {
 				script->translation_buf[j++] = st->buf;
 			}
-			
 			dbi_destroy(sub_iter);
 		}
-		
 		dbi_destroy(main_iter);
 	}
-	
+
 	for(k = 0; k < script->max_lang_id; k++) {
 		if( !strcmpi(script->languages[k],map->default_lang_str) ) {
 			break;
 		}
 	}
-	
+
 	if( k == script->max_lang_id ) {
 		ShowError("load_translations: map server default_language setting '%s' is not a loaded language\n",map->default_lang_str);
 		map->default_lang_id = 0;
@@ -4767,21 +4735,21 @@ void script_load_translations(void) {
 const char * script_get_translation_file_name(const char *file) {
 	static char file_name[200];
 	int i, len = (int)strlen(file), last_bar = -1, last_dot = -1;
-	
+
 	for(i = 0; i < len; i++) {
 		if( file[i] == '/' || file[i] == '\\' )
 			last_bar = i;
 		else if ( file[i] == '.' )
 			last_dot = i;
 	}
-	
+
 	if( last_bar != -1 || last_dot != -1 ) {
 		if( last_bar != -1 && last_dot < last_bar )
 			last_dot = -1;
 		safestrncpy(file_name, file+(last_bar >= 0 ? last_bar+1 : 0), ( last_dot >= 0 ? ( last_bar >= 0 ? last_dot - last_bar : last_dot ) : sizeof(file_name) ));
 		return file_name;
 	}
-	
+
 	return file;
 }
 
@@ -4796,25 +4764,25 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) {
 	size_t i;
 	FILE *fp;
 	struct script_string_buf msgid = { 0 }, msgstr = { 0 };
-	
+
 	if( !(fp = fopen(file,"rb")) ) {
 		ShowError("load_translation: failed to open '%s' for reading\n",file);
 		return;
 	}
-	
+
 	script->add_language(script->get_translation_file_name(file));
 	if( lang_id >= atcommand->max_message_table )
 		atcommand->expand_message_table();
-	
+
 	while(fgets(line, sizeof(line), fp)) {
 		size_t len = strlen(line), cursor = 0;
-		
+
 		if( len <= 1 )
 			continue;
-		
+
 		if( line[0] == '#' )
 			continue;
-		
+
 		if( strncasecmp(line,"msgctxt \"", 9) == 0 ) {
 			msgctxt[0] = '\0';
 			for(i = 9; i < len - 2; i++) {
@@ -4848,14 +4816,14 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) {
 			}
 			script_string_buf_addb(&msgstr,0);
 		}
-		
+
 		if( msgctxt[0] && msgid.pos > 1 && msgstr.pos > 1 ) {
 			size_t msgstr_len = msgstr.pos;
 			unsigned int inner_len = 1 + (uint32)msgstr_len + 1; //uint8 lang_id + msgstr_len + '\0'
-			
+
 			if( strcasecmp(msgctxt, "messages.conf") == 0 ) {
 				int k;
-				
+
 				for(k = 0; k < MAX_MSG; k++) {
 					if( atcommand->msg_table[0][k] && strcmpi(atcommand->msg_table[0][k],msgid.ptr) == 0 ) {
 						if( atcommand->msg_table[lang_id][k] )
@@ -4864,29 +4832,24 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) {
 						break;
 					}
 				}
-
 			} else {
 				struct string_translation *st = NULL;
 
 				if( !( string_db = strdb_get(script->translation_db, msgctxt) ) ) {
 					string_db = strdb_alloc(DB_OPT_DUP_KEY, 0);
-					
 					strdb_put(script->translation_db, msgctxt, string_db);
 				}
-				
+
 				if( !(st = strdb_get(string_db, msgid.ptr) ) ) {
 					CREATE(st, struct string_translation, 1);
-					
 					st->string_id = script->string_dup(msgid.ptr);
-					
 					strdb_put(string_db, msgid.ptr, st);
 				}
-				
 				RECREATE(st->buf, char, st->len + inner_len);
-				
+
 				WBUFB(st->buf, st->len) = lang_id;
 				safestrncpy((char*)WBUFP(st->buf, st->len + 1), msgstr.ptr, msgstr_len + 1);
-				
+
 				st->translations++;
 				st->len += inner_len;
 			}
@@ -4895,11 +4858,11 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) {
 			translations++;
 		}
 	}
-	
+
 	*total += translations;
-	
+
 	fclose(fp);
-	
+
 	script_string_buf_destroy(&msgid);
 	script_string_buf_destroy(&msgstr);
 
@@ -4914,21 +4877,21 @@ void script_clear_translations(bool reload) {
 
 	if( script->string_list )
 		aFree(script->string_list);
-	
+
 	script->string_list = NULL;
 	script->string_list_pos = 0;
 	script->string_list_size = 0;
-	
+
 	if( script->translation_buf ) {
 		for(i = 0; i < script->translation_buf_size; i++) {
 			aFree(script->translation_buf[i]);
 		}
 		aFree(script->translation_buf);
 	}
-	
+
 	script->translation_buf = NULL;
 	script->translation_buf_size = 0;
-	
+
 	if( script->languages ) {
 		for(i = 0; i < script->max_lang_id; i++)
 			aFree(script->languages[i]);
@@ -4936,11 +4899,11 @@ void script_clear_translations(bool reload) {
 	}
 	script->languages = NULL;
 	script->max_lang_id = 0;
-	
+
 	if( script->translation_db ) {
 		script->translation_db->clear(script->translation_db,script->translation_db_destroyer);
 	}
-	
+
 	if( reload )
 		script->load_translations();
 }
@@ -4950,18 +4913,17 @@ void script_clear_translations(bool reload) {
  **/
 int script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) {
 	DBMap *string_db = DB->data2ptr(data);
-	
+
 	if( db_size(string_db) ) {
-		DBIterator *iter = db_iterator(string_db);
 		struct string_translation *st = NULL;
-		
+		DBIterator *iter = db_iterator(string_db);
+
 		for( st = dbi_first(iter); dbi_exists(iter); st = dbi_next(iter) ) {
 			aFree(st);
 		}
-		
 		dbi_destroy(iter);
 	}
-		
+
 	db_destroy(string_db);
 	return 0;
 }
@@ -4970,10 +4932,9 @@ int script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) {
  *
  **/
 void script_parser_clean_leftovers(void) {
-	
 	if( script->buf )
 		aFree(script->buf);
-	
+
 	script->buf = NULL;
 	script->size = 0;
 
@@ -4981,7 +4942,7 @@ void script_parser_clean_leftovers(void) {
 		script->translation_db->destroy(script->translation_db,script->translation_db_destroyer);
 		script->translation_db = NULL;
 	}
-	
+
 	if( script->syntax.strings ) { /* used only when generating translation file */
 		db_destroy(script->syntax.strings);
 		script->syntax.strings = NULL;
@@ -4996,21 +4957,19 @@ void script_parser_clean_leftovers(void) {
  * Performs cleanup after all parsing is processed
  **/
 int script_parse_cleanup_timer(int tid, int64 tick, int id, intptr_t data) {
-	
 	script->parser_clean_leftovers();
 
 	script->parse_cleanup_timer_id = INVALID_TIMER;
-	
+
 	return 0;
 }
 
-
 /*==========================================
  * Initialization
  *------------------------------------------*/
 void do_init_script(bool minimal) {
 	script->parse_cleanup_timer_id = INVALID_TIMER;
-	
+
 	script->st_db = idb_alloc(DB_OPT_BASE);
 	script->userfunc_db = strdb_alloc(DB_OPT_DUP_KEY,0);
 	script->autobonus_db = strdb_alloc(DB_OPT_DUP_KEY,0);
@@ -5030,7 +4989,6 @@ void do_init_script(bool minimal) {
 		return;
 
 	mapreg->init();
-	
 	script->load_translations();
 }
 
@@ -5064,9 +5022,9 @@ int script_reload(void) {
 	atcommand->binding_count = 0;
 
 	db_clear(script->st_db);
-	
+
 	script->clear_translations(true);
-	
+
 	if( script->parse_cleanup_timer_id != INVALID_TIMER ) {
 		timer->delete(script->parse_cleanup_timer_id,script->parse_cleanup_timer);
 		script->parse_cleanup_timer_id = INVALID_TIMER;
@@ -6585,15 +6543,15 @@ BUILDIN(deletearray)
 		st->state = END;
 		return false;// not a variable
 	}
-	
+
 	script->array_ensure_zero(st,NULL,data->u.num,reference_getref(data));
-	
+
 	if ( !(sa = idb_get(src->arrays, id)) ) { /* non-existent array, nothing to empty */
 		return true;// not a variable
 	}
 
 	end = script->array_highest_key(st,sd,name,reference_getref(data));
-	
+
 	if( start >= end )
 		return true;// nothing to free
 
@@ -6601,7 +6559,7 @@ BUILDIN(deletearray)
 		value = (void *)"";
 	else
 		value = (void *)0;
-	
+
 	if( script_hasdata(st,3) ) {
 		unsigned int count = script_getnum(st, 3);
 		if( count > end - start )
@@ -6627,14 +6585,14 @@ BUILDIN(deletearray)
 			list = script->array_cpy_list(sa);
 			size = sa->size;
 			qsort(list, size, sizeof(unsigned int), script_array_index_cmp);
-			
+
 			ARR_FIND(0, size, i, list[i] >= start);
-			
+
 			for( ; i < size && list[i] < start + count; i++ ) {
 				// Clear any entries between start and start+count, if they exist
 				script->set_reg(st, sd, reference_uid(id, list[i]), name, value, reference_getref(data));
 			}
-			
+
 			for( ; i < size && list[i] < end; i++ ) {
 				// Move back count positions any entries between start+count to fill the gaps
 				void* v = script->get_val2(st, reference_uid(id, list[i]), reference_getref(data));
@@ -6648,7 +6606,7 @@ BUILDIN(deletearray)
 		unsigned int *list = NULL, size = 0;
 		list = script->array_cpy_list(sa);
 		size = sa->size;
-		
+
 		for(i = 0; i < size; i++) {
 			if( list[i] >= start ) // Less expensive than sorting it, most likely
 				script->set_reg(st, sd, reference_uid(id, list[i]), name, value, reference_getref(data));
@@ -7424,17 +7382,15 @@ BUILDIN(makeitem)
 		return false;
 	}
 
-
 	memset(&item_tmp,0,sizeof(item_tmp));
 	item_tmp.nameid = nameid;
 	item_tmp.identify=1;
-	
+
 	map->addflooritem(NULL, &item_tmp, amount, m, x, y, 0, 0, 0, 0);
 
 	return true;
 }
 
-
 /// Counts / deletes the current item given by idx.
 /// Used by buildin_delitem_search
 /// Relies on all input data being already fully valid.
@@ -7457,7 +7413,6 @@ void buildin_delitem_delete(struct map_session_data* sd, int idx, int* amount, b
 	amount[0]-= delamount;
 }
 
-
 /// Searches for item(s) and checks, if there is enough of them.
 /// Used by delitem and delitem2
 /// Relies on all input data being already fully valid.
@@ -7565,7 +7520,6 @@ bool buildin_delitem_search(struct map_session_data* sd, struct item* it, bool e
 	}
 }
 
-
 /// Deletes items from the target/attached player.
 /// Prioritizes ordinary items.
 ///
@@ -8485,7 +8439,7 @@ BUILDIN(successrefitem)
 
 	if (script_hasdata(st, 3))
 		up = script_getnum(st, 3);
-	
+
 	if (num > 0 && num <= ARRAYLENGTH(script->equip))
 		i=pc->checkequip(sd,script->equip[num-1]);
 	if (i >= 0) {
@@ -8620,7 +8574,7 @@ BUILDIN(delequip)
 		pc->delitem(sd, i, 1, 0, DELITEM_FAILREFINE, LOG_TYPE_SCRIPT);
 		return true;
 	}
-	
+
 	ShowError("script:delequip: no item found in position '%d' for player '%s' (AID:%d/CID:%d).\n", num, sd->status.name,sd->status.account_id, sd->status.char_id);
 	st->state = END;
 	clif->scriptclose(sd, st->oid);
@@ -9040,7 +8994,7 @@ BUILDIN(getgroupid)
 /// end
 BUILDIN(end) {
 	st->state = END;
-	
+
 	/* are we stopping inside a function? */
 	if( st->stack->defsp >= 1 && st->stack->stack_data[st->stack->defsp-1].type == C_RETINFO ) {
 		int i;
@@ -11096,7 +11050,6 @@ BUILDIN(homunculus_checkcall) {
 	return true;
 }
 
-
 // [Zephyrus]
 BUILDIN(homunculus_shuffle) {
 	TBL_PC *sd;
@@ -11446,7 +11399,7 @@ BUILDIN(getwaitingroomstate) {
 	}
 
 	switch(type) {
-		case 0:  
+		case 0:
 			for (i = 0; i < cd->users; i++) {
 				struct map_session_data *sd = cd->usersd[i];
 				mapreg->setreg(reference_uid(script->add_str("$@chatmembers"), i), sd->bl.id);
@@ -11581,7 +11534,6 @@ BUILDIN(isloggedin) {
 	return true;
 }
 
-
 /*==========================================
  *
  *------------------------------------------*/
@@ -11901,7 +11853,6 @@ BUILDIN(pvpon) {
 	bl.m = m;
 	clif->maptypeproperty2(&bl,ALL_SAMEMAP);
 
-
 	if(battle_config.pk_mode) // disable ranking functions if pk_mode is on [Valaris]
 		return true;
 
@@ -14001,7 +13952,6 @@ BUILDIN(getnpcclass)
 	return true;
 }
 
-
 /*==========================================
  * getlook char info. getlook(arg)
  *------------------------------------------*/
@@ -14106,13 +14056,13 @@ BUILDIN(getmapxy)
 		script_pushint(st,-1);
 		return false;
 	}
-	
+
 	if( !is_string_variable(reference_getname(script_getdata(st, 2))) ) {
 		ShowWarning("script: buildin_getmapxy: %s is not a string variable\n",reference_getname(script_getdata(st, 2)));
 		script_pushint(st,-1);
 		return false;
 	}
-	
+
 	if( is_string_variable(reference_getname(script_getdata(st, 3))) ) {
 		ShowWarning("script: buildin_getmapxy: %s is a string variable, should be int\n",reference_getname(script_getdata(st, 3)));
 		script_pushint(st,-1);
@@ -14204,7 +14154,7 @@ BUILDIN(getmapxy)
 	num=st->stack->stack_data[st->start+2].u.num;
 	name=script->get_str(script_getvarid(num));
 	prefix=*name;
-	
+
 	if(not_server_variable(prefix))
 		sd=script->rid2sd(st);
 	else
@@ -14581,7 +14531,7 @@ BUILDIN(equip2)
 		script_pushint(st,0);
 		return true;
 	}
-	
+
 	nameid = script_getnum(st,2);
 	if( (item_data = itemdb->exists(nameid)) == NULL )
 	{
@@ -14855,8 +14805,6 @@ BUILDIN(explode)
 	size_t len = strlen(str);
 	int i = 0, j = 0;
 	int start;
-
-
 	char *temp;
 	const char* name;
 
@@ -15427,7 +15375,6 @@ BUILDIN(countstr)
 	return true;
 }
 
-
 /// Changes the display name and/or display class of the npc.
 /// Returns 0 is successful, 1 if the npc does not exist.
 ///
@@ -16177,7 +16124,6 @@ BUILDIN(checkvending) // check vending [Nab4]
 	return true;
 }
 
-
 // check chatting [Marka]
 BUILDIN(checkchatting) {
 	TBL_PC *sd = NULL;
@@ -16319,7 +16265,6 @@ BUILDIN(pcfollow) {
 	int id, targetid;
 	TBL_PC *sd = NULL;
 
-
 	id = script_getnum(st,2);
 	targetid = script_getnum(st,3);
 
@@ -16339,7 +16284,6 @@ BUILDIN(pcstopfollow)
 	int id;
 	TBL_PC *sd = NULL;
 
-
 	id = script_getnum(st,2);
 
 	if(id)
@@ -16757,7 +16701,7 @@ BUILDIN(getvariableofnpc)
 
 	if( !nd->u.scr.script->local.vars )
 		nd->u.scr.script->local.vars = i64db_alloc(DB_OPT_RELEASE_DATA);
-	
+
 	script->push_val(st->stack, C_NAME, reference_getuid(data), &nd->u.scr.script->local);
 	return true;
 }
@@ -16794,7 +16738,7 @@ BUILDIN(warpportal) {
 
 	if( bl->type == BL_NPC )
 		unit->bl2ud2(bl); // ensure nd->ud is safe to edit
-	
+
 	group = skill->unitsetting(bl, AL_WARP, 4, spx, spy, 0);
 	if( group == NULL )
 		return true;// failed
@@ -17750,7 +17694,7 @@ BUILDIN(has_instance) {
 	int16 m;
 	int instance_id = -1;
 	bool type = strcmp(script->getfuncname(st),"has_instance2") == 0 ? true : false;
-	
+
 	str = script_getstr(st, 2);
 
 	if( (m = map->mapname2mapid(str)) < 0 ) {
@@ -17964,7 +17908,7 @@ BUILDIN(instance_check_guild)
 			c++;
 		}
 	}
-		
+
 	if( c < amount )
 		script_pushint(st,0);
 	else
@@ -18063,7 +18007,6 @@ BUILDIN(areamobuseskill) {
 	return true;
 }
 
-
 BUILDIN(progressbar)
 {
 	struct map_session_data * sd = script->rid2sd(st);
@@ -18125,7 +18068,6 @@ BUILDIN(pushpc)
 	return true;
 }
 
-
 /// Invokes buying store preparation window
 /// buyingstore <slots>;
 BUILDIN(buyingstore)
@@ -18140,7 +18082,6 @@ BUILDIN(buyingstore)
 	return true;
 }
 
-
 /// Invokes search store info window
 /// searchstores <uses>,<effect>;
 BUILDIN(searchstores)
@@ -18417,7 +18358,6 @@ BUILDIN(bindatcmd) {
 	if( script_hasdata(st,5) ) group_lv_char = script_getnum(st,5);
 	if( script_hasdata(st,6) ) log = script_getnum(st,6) ? true : false;
 
-
 	if( atcommand->binding_count == 0 ) {
 		CREATE(atcommand->binding,struct atcmd_binding_data*,1);
 
@@ -18692,11 +18632,11 @@ BUILDIN(npcskill) {
 	skill_level = script_getnum(st, 3);
 	stat_point  = script_getnum(st, 4);
 	npc_level   = script_getnum(st, 5);
-	
+
 	if( !(sd = script->rid2sd(st)) )
 		return false;
-	
-	nd          = (struct npc_data *)map->id2bl(sd->npc_id);
+
+	nd = (struct npc_data *)map->id2bl(sd->npc_id);
 
 	if (stat_point > battle_config.max_third_parameter) {
 		ShowError("npcskill: stat point exceeded maximum of %d.\n",battle_config.max_third_parameter );
@@ -18802,7 +18742,7 @@ BUILDIN(montransform) {
 		clif->ShowScript(&sd->bl, msg);
 		status_change_end(bl, SC_MONSTER_TRANSFORM, INVALID_TIMER); // Clear previous
 		sc_start2(NULL, bl, SC_MONSTER_TRANSFORM, 100, mob_id, type, tick);
-		
+
 		if (script_hasdata(st, 4))
 			sc_start4(NULL, bl, type, 100, val1, val2, val3, val4, tick);
 	}
@@ -19316,7 +19256,7 @@ BUILDIN(checkbound)
 		return true;
 	} else
 		script_pushint(st,0);
-	
+
 	return true;
 }
 
@@ -19397,8 +19337,6 @@ BUILDIN(instance_set_respawn) {
 			script_pushint(st, 0);
 		}
 	}
-
-
 	return true;
 }
 /**
@@ -19700,7 +19638,6 @@ BUILDIN(channelmes)
 	return true;
 }
 
-
 /** By Cydh
 Display script message
 showscript "<message>"{,<GID>};
@@ -20457,7 +20394,6 @@ void script_label_add(int key, int pos) {
  * Sets source-end constants for scripts to play with
  **/
 void script_hardcoded_constants(void) {
-	
 	/* server defines */
 	script->set_constant("PACKETVER",PACKETVER,false);
 	script->set_constant("MAX_LEVEL",MAX_LEVEL,false);
@@ -20577,7 +20513,7 @@ void script_hardcoded_constants(void) {
  **/
 unsigned short script_mapindexname2id (struct script_state *st, const char* name) {
 	unsigned short index;
-	
+
 	if( !(index=mapindex->name2id(name)) ) {
 		script->reportsrc(st);
 		return 0;
@@ -20585,7 +20521,6 @@ unsigned short script_mapindexname2id (struct script_state *st, const char* name
 	return index;
 }
 
-
 void script_defaults(void) {
 	// aegis->athena slot position conversion table
 	unsigned int equip[SCRIPT_EQUIP_TABLE_SIZE] = {EQP_HEAD_TOP,EQP_ARMOR,EQP_HAND_L,EQP_HAND_R,EQP_GARMENT,EQP_SHOES,EQP_ACC_L,EQP_ACC_R,EQP_HEAD_MID,EQP_HEAD_LOW,EQP_COSTUME_HEAD_LOW,EQP_COSTUME_HEAD_MID,EQP_COSTUME_HEAD_TOP,EQP_COSTUME_GARMENT,EQP_SHADOW_ARMOR, EQP_SHADOW_WEAPON, EQP_SHADOW_SHIELD, EQP_SHADOW_SHOES, EQP_SHADOW_ACC_R, EQP_SHADOW_ACC_L};
@@ -20598,7 +20533,7 @@ void script_defaults(void) {
 	script->st_ers = NULL;
 	script->stack_ers = NULL;
 	script->array_ers = NULL;
-	
+
 	script->hq = NULL;
 	script->hqi = NULL;
 	script->hqs = script->hqis = 0;
@@ -20822,7 +20757,7 @@ void script_defaults(void) {
 	script->global_casecheck.str_pos = 0;
 	memset(script->global_casecheck.str_hash, 0, sizeof(script->global_casecheck.str_hash));
 	// end ENABLE_CASE_CHECK
-	
+
 	/**
 	 * Array Handling
 	 **/
diff --git a/src/map/skill.c b/src/map/skill.c
index 5b41c55c0..a9ebf6998 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -115,7 +115,7 @@ int skill_get_index( uint16 skill_id ) {
 		else
 			ShowWarning("skill_get_index: skill id '%d' is not being handled!\n",skill_id);
 	}
-	
+
 	// validate result
 	if( !skill_id || skill_id >= MAX_SKILL_DB )
 		return 0;
@@ -481,14 +481,14 @@ int skillnotok (uint16 skill_id, struct map_session_data *sd)
 		clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0);
 		return 1;
 	}
-	
+
 	/**
 	 * It has been confirmed on a official server (thanks to Yommy) that item-cast skills bypass all the restrictions below
 	 * Also, without this check, an exploit where an item casting + healing (or any other kind buff) isn't deleted after used on a restricted map
 	 **/
 	if( sd->skillitem == skill_id )
 		return 0;
-	
+
 	if( sd->sc.data[SC_ALL_RIDING] )
 		return 1;//You can't use skills while in the new mounts (The client doesn't let you, this is to make cheat-safe)
 
@@ -2105,7 +2105,6 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in
 	return unit->blown(target, dx, dy, count, flag); // send over the proper flag
 }
 
-
 /*
 	Checks if 'bl' should reflect back a spell cast by 'src'.
 	type is the type of magic attack: 0: indirect (aoe), 1: direct (targeted)
@@ -2213,7 +2212,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 		if(csc && csc->data[SC_GRAVITATION] && csc->data[SC_GRAVITATION]->val3 == BCT_SELF )
 			return 0;
 	}
-	
+
 	dmg = battle->calc_attack(attack_type,src,bl,skill_id,skill_lv,flag&0xFFF);
 
 	//Skotlex: Adjusted to the new system
@@ -2232,7 +2231,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 		}
 	}
 
-	if( dmg.flag&BF_MAGIC 
+	if( dmg.flag&BF_MAGIC
 		&& (skill_id != NPC_EARTHQUAKE || (battle_config.eq_single_target_reflectable && (flag & 0xFFF) == 1)) ) { /* Need more info cause NPC_EARTHQUAKE is ground type */
 		// Earthquake on multiple targets is not counted as a target skill. [Inkfish]
 		int reflecttype;
@@ -2800,7 +2799,6 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 			battle->drain(sd, bl, dmg.damage, dmg.damage2, tstatus->race, tstatus->mode&MD_BOSS);
 	}
 
-
 	if( damage > 0 ) {
 		/**
 		 * Post-damage effects
@@ -9013,8 +9011,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			if ( sd ) {
 				int i, max;
 				sc_start(src, bl, SC_EXPLOSIONSPIRITS, 100, skill_lv, skill->get_time(skill_id, skill_lv));
-				clif->skill_nodamage(src, bl, skill_id, skill_lv, 
-					sc_start(src, bl, type, 100, skill_lv, skill->get_time(skill_id, skill_lv)));
+				clif->skill_nodamage(src, bl, skill_id, skill_lv,
+						sc_start(src, bl, type, 100, skill_lv, skill->get_time(skill_id, skill_lv)));
 				max = pc->getmaxspiritball(sd, 0);
 				for ( i = 0; i < max; i++ )
 					pc->addspiritball(sd, skill->get_time(MO_CALLSPIRITS, skill_lv), max);
@@ -9044,7 +9042,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			if( !dstsd )
 				break;
 			if ( sd && (dstsd->class_&MAPID_BASEMASK) != MAPID_GUNSLINGER ) {
-				int i, max = pc->getmaxspiritball(dstsd, 5); 
+				int i, max = pc->getmaxspiritball(dstsd, 5);
 				for ( i = 0; i < max; i++ ) {
 					pc->addspiritball(dstsd, skill->get_time(MO_CALLSPIRITS, 1), max);
 				}
@@ -12057,7 +12055,6 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6
 				status->change_start(ss,bl,type,10000,sg->skill_lv,sg->group_id,0,0,skill->get_time2(sg->skill_id,sg->skill_lv),SCFLAG_NONE);
 			break;
 
-
 		case UNT_MAGENTATRAP:
 		case UNT_COBALTTRAP:
 		case UNT_MAIZETRAP:
@@ -13953,7 +13950,6 @@ int skill_check_condition_castbegin_unknown(struct status_change *sc, uint16 *sk
     return -1;
 }
 
-
 int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, uint16 skill_lv) {
 	struct skill_condition require;
 	struct status_data *st;
@@ -15313,7 +15309,6 @@ int skill_sit (struct map_session_data *sd, int type)
 	int range = 0, lv;
 	nullpo_ret(sd);
 
-
 	if((lv = pc->checkskill(sd,RG_GANGSTER)) > 0) {
 		flag|=1;
 		range = skill->get_splash(RG_GANGSTER, lv);
@@ -15409,7 +15404,6 @@ int skill_attack_area(struct block_list *bl, va_list ap) {
 	flag = va_arg(ap,int);
 	type = va_arg(ap,int);
 
-
 	if (skill->area_temp[1] == bl->id) //This is the target of the skill, do a full attack and skip target checks.
 		return skill->attack(atk_type,src,dsrc,bl,skill_id,skill_lv,tick,flag);
 
@@ -15417,7 +15411,6 @@ int skill_attack_area(struct block_list *bl, va_list ap) {
 	 || !status->check_skilluse(NULL, bl, skill_id, 2))
 		return 0;
 
-
 	switch (skill_id) {
 		case WZ_FROSTNOVA: //Skills that don't require the animation to be removed
 		case NPC_ACIDBREATH:
@@ -17232,7 +17225,6 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid,
 
 	if(make_per < 1) make_per = 1;
 
-
 	if(rnd()%10000 < make_per || qty > 1){ //Success, or crafting multiple items.
 		struct item tmp_item;
 		memset(&tmp_item,0,sizeof(tmp_item));
@@ -17566,7 +17558,6 @@ void skill_toggle_magicpower(struct block_list *bl, uint16 skill_id) {
 	}
 }
 
-
 int skill_magicdecoy(struct map_session_data *sd, int nameid) {
 	int x, y, i, class_, skill_id;
 	struct mob_data *md;
@@ -17590,7 +17581,6 @@ int skill_magicdecoy(struct map_session_data *sd, int nameid) {
 
 	class_ = (nameid == ITEMID_BOODY_RED || nameid == ITEMID_CRYSTAL_BLUE) ? 2043 + nameid - ITEMID_BOODY_RED : (nameid == ITEMID_WIND_OF_VERDURE) ? 2046 : 2045;
 
-
 	md =  mob->once_spawn_sub(&sd->bl, sd->bl.m, x, y, sd->status.name, class_, "", SZ_SMALL, AI_NONE);
 	if( md ) {
 		md->master_id = sd->bl.id;
@@ -17729,7 +17719,6 @@ int skill_elementalanalysis(struct map_session_data* sd, int n, uint16 skill_lv,
 			return 1;
 		}
 
-
 		memset(&tmp_item,0,sizeof(tmp_item));
 		tmp_item.nameid = product;
 		tmp_item.amount = add_amount;
@@ -17978,7 +17967,6 @@ int skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) { /
 	uint16 idx = skill->get_index(skill_id);
 	nullpo_retr (-1, hd);
 
-
 	if (idx == 0)
 		return -1;
 
@@ -18913,7 +18901,6 @@ bool skill_parse_row_reproducedb(char* split[], int column, int current) {
 	return true;
 }
 
-
 bool skill_parse_row_abradb(char* split[], int columns, int current) {
 // skill_id,DummyName,RequiredHocusPocusLevel,Rate
 	uint16 skill_id = atoi(split[0]);
diff --git a/src/map/status.c b/src/map/status.c
index 9a95b023c..d7da17d5a 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1079,7 +1079,6 @@ void initDummyData(void)
 	status->dummy.mode = MD_CANMOVE;
 }
 
-
 //For copying a status_data structure from b to a, without overwriting current Hp and Sp
 static inline void status_cpy(struct status_data* a, const struct status_data* b)
 {
@@ -1952,7 +1951,6 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt) {
 		mstatus->speed -= cap_value(diff, 0, mstatus->speed - 10);
 	}
 
-
 	if (flag&2 && battle_config.mob_size_influence) {
 		// change for sized monsters [Valaris]
 		if (md->special_state.size==SZ_MEDIUM) {
@@ -2455,7 +2453,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 		if( data && data->script )
 			script->run_use_script(sd, data, 0);
 	}
-	
+
 	status->calc_pc_additional(sd, opt);
 
 	if( sd->pd ) { // Pet Bonus
@@ -2602,7 +2600,6 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 	if( (skill_lv = pc->checkskill(sd,WM_LESSON)) > 0 )
 		bstatus->max_sp += 30 * skill_lv;
 
-
 	// Apply relative modifiers from equipment
 	if(sd->sprate < 0)
 		sd->sprate = 0;
@@ -2781,7 +2778,6 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 #endif
 	bstatus->adelay = 2*bstatus->amotion;
 
-
 	// ----- DMOTION -----
 	//
 	i =  800-bstatus->agi*4;
@@ -5086,7 +5082,6 @@ signed short status_calc_def2(struct block_list *bl, struct status_change *sc, i
 #endif
 }
 
-
 defType status_calc_mdef(struct block_list *bl, struct status_change *sc, int mdef, bool viewable) {
 
 	if(!sc || !sc->count)
@@ -5800,7 +5795,6 @@ unsigned char status_calc_element_lv(struct block_list *bl, struct status_change
 	return (unsigned char)cap_value(lv,1,4);
 }
 
-
 unsigned char status_calc_attack_element(struct block_list *bl, struct status_change *sc, int element)
 {
 	if(!sc || !sc->count)
@@ -9533,12 +9527,12 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 		++(sc->count);
 		sce = sc->data[type] = ers_alloc(status->data_ers, struct status_change_entry);
 	}
-	
+
 	sce->val1 = val1;
 	sce->val2 = val2;
 	sce->val3 = val3;
 	sce->val4 = val4;
-	
+
 	if (tick >= 0) {
 		sce->timer = timer->add(timer->gettick() + tick, status->change_timer, bl->id, type);
 		sce->infinite_duration = false;
@@ -9729,7 +9723,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 		return 0;
 
 	st = status->get_status_data(bl);
-	
+
 	if( sd && sce->infinite_duration && !sd->state.loggingout )
 		chrif->del_scdata_single(sd->status.account_id,sd->status.char_id,type);
 
@@ -9911,7 +9905,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 					}
 
 					sce->val2 = 0;
-					
+
 					if( group )
 						skill->del_unitgroup(group,ALC_MARK);
 				}
@@ -10510,7 +10504,7 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
 		ShowError("status_change_timer: Mismatch for type %d: %d != %d (bl id %d)\n",type,tid,sce->timer, bl->id);
 		return 0;
 	}
-	
+
 	sce->timer = INVALID_TIMER;
 
 	sd = BL_CAST(BL_PC, bl);
@@ -10948,15 +10942,14 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
 				int heal = st->max_hp * 3 / 100;
 				if (sc->count && sc->data[SC_AKAITSUKI] && heal)
 					heal = ~heal + 1;
-				
+
 				map->freeblock_lock();
-				
 				status->heal(bl, heal, 0, 2);
 				if( sc->data[type] ) {
 					sc_timer_next(5000 + tick, status->change_timer, bl->id, data);
 				}
 				map->freeblock_unlock();
-				
+
 				return 0;
 			}
 			break;
@@ -11115,7 +11108,6 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
 			}
 			break;
 
-
 		case SC_SATURDAY_NIGHT_FEVER:
 			if( --(sce->val3) >= 0 ) {
 				if( !status->charge(bl, st->max_hp * 1 / 100, st->max_sp * 1 / 100) )
@@ -11656,7 +11648,7 @@ int status_change_clear_buffs (struct block_list* bl, int type) {
 		return 0;
 
 	map->freeblock_lock();
-	
+
 	if (type&6) //Debuffs
 		for (i = SC_COMMON_MIN; i <= SC_COMMON_MAX; i++)
 			status_change_end(bl, (sc_type)i, INVALID_TIMER);
@@ -11703,9 +11695,9 @@ int status_change_clear_buffs (struct block_list* bl, int type) {
 		}
 		status_change_end(bl, (sc_type)i, INVALID_TIMER);
 	}
-	
+
 	map->freeblock_unlock();
-	
+
 	return 0;
 }
 
@@ -12220,11 +12212,10 @@ void status_read_job_db(void) { /* [malufett/Hercules] */
 	int i = 0;
 	config_t job_db_conf;
 	config_setting_t *jdb = NULL;
-	const char *config_filename = 
 #ifdef RENEWAL_ASPD
-		"db/re/job_db.conf";
+	const char *config_filename = "db/re/job_db.conf";
 #else
-		"db/pre-re/job_db.conf";
+	const char *config_filename = "db/pre-re/job_db.conf";
 #endif
 
 	if ( libconfig->read_file(&job_db_conf, config_filename) ) {