summaryrefslogtreecommitdiff
path: root/src/map/skill.cpp
diff options
context:
space:
mode:
authorHello TMW <hello@themanaworld.org>2024-04-06 01:14:30 +0000
committerHello TMW <hello@themanaworld.org>2024-04-06 01:14:30 +0000
commit90754fd121ffaec886c415689031f9ef01ae4972 (patch)
tree047f645931fdb0715afe784b8bc445743a78a371 /src/map/skill.cpp
parente42f76d0b0f4d2ec3a9008979267311f5246fb22 (diff)
parentebf078b9fa81142834dc45e22ea661a61c50d17b (diff)
downloadtmwa-90754fd121ffaec886c415689031f9ef01ae4972.tar.gz
tmwa-90754fd121ffaec886c415689031f9ef01ae4972.tar.bz2
tmwa-90754fd121ffaec886c415689031f9ef01ae4972.tar.xz
tmwa-90754fd121ffaec886c415689031f9ef01ae4972.zip
Merge branch tmwa:master into masterHEADmaster
Diffstat (limited to 'src/map/skill.cpp')
-rw-r--r--src/map/skill.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index cdaa0ba..87bbbda 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -764,6 +764,7 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
case StatusChange::SC_COOLDOWN_AR:
case StatusChange::SC_COOLDOWN_ENCH:
case StatusChange::SC_COOLDOWN_KOY:
+ case StatusChange::SC_COOLDOWN_UPMARMU:
break;
/* option2 */
@@ -804,7 +805,7 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
clif_changeoption(bl);
if (bl->bl_type == BL::PC && calc_flag)
- pc_calcstatus(bl->is_player(), 0); /* ステータス再計算 | Status Recalculation */
+ pc_calcstatus(bl->is_player(), (int)CalcStatusKind::NORMAL_RECALC); /* ステータス再計算 | Status Recalculation */
}
int skill_update_heal_animation(dumb_ptr<map_session_data> sd)
@@ -1041,6 +1042,7 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
case StatusChange::SC_COOLDOWN_AR:
case StatusChange::SC_COOLDOWN_ENCH:
case StatusChange::SC_COOLDOWN_KOY:
+ case StatusChange::SC_COOLDOWN_UPMARMU:
break;
case StatusChange::SC_FLYING_BACKPACK:
updateflag = SP::WEIGHT;
@@ -1083,7 +1085,7 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
bl->bl_id, type));
if (bl->bl_type == BL::PC && calc_flag)
- pc_calcstatus(sd, 0); /* ステータス再計算 | Status recalculation */
+ pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC); /* ステータス再計算 | Status recalculation */
if (bl->bl_type == BL::PC && updateflag != SP::ZERO)
clif_updatestatus(sd, updateflag); /* ステータスをクライアントに送る | Send status to client */