Index: conf/msg_conf/map_msg.conf
===================================================================
--- conf/msg_conf/map_msg.conf	(revision 17330)
+++ conf/msg_conf/map_msg.conf	(working copy)
@@ -451,9 +451,29 @@
 463: Message configuration has been reloaded.
 464: ---- Available languages:
 
+480: ----- Players in Map -----
+481: Player '%s' (session #%d) | Location: %d,%d
+482: ----- NPCs in Map -----
+483: ----- Chats in Map -----
+484: Chat: %s | Player: %s | Location: %d %d
+485:    Users: %d/%d | Password: %s | Public: %s
+486: Yes
+487: No
+488: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
+489: NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d
+490: NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d
+491: North
+492: North West
+493: West
+494: South West
+495: South
+496: South East
+497: East
+498: North East
+499: Unknown
+
 // Messages of others (not for GM commands)
 // ----------------------------------------
-
 //500 free
 501: Your account time limit is: %d-%m-%Y %H:%M:%S.
 502: Day Mode is activated
@@ -848,7 +868,7 @@
 1042: Town Map
 1043: Autotrade Enabled
 1044: Autotrade Disabled
-1045: Battlegrounds ON
+1045: Battlegrounds ON type=%d
 1046: PvP Flags:
 1047: Pvp ON |
 1048: NoGuild |
@@ -901,27 +921,15 @@
 1095: NoMVPLoot |
 1096: PartyLock |
 1097: GuildLock |
-1098: ----- Players in Map -----
-1099: Player '%s' (session #%d) | Location: %d,%d
-1100: ----- NPCs in Map -----
-1101: North
-1102: North West
-1103: West
-1104: South West
-1105: South
-1106: South East
-1107: East
-1108: North East
-1109: North
-1110: Unknown
-1111: NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d
-1112: NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d
-1113: ----- Chats in Map -----
-1114: Chat: %s | Player: %s | Location: %d %d
-1115:    Users: %d/%d | Password: %s | Public: %s
-1116: Yes
-1117: No
-1118: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
+1098: Loadevent |
+1099: Src4instance |
+1100: Chmautojoin |
+1101: nousecart |
+1102: noitemconsumption |
+1103: nosumstarmiracle |
+1104: nomineeffect |
+1105: nolockon |
+1106: Restricted zone=%d
 
 // @mount
 1119: You have mounted your Dragon.
Index: src/common/cbasetypes.h
===================================================================
--- src/common/cbasetypes.h	(revision 17330)
+++ src/common/cbasetypes.h	(working copy)
@@ -177,6 +177,7 @@
 // integer with exact processor width (and best speed)
 //////////////////////////////
 #include <stddef.h> // size_t
+//#include <stdbool.h> //boolean
 
 #if defined(WIN32) && !defined(MINGW) // does not have a signed size_t
 //////////////////////////////
@@ -276,7 +277,7 @@
 #undef swap
 #endif
 // hmm only ints?
-//#define swap(a,b) { int temp=a; a=b; b=temp;} 
+//#define swap(a,b) { int temp=a; a=b; b=temp;}
 // if using macros then something that is type independent
 //#define swap(a,b) ((a == b) || ((a ^= b), (b ^= a), (a ^= b)))
 // Avoid "value computed is not used" warning and generates the same assembly code
Index: src/map/map.h
===================================================================
--- src/map/map.h	(revision 17330)
+++ src/map/map.h	(working copy)
@@ -553,12 +553,12 @@
 		unsigned sakura : 1; // [Valaris]
 		unsigned leaves : 1; // [Valaris]
 		unsigned nogo : 1; // [Valaris]
-		unsigned nobaseexp	: 1; // [Lorky] added by Lupus
-		unsigned nojobexp	: 1; // [Lorky]
-		unsigned nomobloot	: 1; // [Lorky]
-		unsigned nomvploot	: 1; // [Lorky]
+		unsigned nobaseexp : 1; // [Lorky] added by Lupus
+		unsigned nojobexp : 1; // [Lorky]
+		unsigned nomobloot : 1; // [Lorky]
+		unsigned nomvploot : 1; // [Lorky]
 		unsigned nightenabled :1; //For night display. [Skotlex]
-		unsigned restricted	: 1; // [Komurka]
+		unsigned restricted : 1; // [Komurka]
 		unsigned nodrop : 1;
 		unsigned novending : 1;
 		unsigned loadevent : 1;
Index: src/map/pc.c
===================================================================
--- src/map/pc.c	(revision 17330)
+++ src/map/pc.c	(working copy)
@@ -519,7 +519,7 @@
 	if(!battle_config.save_clothcolor)
 		sd->status.clothes_color=0;
 
-  	//Only copy the Cart/Peco/Falcon options, the rest are handled via
+	//Only copy the Cart/Peco/Falcon options, the rest are handled via
 	//status change load/saving. [Skotlex]
 #ifdef NEW_CARTS
 	sd->status.option = sd->sc.option&(OPTION_INVISIBLE|OPTION_FALCON|OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_WUGRIDER|OPTION_MADOGEAR|OPTION_MOUNTING);
@@ -4044,7 +4044,7 @@
 		}
 		else
 		if(fitem->second_get_charid > 0 && fitem->second_get_charid != sd->status.char_id)
-	  	{
+		{
 			second_sd = map_charid2sd(fitem->second_get_charid);
 			if(DIFF_TICK(tick, fitem->second_get_tick) < 0) {
 				if(!(p && p->party.item&1 &&
@@ -6573,10 +6573,8 @@
 {
 	TBL_PC *sd = map_id2sd(id);
 	if(sd) pc_close_npc(sd,data);
-
 	return 0;
 }
-
 /*
  *  Method to properly close npc for player and clear anything related
  * @flag == 1 : produce close button
@@ -9231,7 +9229,7 @@
 static int pc_daynight_timer_sub(struct map_session_data *sd,va_list ap)
 {
 	if (sd->state.night != night_flag && map[sd->bl.m].flag.nightenabled)
-  	{	//Night/day state does not match.
+	{	//Night/day state does not match.
 		clif_status_load(&sd->bl, SI_NIGHT, night_flag); //New night effect by dynamix [Skotlex]
 		sd->state.night = night_flag;
 		return 1;
Index: src/map/buyingstore.c
===================================================================
--- src/map/buyingstore.c	(revision 17330)
+++ src/map/buyingstore.c	(working copy)
@@ -44,10 +44,8 @@
 }
 
 
-bool buyingstore_setup(struct map_session_data* sd, unsigned char slots)
-{
-	if( !battle_config.feature_buying_store || sd->state.vending || sd->state.buyingstore || sd->state.trading || slots == 0 )
-	{
+bool buyingstore_setup(struct map_session_data* sd, unsigned char slots){
+	if (!battle_config.feature_buying_store || sd->state.vending || sd->state.buyingstore || sd->state.trading || slots == 0) {
 		return false;
 	}
 
Index: src/map/atcommand.c
===================================================================
--- src/map/atcommand.c	(revision 17330)
+++ src/map/atcommand.c	(working copy)
@@ -676,7 +676,7 @@
 			memcpy(player_name, pl_sd->status.name, NAME_LENGTH);
 			for (j = 0; player_name[j]; j++)
 				player_name[j] = TOLOWER(player_name[j]);
-		  	// search with no case sensitive
+			// search with no case sensitive
 			if (strstr(player_name, match_text) == NULL)
 				continue;
 		}
@@ -2492,8 +2492,7 @@
 /*==========================================
  *
  *------------------------------------------*/
-ACMD_FUNC(guildlevelup)
-{
+ACMD_FUNC(guildlevelup) {
 	int level = 0;
 	short added_level;
 	struct guild *guild_info;
@@ -2533,8 +2532,7 @@
 /*==========================================
  *
  *------------------------------------------*/
-ACMD_FUNC(makeegg)
-{
+ACMD_FUNC(makeegg) {
 	struct item_data *item_data;
 	int id, pet_id;
 	nullpo_retr(-1, sd);
@@ -2573,8 +2571,7 @@
 /*==========================================
  *
  *------------------------------------------*/
-ACMD_FUNC(hatch)
-{
+ACMD_FUNC(hatch) {
 	nullpo_retr(-1, sd);
 	if (sd->status.pet_id <= 0)
 		clif_sendegg(sd);
@@ -2589,8 +2586,7 @@
 /*==========================================
  *
  *------------------------------------------*/
-ACMD_FUNC(petfriendly)
-{
+ACMD_FUNC(petfriendly) {
 	int friendly;
 	struct pet_data *pd;
 	nullpo_retr(-1, sd);
 /*==========================================
  * @mapinfo [0-3] <map name> by MC_Cameri
  * => Shows information about the map [map name]
@@ -3776,15 +3780,20 @@
 	clif_displaymessage(fd, msg_txt(sd,1041)); // ------ Map Flags ------
 	if (map[m_id].flag.town)
 		clif_displaymessage(fd, msg_txt(sd,1042)); // Town Map
+	if (map[m_id].flag.restricted){
+		sprintf(atcmd_output, msg_txt(sd,1106),map[m_id].zone);
+		clif_displaymessage(fd, atcmd_output); //restricted
+	}
 
 	if (battle_config.autotrade_mapflag == map[m_id].flag.autotrade)
 		clif_displaymessage(fd, msg_txt(sd,1043)); // Autotrade Enabled
 	else
 		clif_displaymessage(fd, msg_txt(sd,1044)); // Autotrade Disabled
 
-	if (map[m_id].flag.battleground)
-		clif_displaymessage(fd, msg_txt(sd,1045)); // Battlegrounds ON
-
+	if (map[m_id].flag.battleground){
+		sprintf(atcmd_output, msg_txt(sd,1106),map[m_id].zone);
+		clif_displaymessage(fd, atcmd_output); // Battlegrounds ON type=%d
+	}
 	strcpy(atcmd_output,msg_txt(sd,1046)); // PvP Flags:
 	if (map[m_id].flag.pvp)
 		strcat(atcmd_output, msg_txt(sd,1047)); // Pvp ON |
@@ -3897,6 +3906,22 @@
 		strcat(atcmd_output, msg_txt(sd,1096)); // PartyLock |
 	if (map[m_id].flag.guildlock)
 		strcat(atcmd_output, msg_txt(sd,1097)); // GuildLock |
+	if (map[m_id].flag.loadevent)
+		strcat(atcmd_output, msg_txt(sd,1098)); //Loadevent |
+	if (map[m_id].flag.src4instance)
+		strcat(atcmd_output, msg_txt(sd,1099)); // Src4instance |
+	if (map[m_id].flag.chmautojoin)
+		strcat(atcmd_output, msg_txt(sd,1100)); // Chmautojoin |
+	if (map[m_id].flag.nousecart)
+		strcat(atcmd_output, msg_txt(sd,1101)); // nousecart |
+	if (map[m_id].flag.noitemconsumption)
+		strcat(atcmd_output, msg_txt(sd,1102)); // noitemconsumption |
+	if (map[m_id].flag.nosumstarmiracle)
+		strcat(atcmd_output, msg_txt(sd,1103)); // nosumstarmiracle |
+	if (map[m_id].flag.nomineeffect)
+		strcat(atcmd_output, msg_txt(sd,1104)); // nomineeffect |
+	if (map[m_id].flag.nolockon)
+		strcat(atcmd_output, msg_txt(sd,1105)); // nolockon |
 	clif_displaymessage(fd, atcmd_output);
 
 	switch (list) {
@@ -3904,12 +3929,12 @@
 		// Do nothing. It's list 0, no additional display.
 		break;
 	case 1:
-		clif_displaymessage(fd, msg_txt(sd,1098)); // ----- Players in Map -----
+		clif_displaymessage(fd, msg_txt(sd,480)); // ----- Players in Map -----
 		iter = mapit_getallusers();
 		for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) )
 		{
 			if (pl_sd->mapindex == m_index) {
-				sprintf(atcmd_output, msg_txt(sd,1099), // Player '%s' (session #%d) | Location: %d,%d
+				sprintf(atcmd_output, msg_txt(sd,481), // Player '%s' (session #%d) | Location: %d,%d
 				        pl_sd->status.name, pl_sd->fd, pl_sd->bl.x, pl_sd->bl.y);
 				clif_displaymessage(fd, atcmd_output);
 			}
@@ -3917,33 +3942,33 @@
 		mapit_free(iter);
 		break;
 	case 2:
-		clif_displaymessage(fd, msg_txt(sd,1100)); // ----- NPCs in Map -----
+		clif_displaymessage(fd, msg_txt(sd,482)); // ----- NPCs in Map -----
 		for (i = 0; i < map[m_id].npc_num;)
 		{
 			nd = map[m_id].npc[i];
 			switch(nd->ud.dir) {
-			case 0:  strcpy(direction, msg_txt(sd,1101)); break; // North
-			case 1:  strcpy(direction, msg_txt(sd,1102)); break; // North West
-			case 2:  strcpy(direction, msg_txt(sd,1103)); break; // West
-			case 3:  strcpy(direction, msg_txt(sd,1104)); break; // South West
-			case 4:  strcpy(direction, msg_txt(sd,1105)); break; // South
-			case 5:  strcpy(direction, msg_txt(sd,1106)); break; // South East
-			case 6:  strcpy(direction, msg_txt(sd,1107)); break; // East
-			case 7:  strcpy(direction, msg_txt(sd,1108)); break; // North East
-			case 9:  strcpy(direction, msg_txt(sd,1109)); break; // North
-			default: strcpy(direction, msg_txt(sd,1110)); break; // Unknown
+			case 0:  strcpy(direction, msg_txt(sd,491)); break; // North
+			case 1:  strcpy(direction, msg_txt(sd,492)); break; // North West
+			case 2:  strcpy(direction, msg_txt(sd,493)); break; // West
+			case 3:  strcpy(direction, msg_txt(sd,494)); break; // South West
+			case 4:  strcpy(direction, msg_txt(sd,495)); break; // South
+			case 5:  strcpy(direction, msg_txt(sd,496)); break; // South East
+			case 6:  strcpy(direction, msg_txt(sd,497)); break; // East
+			case 7:  strcpy(direction, msg_txt(sd,498)); break; // North East
+			case 9:  strcpy(direction, msg_txt(sd,491)); break; // North
+			default: strcpy(direction, msg_txt(sd,499)); break; // Unknown
 			}
 			if(strcmp(nd->name,nd->exname) == 0)
-				sprintf(atcmd_output, msg_txt(sd,1111), // NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d
+				sprintf(atcmd_output, msg_txt(sd,490), // NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d
 				    ++i, nd->name, direction, nd->class_, nd->bl.x, nd->bl.y);
 			else
-				sprintf(atcmd_output, msg_txt(sd,1112), // NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d
-			        ++i, nd->name, nd->exname, direction, nd->class_, nd->bl.x, nd->bl.y);
+				sprintf(atcmd_output, msg_txt(sd,489), // NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d
+				++i, nd->name, nd->exname, direction, nd->class_, nd->bl.x, nd->bl.y);
 			clif_displaymessage(fd, atcmd_output);
 		}
 		break;
 	case 3:
-		clif_displaymessage(fd, msg_txt(sd,1113)); // ----- Chats in Map -----
+		clif_displaymessage(fd, msg_txt(sd,483)); // ----- Chats in Map -----
 		iter = mapit_getallusers();
 		for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) )
 		{
@@ -3951,18 +3976,18 @@
 			    pl_sd->mapindex == m_index &&
 			    cd->usersd[0] == pl_sd)
 			{
-				sprintf(atcmd_output, msg_txt(sd,1114), // Chat: %s | Player: %s | Location: %d %d
-				        cd->title, pl_sd->status.name, cd->bl.x, cd->bl.y);
+				sprintf(atcmd_output, msg_txt(sd,484), // Chat: %s | Player: %s | Location: %d %d
+					cd->title, pl_sd->status.name, cd->bl.x, cd->bl.y);
 				clif_displaymessage(fd, atcmd_output);
-				sprintf(atcmd_output, msg_txt(sd,1115), //    Users: %d/%d | Password: %s | Public: %s
-				        cd->users, cd->limit, cd->pass, (cd->pub) ? msg_txt(sd,1116) : msg_txt(sd,1117)); // Yes / No
+				sprintf(atcmd_output, msg_txt(sd,485), //    Users: %d/%d | Password: %s | Public: %s
+					cd->users, cd->limit, cd->pass, (cd->pub) ? msg_txt(sd,486) : msg_txt(sd,487)); // Yes / No
 				clif_displaymessage(fd, atcmd_output);
 			}
 		}
 		mapit_free(iter);
 		break;
 	default: // normally impossible to arrive here
-		clif_displaymessage(fd, msg_txt(sd,1118)); // Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
+		clif_displaymessage(fd, msg_txt(sd,488)); // Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
 		return -1;
 		break;
 	}
@@ -8429,8 +8454,7 @@
 		slen = strlen(cmd->command);
 
 		// flush the text buffer if this command won't fit into it
-		if ( slen + cur - line_buff >= CHATBOX_SIZE )
-		{
+        if (slen + cur - line_buff >= CHATBOX_SIZE) {
 			clif_displaymessage(fd,line_buff);
 			cur = line_buff;
 			memset(line_buff,' ',CHATBOX_SIZE);
@@ -9053,6 +9077,7 @@
 		ACMD_DEF2("reloadquestdb", reload),
 		ACMD_DEF2("reloadmsgconf", reload),
 		ACMD_DEF2("reloadpacketdb", reload),
+		ACMD_DEF(reloadpacketdb),
 		ACMD_DEF(mapinfo),
 		ACMD_DEF(dye),
 		ACMD_DEF2("hairstyle", hair_style),
Index: src/map/unit.c
===================================================================
--- src/map/unit.c	(revision 17330)
+++ src/map/unit.c	(working copy)
@@ -798,7 +798,7 @@
 	}
 
 	if (x<0 || y<0)
-  	{	//Random map position.
+	{	//Random map position.
 		if (!map_search_freecell(NULL, m, &x, &y, -1, -1, 1)) {
 			ShowWarning("unit_warp failed. Unit Id:%d/Type:%d, target position map %d (%s) at [%d,%d]\n", bl->id, bl->type, m, map[m].name, x, y);
 			return 2;
Index: src/map/clif.c
===================================================================
--- src/map/clif.c	(revision 17330)
+++ src/map/clif.c	(working copy)
@@ -11579,7 +11579,7 @@
 /// 0100
 void clif_parse_LeaveParty(int fd, struct map_session_data *sd)
 {
-	if(map[sd->bl.m].flag.partylock) { //Guild locked.
+	if(map[sd->bl.m].flag.partylock) { //part locked.
 		clif_displaymessage(fd, msg_txt(sd,227));
 		return;
 	}
@@ -11591,7 +11591,7 @@
 /// 0103 <account id>.L <char name>.24B
 void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd)
 {
-	if(map[sd->bl.m].flag.partylock) { //Guild locked.
+	if(map[sd->bl.m].flag.partylock) { //party locked.
 		clif_displaymessage(fd, msg_txt(sd,227));
 		return;
 	}
Index: src/map/clif.h
===================================================================
--- src/map/clif.h	(revision 17330)
+++ src/map/clif.h	(working copy)
@@ -783,4 +783,5 @@
 
 #define clif_menuskill_clear(sd) (sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0;
 
+
 #endif /* _CLIF_H_ */
Index: src/map/skill.c
===================================================================
--- src/map/skill.c	(revision 17330)
+++ src/map/skill.c	(working copy)
@@ -9579,7 +9579,7 @@
 			if(sc->data[SC_SPIRIT] &&
 				sc->data[SC_SPIRIT]->val2 == SL_WIZARD &&
 				sc->data[SC_SPIRIT]->val3 == ud->skill_id &&
-			  	ud->skill_id != WZ_WATERBALL)
+				ud->skill_id != WZ_WATERBALL)
 				sc->data[SC_SPIRIT]->val3 = 0; //Clear bounced spell check.
 
 			if( sc->data[SC_DANCING] && skill_get_inf2(ud->skill_id)&INF2_SONG_DANCE && sd )
@@ -9600,7 +9600,7 @@
 
 	//Skill failed.
 	if (ud->skill_id == MO_EXTREMITYFIST && sd && !(sc && sc->data[SC_FOGWALL]))
-  	{	//When Asura fails... (except when it fails from Fog of Wall)
+	{	//When Asura fails... (except when it fails from Fog of Wall)
 		//Consume SP/spheres
 		skill_consume_requirement(sd,ud->skill_id, ud->skill_lv,1);
 		status_set_sp(src, 0, 0);
@@ -17582,7 +17582,7 @@
 						static const int dx[] = {-1,-1,-1,-1, 0, 0, 0, 0, 1, 1, 1, 1,
 									 -5,-5,-5,-5,-4,-4,-4,-4,-3,-3,-3,-3,-2,-2,-2,-2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5,
 									 -1,-1,-1, 0, 0, 0, 1, 1, 1};
-						static const int dy[] = { 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3, 
+						static const int dy[] = { 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3,
 									  0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3, 0,-1,-2,-3,
 									 -4,-5,-6,-4,-5,-6,-4,-5,-6};
 						skill_unit_layout[pos].count = 53;
Index: src/char/char.c
===================================================================
--- src/char/char.c	(revision 17330)
+++ src/char/char.c	(working copy)
@@ -3443,8 +3443,8 @@
 				flush_fifo(sfd);
 				do_close(sfd);
 				RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-		}
-		break;
+			}
+			break;
 
 		default:
 		{