Now the server will print an error message if an invalid mapflag is found during script loading (see bugreport:980 for the motivation).

Removed one extra space that broke jail's noreturn mapflag loading.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12238 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 11 insertions, 1 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3d2a96e18..14b3bb657 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/02/23
+	* Now the server will print an error message if an invalid mapflag is
+	  found during script loading (see bugreport:980 for the motivation)
+	- removed one extra space that broke jail's noreturn mapflag loading
 2008/02/22
 	* Removed code in socket.c that tries to avoid send buffer overloading,
 	  as there is a scenario (many players and charserver disconnect) where
diff --git a/conf/mapflag/jail.txt b/conf/mapflag/jail.txt
index 99cd7b653..5b1b9c48c 100644
--- a/conf/mapflag/jail.txt
+++ b/conf/mapflag/jail.txt
@@ -33,7 +33,7 @@ sec_pri	mapflag	noteleport
 sec_pri	mapflag	nowarp
 
 // No Return, Stop people from being pulled out of jail (warpparty/guild)
-sec_pri	mapflag	noreturn 
+sec_pri	mapflag	noreturn
 
 // Bloody Jail ===========================
 //Uncomment following maps to let your prisoners fight with other prisoners
diff --git a/src/map/npc.c b/src/map/npc.c
index 6f1c59806..7a1cca0f3 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2491,6 +2491,12 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
 		map[m].flag.partylock=state;
 	else if (!strcmpi(w3,"guildlock"))
 		map[m].flag.guildlock=state;
+	else
+	{
+		char buf[256];
+		sv_escape_c(buf, w3, strlen(w3), NULL); // to handle \r properly
+		ShowError("npc_parse_mapflag: unrecognized mapflag '%s' (file '%s', line '%d').\n", buf, filepath, strline(buffer,start-buffer));
+	}
 
 	return strchr(start,'\n');// continue
 }