summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)