summaryrefslogtreecommitdiff
path: root/src/map/skill.cpp
diff options
context:
space:
mode:
authorHoraK-FDF <horak-fdf@web.de>2022-09-28 12:52:39 +0200
committerHoraK-FDF <horak-fdf@web.de>2022-09-28 12:52:39 +0200
commit1f952de3ce09fe55e532f91170af88bdba7b9b1b (patch)
treedbee3f304b19a1ac9652ec7f3928fa9193d7e9d4 /src/map/skill.cpp
parent20bcf8affe9fdfe824ad347cc5e74d145b5214cf (diff)
parent9aa7e49ca2d67fa51a3258f00ab0f2cd9eaa5b4d (diff)
downloadtmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.tar.gz
tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.tar.bz2
tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.tar.xz
tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.zip
Merge branch 'sc_cooldown' into full
Diffstat (limited to 'src/map/skill.cpp')
-rw-r--r--src/map/skill.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index cf99af8..cf7ab6b 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -738,6 +738,7 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
case StatusChange::SC_MATKPOT: /* magic attack potion [Valaris] */
case StatusChange::SC_PHYS_SHIELD:
case StatusChange::SC_HASTE:
+ case StatusChange::SC_COOLDOWN:
calc_flag = 1;
break;
@@ -1003,6 +1004,7 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
case StatusChange::SC_HASTE:
case StatusChange::SC_PHYS_SHIELD:
case StatusChange::SC_MBARRIER:
+ case StatusChange::SC_COOLDOWN:
calc_flag = 1;
break;
case StatusChange::SC_HALT_REGENERATE: