From abf4cb1ae6eeaabd9fc9020160e985fff105f73f Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
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
---
 Changelog-Trunk.txt |  2 ++
 src/map/npc.c       | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c9332fac5..66701af41 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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.
 
 2006/04/12
+	* Expanded the warp warning so that it also warns when a warps takes you to
+	  a non-walkable tile. [Skotlex]
 	* Simplified the mob-drops structure by using a single timer with a linked
 	  list of drops instead of separate timers for each drop. [Skotlex]
 2006/04/11
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