Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed npc_debug_warps() not identifying x:0,y:0 as valid (random) coordinates

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11752 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-11-18 02:30:29 +00:00
parent 560005b13e
commit 42746f05f9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/map/npc.c
View File

@ -2855,6 +2855,7 @@ static void npc_debug_warps_sub(struct npc_data* nd)
m = map_mapindex2mapid(nd->u.warp.mapindex); m = map_mapindex2mapid(nd->u.warp.mapindex);
if (m < 0) return; //Warps to another map, nothing to do about it. 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)) { 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", ShowWarning("Warp %s at %s(%d,%d) warps directly on top of an area npc at %s(%d,%d)\n",

2
src/map/script.c
View File

@ -11692,7 +11692,7 @@ BUILDIN_FUNC(callshop)
flag = script_getnum(st,3); flag = script_getnum(st,3);
nd = npc_name2id(shopname); nd = npc_name2id(shopname);
if (!nd || nd->bl.type!=BL_NPC || nd->bl.subtype!=SHOP) { 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); script_pushint(st,0);
return 1; return 1;
} }