summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-24 18:04:13 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-24 18:04:13 +0000
commitdb25ca901ee5ed40d1fe709534dba403ea366bad (patch)
tree01c52f66e1a4004027cdccc459bcb8d64fb074d1 /src/map
parent131f900b67ceaf41df94645a49e4af64eaf2b335 (diff)
downloadhercules-db25ca901ee5ed40d1fe709534dba403ea366bad.tar.gz
hercules-db25ca901ee5ed40d1fe709534dba403ea366bad.tar.bz2
hercules-db25ca901ee5ed40d1fe709534dba403ea366bad.tar.xz
hercules-db25ca901ee5ed40d1fe709534dba403ea366bad.zip
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
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.c6
1 files changed, 6 insertions, 0 deletions
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
}