diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b6b472fc2..f91b5635b 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/16
+ * Cleaned up skill_get_range2 so that using range 0 for non-self skills
+ uses the caster's attack range. [Skotlex]
+ * Fixed AM_CALLHOMUN checking for an embryo when you have a vaporized
+ homun. [Skotlex]
* Spirit of Wizard will now consume an item 7321 each time it blocks
reflected magic. [Skotlex]
* Added script command jobname, retrieves a given's class name as per the
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; } |