From ebf34f01ebc8d2c1e3af90c58c6be5b240efc01c Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 11 Dec 2006 16:04:24 +0000 Subject: - Spirit of Sin and Enchant Deadly Poison now stack. - Fixed skill damage card bonuses not working on magic skills. - Moved the setting of sd->npc_id = 0 in npc_dequeue to the beginning, since this function is called when a script is cancelled (TODO: but when this happens, shouldn't the previously ongoing script also be free'd?) - Made homunc's speed be recalculated when you respawn it from rest state. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9453 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 3ae9f8ffb..0ae731fd3 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -606,6 +606,8 @@ int merc_call_homunculus(struct map_session_data *sd) clif_hominfo(sd,hd,1); clif_hominfo(sd,hd,0); // send this x2. dunno why, but kRO does that [blackhole89] clif_homskillinfoblock(sd); + if (battle_config.slaves_inherit_speed&1) + status_calc_bl(&hd->bl, SCB_SPEED); merc_save(hd); } else //Warp him to master. -- cgit v1.2.3-60-g2f50