فهرست منبع

- Oh, forgot to make unitwarp support the mapname "this"


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14934 54d463be-8e91-2dee-dedb-b68131a5f0ec
Skotlex 13 سال پیش
والد
کامیت
81ce878498
1فایلهای تغییر یافته به همراه8 افزوده شده و 1 حذف شده
  1. 8 1
      src/map/script.c

+ 8 - 1
src/map/script.c

@@ -13452,9 +13452,10 @@ BUILDIN_FUNC(unitwarp)
 	short x;
 	short y;
 	struct block_list* bl;
+	const char *mapname;
 
 	unit_id = script_getnum(st,2);
-	map = map_mapname2mapid(script_getstr(st, 3));
+	mapname = script_getstr(st, 3);
 	x = (short)script_getnum(st,4);
 	y = (short)script_getnum(st,5);
 	
@@ -13462,6 +13463,12 @@ BUILDIN_FUNC(unitwarp)
 		bl = map_id2bl(st->rid);
 	else
 		bl = map_id2bl(unit_id);
+
+	if( strcmp(mapname,"this") == 0 )
+		map = bl?bl->m:-1;
+	else
+		map = map_mapname2mapid(mapname);
+
 	if( map >= 0 && bl != NULL )
 		script_pushint(st, unit_warp(bl,map,x,y,CLR_OUTSIGHT));
 	else