From 16ef82dd78c2facf754e911fbaab1e5f279c50d4 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 18 Nov 2007 02:30:29 +0000 Subject: Fixed npc_debug_warps() not identifying x:0,y:0 as valid (random) coordinates git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11752 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 1 + src/map/script.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/npc.c b/src/map/npc.c index f90bce158..b7b8a5127 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2855,6 +2855,7 @@ static void npc_debug_warps_sub(struct npc_data* nd) m = map_mapindex2mapid(nd->u.warp.mapindex); if (m < 0) return; //Warps to another map, nothing to do about it. + if (nd->u.warp.x == 0 && nd->u.warp.y == 0) return; // random warp if (map_getcell(m, nd->u.warp.x, nd->u.warp.y, CELL_CHKNPC)) { ShowWarning("Warp %s at %s(%d,%d) warps directly on top of an area npc at %s(%d,%d)\n", diff --git a/src/map/script.c b/src/map/script.c index 50f1475f4..ac8667841 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11692,7 +11692,7 @@ BUILDIN_FUNC(callshop) flag = script_getnum(st,3); nd = npc_name2id(shopname); if (!nd || nd->bl.type!=BL_NPC || nd->bl.subtype!=SHOP) { - ShowError("buildin_callshop: Shop [%s] not found (or NPC is not shop type)", shopname); + ShowError("buildin_callshop: Shop [%s] not found (or NPC is not shop type)\n", shopname); script_pushint(st,0); return 1; } -- cgit v1.2.3-70-g09d2