- Fixed script command mapwarp.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5895 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 6 insertions, 8 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 56e9972bc..73b55cd2d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/03

+	* Fixed script command mapwarp. [Skotlex]

 	* Fixed Auto-counter. [Skotlex]

 	* Modified Rude-Attacked behaviour so that such skills only triggers when

 	  the rude-attacked count is greater than 3. [Skotlex]

diff --git a/src/map/script.c b/src/map/script.c
index 874a99840..fba57bcaf 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7467,13 +7467,8 @@ int buildin_mapwarp(struct script_state *st)	// Added by RoVeRT
 	int x,y,m;

 	char *str;

 	char *mapname;

-	int x0,y0,x1,y1;

-

+	unsigned int index;

 	mapname=conv_str(st,& (st->stack->stack_data[st->start+2]));

-	x0=0;

-	y0=0;

-	x1=map[map_mapname2mapid(mapname)].xs;

-	y1=map[map_mapname2mapid(mapname)].ys;

 	str=conv_str(st,& (st->stack->stack_data[st->start+3]));

 	x=conv_num(st,& (st->stack->stack_data[st->start+4]));

 	y=conv_num(st,& (st->stack->stack_data[st->start+5]));

@@ -7481,8 +7476,10 @@ int buildin_mapwarp(struct script_state *st)	// Added by RoVeRT
 	if( (m=map_mapname2mapid(mapname))< 0)

 		return 0;

 

-	map_foreachinarea(buildin_areawarp_sub,

-		m,x0,y0,x1,y1,BL_PC, map_mapname2mapid(str),x,y );

+	if(!(index=mapindex_name2id(str)))

+		return 0;

+	map_foreachinmap(buildin_areawarp_sub,

+		m,BL_PC,index,x,y);

 	return 0;

 }