diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-28 01:50:39 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-28 01:50:39 +0000 |
commit | 2255eaf16e44eb6959d309a4c7167d37908eb620 (patch) | |
tree | 031c64afd5e3e3a2bd83e7360db3ec87eccedb9f | |
parent | f50f76af9cf4c6de540f18a46735f9f19c9da230 (diff) | |
download | hercules-2255eaf16e44eb6959d309a4c7167d37908eb620.tar.gz hercules-2255eaf16e44eb6959d309a4c7167d37908eb620.tar.bz2 hercules-2255eaf16e44eb6959d309a4c7167d37908eb620.tar.xz hercules-2255eaf16e44eb6959d309a4c7167d37908eb620.zip |
Made @reloadscript wipe ALL previous mobs that the script engine spawned
- this way it is manageable via global vars; the other way doesn't allow that
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9734 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
-rw-r--r-- | src/map/npc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6934ad202..db8bf9051 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ 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. 2007/01/27 + * Made @reloadscript wipe ALL previous mobs that the script engine spawned + - this way it is manageable via global vars; the other way doesn't allow that * Some misc cleanups (typos, formatting, forgotten changelog entry etc) * Reformatted and translated atcommand.c - in the process improved @marry, allowing spaces after the first comma diff --git a/src/map/npc.c b/src/map/npc.c index 8c7ac76da..c1caa3fee 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2852,9 +2852,7 @@ static int npc_cleanup_sub (struct block_list *bl, va_list ap) { npc_unload((struct npc_data *)bl); break; case BL_MOB: - //This is used only on reloading npcs, so let's not free spawn-once mobs. [Skotlex] - if (((TBL_MOB*)bl)->spawn) - unit_free(bl,0); + unit_free(bl,0); break; } |