From abf4cb1ae6eeaabd9fc9020160e985fff105f73f Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 12 Apr 2006 17:30:04 +0000 Subject: - Expanded the warp warning so that it also warns when a warps takes you to a non-walkable tile. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6019 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index da1487809..cfe3a31a6 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2680,15 +2680,20 @@ 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 (!map_getcell(m, nd->u.warp.x, nd->u.warp.y, CELL_CHKNPC)) - return; - - ShowWarning("Warp %s/%s at %s(%d,%d) warps directly on top of an area npc at %s(%d,%d)\n", - nd->name, nd->exname, - map[nd->bl.m].name, nd->bl.x, nd->bl.y, - map[m].name, nd->u.warp.x, nd->u.warp.y - ); - + 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", + nd->name, + map[nd->bl.m].name, nd->bl.x, nd->bl.y, + map[m].name, nd->u.warp.x, nd->u.warp.y + ); + } + if (map_getcell(m, nd->u.warp.x, nd->u.warp.y, CELL_CHKNOPASS)) { + ShowWarning("Warp %s at %s(%d,%d) warps to a non-walkable tile at %s(%d,%d)\n", + nd->name, + map[nd->bl.m].name, nd->bl.x, nd->bl.y, + map[m].name, nd->u.warp.x, nd->u.warp.y + ); + } } static void npc_debug_warps(void) -- cgit v1.2.3-70-g09d2