diff options
| author | shennetsind <ind@henn.et> | 2013-11-08 15:39:36 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-08 15:39:36 -0200 |
| commit | 0876387f293ee633f7bfe12f8adf3f4a37d5b736 (patch) | |
| tree | e79f8fc8faf616955ec4f91dc88b3b1ba96c320a /src/map/npc.c | |
| parent | bc9743ce3455f9d9cbc9c934b2a19343ad369fc5 (diff) | |
| download | hercules-0876387f293ee633f7bfe12f8adf3f4a37d5b736.tar.gz hercules-0876387f293ee633f7bfe12f8adf3f4a37d5b736.tar.bz2 hercules-0876387f293ee633f7bfe12f8adf3f4a37d5b736.tar.xz hercules-0876387f293ee633f7bfe12f8adf3f4a37d5b736.zip | |
Fixed Bug 7807
NPC Duplicates with xs/ys weren't being properly loaded, Special Thanks to Haruna.
Also fixes an issue with the instance empty timer.
http://hercules.ws/board/tracker/issue-7807-endless-tower/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 9330d59d3..03e4aa9fa 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2564,7 +2564,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch } if( type == WARP && sscanf(w4, "%d,%d", &xs, &ys) == 2 );// <spanx>,<spany> - else if( type == SCRIPT && sscanf(w4, "%*d,%d,%d", &xs, &ys) == 2);// <sprite id>,<triggerX>,<triggerY> + else if( type == SCRIPT && sscanf(w4, "%*[^,],%d,%d", &xs, &ys) == 2);// <sprite id>,<triggerX>,<triggerY> else if( type == WARP ) { ShowError("npc_parse_duplicate: Invalid span format for duplicate warp in file '%s', line '%d'. Skipping line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4); return end;// next line, try to continue |