# This patch file was generated by NetBeans IDE
# It uses platform neutral UTF-8 encoding and \n newlines.
Index: atcommand.c
--- atcommand.c Base (BASE)
+++ atcommand.c Locally Modified (Based On LOCAL)
@@ -7894,9 +7894,9 @@
 ACMD_FUNC(mapflag) {
 #define checkflag( cmd ) if ( map[ sd->bl.m ].flag.cmd ) clif_displaymessage(sd->fd,#cmd)
 #define setflag( cmd ) \
-	if ( strcmp( flag_name , #cmd ) == 0 && ( flag == 0 || flag == 1 ) ){\
+	if ( strcmp( flag_name , #cmd ) == 0 ){\
 		map[ sd->bl.m ].flag.cmd = flag;\
-		sprintf(atcmd_output,"[ @mapflag ] %s flag has been set to %s",#cmd,flag?"On":"Off");\
\ No newline at end of file
+		sprintf(atcmd_output,"[ @mapflag ] %s flag has been set to %s (flag=%d)",#cmd,flag?"On":"Off",flag);\
\ No newline at end of file
 		clif_displaymessage(sd->fd,atcmd_output);\
 		return 0;\
 	}


Index: script.c
--- script.c Base (BASE)
+++ script.c Locally Modified (Based On LOCAL)
@ -10053,7 +10054,7 @@
 	str=script_getstr(st,2);
 	i=script_getnum(st,3);
 	if(script_hasdata(st,4)){
-		val=script_getstr(st,4);
+		val=script_getnum(st,4);
 	}
 	m = map_mapname2mapid(str);
 	if(m >= 0) {
@@ -10097,13 +10098,13 @@
 			case MF_NOWARPTO:			map[m].flag.nowarpto = 1; break;
 			case MF_NIGHTMAREDROP:		map[m].flag.pvp_nightmaredrop = 1; break;
 			case MF_RESTRICTED:
-				map[m].zone |= 1<<((int)atoi(val)+1);
+				map[m].zone |= 1<<(val+1);
 				map[m].flag.restricted=1;
 				break;
-			case MF_NOCOMMAND:			map[m].nocommand = (!val || atoi(val) <= 0) ? 100 : atoi(val); break;
+			case MF_NOCOMMAND:			map[m].nocommand = (val <= 0) ? 100 : val; break;
 			case MF_NODROP:				map[m].flag.nodrop = 1; break;
-			case MF_JEXP:				map[m].jexp = (!val || atoi(val) < 0) ? 100 : atoi(val); break;
-			case MF_BEXP:				map[m].bexp = (!val || atoi(val) < 0) ? 100 : atoi(val); break;
+			case MF_JEXP:				map[m].jexp = (val < 0) ? 100 : val; break;
+			case MF_BEXP:				map[m].bexp = (val < 0) ? 100 : val; break;
 			case MF_NOVENDING:			map[m].flag.novending = 1; break;
 			case MF_LOADEVENT:			map[m].flag.loadevent = 1; break;
 			case MF_NOCHAT:				map[m].flag.nochat = 1; break;
@@ -10114,7 +10115,7 @@
 			case MF_ALLOWKS:			map[m].flag.allowks = 1; break;
 			case MF_MONSTER_NOTELEPORT:	map[m].flag.monster_noteleport = 1; break;
 			case MF_PVP_NOCALCRANK:		map[m].flag.pvp_nocalcrank = 1; break;
-			case MF_BATTLEGROUND:		map[m].flag.battleground = (!val || atoi(val) < 0 || atoi(val) > 2) ? 1 : atoi(val); break;
+			case MF_BATTLEGROUND:		map[m].flag.battleground = (val < 0 || val > 3) ? 1 : val; break;
 			case MF_RESET:				map[m].flag.reset = 1; break;
 		}
 	}
@@ -10131,7 +10132,7 @@
 	str=script_getstr(st,2);
 	i=script_getnum(st,3);
 	if(script_hasdata(st,4)){
-		val=script_getstr(st,4);
+		val=script_getnum(st,4);
 	}
 	m = map_mapname2mapid(str);
 	if(m >= 0) {
@@ -10175,7 +10176,7 @@
 			case MF_NOWARPTO:			map[m].flag.nowarpto = 0; break;
 			case MF_NIGHTMAREDROP:		map[m].flag.pvp_nightmaredrop = 0; break;
 			case MF_RESTRICTED:
-				map[m].zone ^= 1<<((int)atoi(val)+1);
+				map[m].zone ^= 1<<(val+1);
 				if (map[m].zone == 0){
 					map[m].flag.restricted=0;
 				}