summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-16 14:52:44 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-16 14:52:44 +0000
commit0c61721e7c9cfe8dfb11349ddbae529c5629bacc (patch)
treee3c6beac640ad2d6537787e0e88fc5921b9558aa
parentf78863b6e5b3593fa31f866d5b55e50364243826 (diff)
downloadhercules-0c61721e7c9cfe8dfb11349ddbae529c5629bacc.tar.gz
hercules-0c61721e7c9cfe8dfb11349ddbae529c5629bacc.tar.bz2
hercules-0c61721e7c9cfe8dfb11349ddbae529c5629bacc.tar.xz
hercules-0c61721e7c9cfe8dfb11349ddbae529c5629bacc.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7204 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mob.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3ad13a0d9..cb4f6ddb4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/06/16
* [Added]:
+ - Custom slave mobs to inherit the callback_flag.
- Added option #25 to buildin_setmobdata to set the callback_flag. [Lance]
* [Improved]:
- Cleaned up Custom Mob Script Callback codes. Looks much better now :B. [Lance]
diff --git a/src/map/mob.c b/src/map/mob.c
index a12b0fcb0..fb6d34e29 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1517,6 +1517,7 @@ int mob_convertslave_sub(struct block_list *bl,va_list ap)
md->state.killer = md2->state.killer;
md->special_state.ai = md2->special_state.ai;
md->nd = md2->nd;
+ md->callback_flag = md2->callback_flag;
}
return 0;