diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h index 004c0bcbf..4c8513e27 100644 --- a/library/include/modules/Units.h +++ b/library/include/modules/Units.h @@ -227,11 +227,11 @@ DFHACK_EXPORT int getStressCategory(df::unit *unit); DFHACK_EXPORT int getStressCategoryRaw(int32_t stress_level); DFHACK_EXPORT void subtractActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type affectedActionType); -DFHACK_EXPORT void subtractCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionCategory); +DFHACK_EXPORT void subtractCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypeCategory); DFHACK_EXPORT void multiplyActionTimers(color_ostream &out, df::unit *unit, float amount, df::unit_action_type affectedActionType); -DFHACK_EXPORT void multiplyCategoryActionTimers(color_ostream &out, df::unit *unit, float amount, df::unit_action_type_group affectedActionCategory); +DFHACK_EXPORT void multiplyCategoryActionTimers(color_ostream &out, df::unit *unit, float amount, df::unit_action_type_group affectedActionTypeCategory); DFHACK_EXPORT void setActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type affectedActionType); -DFHACK_EXPORT void setCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionCategory); +DFHACK_EXPORT void setCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypeCategory); } } diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index b663965f8..9656c75e6 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -2032,13 +2032,13 @@ void Units::subtractActionTimers(color_ostream &out, df::unit *unit, int32_t amo } } -void Units::subtractCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionCategory) +void Units::subtractCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypeCategory) { CHECK_NULL_POINTER(unit); for (auto action : unit->actions) { auto list = ENUM_ATTR(unit_action_type, group, action->type); for (size_t i = 0; i < list.size; i++) { - if (list.items[i] == affectedActionCategory) { + if (list.items[i] == affectedActionTypeCategory) { mutateActionTimerCore(action, [=](double timerValue){return max(timerValue - amount, 1.0);}); break; } @@ -2065,7 +2065,7 @@ void Units::multiplyActionTimers(color_ostream &out, df::unit *unit, float amoun } } -void Units::multiplyCategoryActionTimers(color_ostream &out, df::unit *unit, float amount, df::unit_action_type_group affectedActionCategory) +void Units::multiplyCategoryActionTimers(color_ostream &out, df::unit *unit, float amount, df::unit_action_type_group affectedActionTypeCategory) { CHECK_NULL_POINTER(unit); if (!validateMultiplyActionTimerAmount(out, amount)) @@ -2073,7 +2073,7 @@ void Units::multiplyCategoryActionTimers(color_ostream &out, df::unit *unit, flo for (auto action : unit->actions) { auto list = ENUM_ATTR(unit_action_type, group, action->type); for (size_t i = 0; i < list.size; i++) { - if (list.items[i] == affectedActionCategory) { + if (list.items[i] == affectedActionTypeCategory) { mutateActionTimerCore(action, [=](double timerValue){return max(timerValue * amount, 1.0);}); break; } @@ -2100,7 +2100,7 @@ void Units::setActionTimers(color_ostream &out, df::unit *unit, int32_t amount, } } -void Units::setCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionCategory) +void Units::setCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypeCategory) { CHECK_NULL_POINTER(unit); if (!validateSetActionTimerAmount(out, amount)) @@ -2108,7 +2108,7 @@ void Units::setCategoryActionTimers(color_ostream &out, df::unit *unit, int32_t for (auto action : unit->actions) { auto list = ENUM_ATTR(unit_action_type, group, action->type); for (size_t i = 0; i < list.size; i++) { - if (list.items[i] == affectedActionCategory) { + if (list.items[i] == affectedActionTypeCategory) { mutateActionTimerCore(action, [=](double timerValue){return amount;}); break; }