summaryrefslogtreecommitdiff
path: root/src/map/mob.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-01 19:21:04 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-01 19:21:04 +0000
commite62d775f7c6967141e2e5a470dbf3c2cb66a870e (patch)
treea440e64eb9eeaff784c03a5ba8225579db0b8878 /src/map/mob.c
parentafda30c346bbf44415f330f92cd03428ad1e652b (diff)
downloadhercules-e62d775f7c6967141e2e5a470dbf3c2cb66a870e.tar.gz
hercules-e62d775f7c6967141e2e5a470dbf3c2cb66a870e.tar.bz2
hercules-e62d775f7c6967141e2e5a470dbf3c2cb66a870e.tar.xz
hercules-e62d775f7c6967141e2e5a470dbf3c2cb66a870e.zip
- Corrected setting slaves_inherit_mode to not apply to morphosis skills.
- Added define OPTION_CART which holds the 5 cart option values. - Corrected pc_setoption to invoke status_calc_pc when getting/removing the cart. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6914 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
-rw-r--r--src/map/mob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 46d7f1c9d..88b06265c 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2416,7 +2416,7 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,int skill_id)
md->status.hp = md->status.max_hp*hp_rate/100;
//Inherit the aggressive mode of the master.
- if (battle_config.slaves_inherit_mode) {
+ if (battle_config.slaves_inherit_mode && md->master_id) {
if (md2->status.mode&MD_AGGRESSIVE)
sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 0);
else