summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 21:23:12 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 21:23:12 +0000
commit41cc772d630a347c2af9aec034330da46200b48e (patch)
treec3656e571c7c82580c21154719774412cfc8f57f /src/map
parent422787c9b466f9104650bf8d97021883c3857955 (diff)
downloadhercules-41cc772d630a347c2af9aec034330da46200b48e.tar.gz
hercules-41cc772d630a347c2af9aec034330da46200b48e.tar.bz2
hercules-41cc772d630a347c2af9aec034330da46200b48e.tar.xz
hercules-41cc772d630a347c2af9aec034330da46200b48e.zip
- Fixed HLIF_HEAL healing the homunc instead of the master
- Fixed HLIF_AVOID not increasing walk speed of master git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8355 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c6
-rw-r--r--src/map/unit.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index e1aff8f85..9ed6e7253 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3732,7 +3732,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
clif_skill_nodamage(src,bl,skillid,skilllv,
sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
break;
- case HLIF_AVOID: //[orn]
+ case HLIF_AVOID:
+ i = skill_get_time(skillid,skilllv);
+ clif_skill_nodamage(src,bl,skillid,skilllv,sc_start(src,type,100,skilllv,i));
+ clif_skill_nodamage(src,src,skillid,skilllv,sc_start(&hd->master->bl,type,100,skilllv,i));
+ break;
case HAMI_DEFENCE:
i = skill_get_time(skillid,skilllv);
clif_skill_nodamage(src,bl,skillid,skilllv,
diff --git a/src/map/unit.c b/src/map/unit.c
index bed5a93d2..52f5d3fb1 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -790,6 +790,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
case HAMI_CASTLE:
target = battle_get_master(src);
if (!target) return 0;
+ target_id = target->id;
}
if(!target && (target=map_id2bl(target_id)) == NULL )