summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-16 20:50:23 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-16 20:50:23 +0000
commit9396ca72d5d9c8b20a6badedfc61b6da402ff67a (patch)
tree7fbd2e00689cb0c53971229ebde58db03db3b8bf /src/map
parentdf76ca57e522eeac7391e0cec9e397be38a0d19d (diff)
downloadhercules-9396ca72d5d9c8b20a6badedfc61b6da402ff67a.tar.gz
hercules-9396ca72d5d9c8b20a6badedfc61b6da402ff67a.tar.bz2
hercules-9396ca72d5d9c8b20a6badedfc61b6da402ff67a.tar.xz
hercules-9396ca72d5d9c8b20a6badedfc61b6da402ff67a.zip
- Cleaned up skill_get_range2 so that using range 0 for non-self skills uses the caster's attack range.
- Fixed AM_CALLHOMUN checking for an embryo when you have a vaporized homun. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8322 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 671dce936..e59ec0821 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -761,18 +761,9 @@ int skill_get_range2 (struct block_list *bl, int id, int lv)
range *=-1;
}
+ //Use attack range.
if(!range && !(skill_get_inf(id)&INF_SELF_SKILL))
- { //Use weapon's basic range.
- if (bl->type==BL_PC) {
- struct map_session_data *sd = (TBL_PC*)bl;
- range = sd->equip_index[EQI_HAND_R];
- if (range >= 0 && sd->inventory_data[range])
- range = sd->inventory_data[range]->range;
- else
- range = 1; //Assume fist range.
- } else
- range = status_get_range(bl);
- }
+ return status_get_range(bl);
//TODO: Find a way better than hardcoding the list of skills affected by AC_VULTURE
switch (id) {
@@ -8307,7 +8298,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
return 0;
}
if (sd->status.hom_id) //Don't delete items when hom is already out.
- delitem_flag = 0;
+ checkitem_flag = delitem_flag = 0;
break;
}