summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-14 17:02:39 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-14 17:02:39 +0000
commit8b4709f97bb93058ca73581925915407fc9e1df7 (patch)
tree5eb206d8e9f2d44ecd3560e01a3b8757f41acc92
parentae38fdb123c207515468e409cd553f1a185c02e0 (diff)
downloadhercules-8b4709f97bb93058ca73581925915407fc9e1df7.tar.gz
hercules-8b4709f97bb93058ca73581925915407fc9e1df7.tar.bz2
hercules-8b4709f97bb93058ca73581925915407fc9e1df7.tar.xz
hercules-8b4709f97bb93058ca73581925915407fc9e1df7.zip
- Fixed the can-act delay never being checked when requesting to use Homunculus Skills. O.O
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8758 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8bc0b9b29..11b4fa04b 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/09/14
+ * Fixed the can-act delay never being checked when requesting to use
+ Homunculus Skills. [Skotlex]
* Fixed warmth skills draining SP of the target, not the caster. [Skotlex]
* When TK_DODGE triggers, it will no longer delay your attack or movement.
[Skotlex]
diff --git a/src/map/clif.c b/src/map/clif.c
index 95be2f9c5..ac76dd9f2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9715,7 +9715,8 @@ static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_sess
if (hd->ud.skilltimer != -1) {
if (skillnum != SA_CASTCANCEL)
return;
- }
+ } else if (DIFF_TICK(tick, hd->ud.canact_tick) < 0)
+ return;
lv = merc_hom_checkskill(sd, skillnum);
if (skilllv > lv)