diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-23 16:36:58 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-23 16:36:58 +0000 |
| commit | c2e7fc730554fc9dcd572969a4c1d0e0910ac846 (patch) | |
| tree | 4ac9b9d74e65e1e2d583c4122b5b27969a4bcb0e /src/map/script.c | |
| parent | 84b6b31d41b988d8f797126474bfcbb54b198545 (diff) | |
| download | hercules-c2e7fc730554fc9dcd572969a4c1d0e0910ac846.tar.gz hercules-c2e7fc730554fc9dcd572969a4c1d0e0910ac846.tar.bz2 hercules-c2e7fc730554fc9dcd572969a4c1d0e0910ac846.tar.xz hercules-c2e7fc730554fc9dcd572969a4c1d0e0910ac846.zip | |
* Made mob_timer_delete check the deletetimer in the mob.
* Added missing delete_timer's every time deletetimer is being set. (except when allocating)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13544 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c index e38672e16..fc65a3d7e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11330,6 +11330,8 @@ BUILDIN_FUNC(summon) if (md) { md->master_id=sd->bl.id; md->special_state.ai=1; + if( md->deletetimer != INVALID_TIMER ) + delete_timer(md->deletetimer, mob_timer_delete); 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); |