- Fixed @summon's delete timer being screwed up.

- Cleaned up a bit the summon script command.
- Fixed the clone script command's delete-timer being screwed up.
- Corrected battle config name max_walk_rate, it should be named max_walk_speed.


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

1 files changed, 11 insertions, 9 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 419ea5969..c60b5f868 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10651,7 +10651,7 @@ int buildin_logmes(struct script_state *st)
 
 int buildin_summon(struct script_state *st)
 {
-	int _class, id, timeout=0;
+	int _class, timeout=0;
 	char *str,*event="";
 	struct map_session_data *sd;
 	struct mob_data *md;
@@ -10670,14 +10670,16 @@ int buildin_summon(struct script_state *st)
 	}
 
 	clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,sd->bl.x,sd->bl.y,tick);
-	id=mob_once_spawn(sd, "this", 0, 0, str,_class,1,event);
-	md=(struct mob_data *)map_id2bl(id);
-	if (!md) return 0;
-	md->master_id=sd->bl.id;
-	md->special_state.ai=1;
-	md->deletetimer=add_timer(tick+(timeout>0?timeout*1000:60000),mob_timer_delete,id,0);
-	clif_misceffect2(&md->bl,344);
-	sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
+
+	md = mob_once_spawn_sub(&sd->bl, sd->bl.m, sd->bl.x, sd->bl.y, str, _class, event);
+	if (md) {
+		md->master_id=sd->bl.id;
+		md->special_state.ai=1;
+		md->deletetimer = add_timer(tick+(timeout>0?timeout*1000:60000),mob_timer_delete,md->bl.id,0);
+		mob_spawn (md); //Now it is ready for spawning.
+		clif_misceffect2(&md->bl,344);
+		sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
+	}
 	return 0;
 }