diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 77c7050bd..f62791274 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/01/12 + * Modified npc_parsesrcfile to read the file as binary and let sv_parse handle LF/CRLF line endings. * Possible fix to ers/status_change crashing. [FlavioJS] - this patch is untested. Didn't find anyone willing to test it and I can't reproduce the crash so can't test the patch. diff --git a/src/map/npc.c b/src/map/npc.c index 0f0c09e62..f2601e1e9 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2523,7 +2523,7 @@ void npc_parsesrcfile(const char* filepath) const char* p; // read whole file to buffer - fp = fopen(filepath, "rt"); + fp = fopen(filepath, "rb"); if( fp == NULL ) { ShowError("npc_parsesrcfile: File not found '%s'.\n", filepath); @@ -2553,7 +2553,7 @@ void npc_parsesrcfile(const char* filepath) lines++; // w1<TAB>w2<TAB>w3<TAB>w4 - count = sv_parse(p, len+buffer-p, 0, '\t', pos, ARRAYLENGTH(pos), SV_TERMINATE_LF); + count = sv_parse(p, len+buffer-p, 0, '\t', pos, ARRAYLENGTH(pos), SV_TERMINATE_LF|SV_TERMINATE_CRLF); if( count < 0 ) { ShowError("npc_parsesrcfile: Parse error in file '%s', line '%d'. Stopping...\n", filepath, strline(buffer,p-buffer)); |