Переглянути джерело

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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11752 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 роки тому
батько
коміт
42746f05f9
2 змінених файлів з 2 додано та 1 видалено
  1. 1 0
      src/map/npc.c
  2. 1 1
      src/map/script.c

+ 1 - 0
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",

+ 1 - 1
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;
 	}