MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out shared unit action timer multiplication code into its own function

develop
Tachytaenius 2022-11-23 13:04:23 +00:00
parent 8f0b7663d9
commit 357b871b4f
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
library/modules/Units.cpp
Unescape Escape View File

@ -2037,20 +2037,25 @@ void Units::subtractCategoryActionTimers(df::unit *unit, int32_t amount, df::uni
}
}
void multiplyActionTimerCore(df::unit_action *action, float amount)
{
int32_t *timer = getActionTimerPointer(action);
if (timer != nullptr && *timer != 0) {
double value = *timer;
value = max(value * amount, 1.0);
if (value > INT32_MAX) {
value = INT32_MAX;
}
*timer = value;
}
}
void Units::multiplyActionTimer(df::unit *unit, float amount, df::unit_action_type affectedActionType)
{
CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) {
if (affectedActionType != action->type) continue;
int32_t *timer = getActionTimerPointer(action);
if (timer != nullptr && *timer != 0) {
double value = *timer;
value = max(value * amount, 1.0);
if (value > INT32_MAX) {
value = INT32_MAX;
}
*timer = value;
}
multiplyActionTimerCore(action, amount);
}
}
@ -2061,15 +2066,7 @@ void Units::multiplyCategoryActionTimers(df::unit *unit, float amount, df::unit_
auto list = ENUM_ATTR(unit_action_type, group, action->type);
for (size_t i = 0; i < list.size; i++) {
if (list.items[i] == affectedActionTypes) {
int32_t *timer = getActionTimerPointer(action);
if (timer != nullptr && *timer != 0) {
double value = *timer;
value = max(value * amount, 1.0);
if (value > INT32_MAX) {
value = INT32_MAX;
}
*timer = value;
}
multiplyActionTimerCore(action, amount);
break;
}
}