From 6728c0fa88b84fccb6f179ae13cf8a15c1ea23a4 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 3 Nov 2013 20:19:26 +0100 Subject: Allow warp duplicates without a 'facing' value - Warps don't require a facing, so their duplicates shouldn't either. - Credits to jaBote. Signed-off-by: Haru --- src/map/npc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index f0bdd7bd0..90f588a26 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2547,8 +2547,10 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch x = y = dir = 0; m = -1; } else { - if( sscanf(w1, "%31[^,],%d,%d,%d", mapname, &x, &y, &dir) != 4 )// ,,, - { + int fields = sscanf(w1, "%31[^,],%d,%d,%d", mapname, &x, &y, &dir); + if( type == WARP && fields == 3 ) { // ,, + dir = 0; + } else if( fields != 4 ) {// ,,, ShowError("npc_parse_duplicate: Invalid placement format for duplicate 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 } -- cgit v1.2.3-60-g2f50