From 94b9c4cc347f4c7a3745d001414e565dbf839b62 Mon Sep 17 00:00:00 2001 From: Skotlex Date: Thu, 11 Aug 2011 15:56:30 +0000 Subject: - Oh, forgot to make unitwarp support the mapname "this" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14934 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/map/script.c b/src/map/script.c index c61b6d184..4c77bf872 100644 --- a/src/map/script.c +++ b/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 -- cgit v1.2.3-70-g09d2