summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-22 19:56:26 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-22 19:56:26 +0000
commit20b96b7fc5a423389a1359cf2110a8231fb11656 (patch)
treef6ac25f2d08250f978e0b6fe39046d4ab9e52eb9
parentf49666198ba97ff369bc25fb200668505aa1e381 (diff)
downloadhercules-20b96b7fc5a423389a1359cf2110a8231fb11656.tar.gz
hercules-20b96b7fc5a423389a1359cf2110a8231fb11656.tar.bz2
hercules-20b96b7fc5a423389a1359cf2110a8231fb11656.tar.xz
hercules-20b96b7fc5a423389a1359cf2110a8231fb11656.zip
- Updated skill_delayfix to return 0 for mobs since they have no skill delay other than the one specified in mob_skill_db
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6699 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e713c6af3..29c0899d8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/05/22
+ * Updated skill_delayfix to return 0 for mobs since they have no skill
+ delay other than the one specified in mob_skill_db [Skotlex]
* Corrected the 20 lvl diff 15% exp bonus on pk_mode servers. Thanks to
Vayu for pointing it out. [Skotlex]
* status_get_sc_tick will now use directly Stun's formula rather than
diff --git a/src/map/skill.c b/src/map/skill.c
index 784f088ae..c122b2dd2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8309,6 +8309,9 @@ int skill_delayfix(struct block_list *bl, int skill_id, int skill_lv)
nullpo_retr(0, bl);
+ if (bl->type == BL_MOB)
+ return 0; //Mobs have no delay other than the skill-specific delay in their skill db. [Skotlex]
+
// instant cast attack skills depend on aspd as delay [celest]
if (time == 0) {
if (skill_get_type(skill_id) == BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_DAMAGE))