From 56dc9bf692f21a2655b594af8644ea2dbeaa72be Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 29 Nov 2006 18:41:31 +0000 Subject: - Fixed the new npc parsing code not accounting for windows-style line terminators, which as a side effect messed up mapflag parsing if the file had windows-style terminators, which coincidentally was the case for the nopvp file, which unfortunately meant that all towns became pvp! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9363 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/npc.c b/src/map/npc.c index 7dd0f146c..3af9d5e2e 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2643,7 +2643,7 @@ void npc_parsesrcfile (char *name) w1[0] = w2[0] = w3[0] = w4[0] = '\0'; //It's best to initialize values //to prevent passing previously parsed values to the parsers when not all //fields are specified. [Skotlex] - if ((count = sscanf(line, "%[^\t\n]\t%[^\t\n]\t%[^\t\n]\t%n%[^\n]", w1, w2, w3, &w4pos, w4)) < 3) + if ((count = sscanf(line, "%[^\t\r\n]\t%[^\t\r\n]\t%[^\t\r\n]\t%n%[^\r\n]", w1, w2, w3, &w4pos, w4)) < 3) { if ((count = sscanf(line, "%s %s %[^\t]\t %n%[^\n]", w1, w2, w3, &w4pos, w4)) == 4 || (count = sscanf(line, "%s %s %s %n%[^\n]\n", w1, w2, w3, &w4pos, w4)) >= 3) -- cgit v1.2.3-70-g09d2