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

Change ints in action timer API function signatures to int32_ts

develop
Tachytaenius 2022-11-23 12:54:58 +00:00
parent 4b33097e57
commit 8f0b7663d9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/include/modules/Units.h
Unescape Escape View File

@ -226,12 +226,12 @@ DFHACK_EXPORT extern const std::vector<int32_t> stress_cutoffs;
DFHACK_EXPORT int getStressCategory(df::unit *unit); DFHACK_EXPORT int getStressCategory(df::unit *unit);
DFHACK_EXPORT int getStressCategoryRaw(int32_t stress_level); DFHACK_EXPORT int getStressCategoryRaw(int32_t stress_level);
DFHACK_EXPORT void subtractActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType); DFHACK_EXPORT void subtractActionTimer(df::unit *unit, int32_t amount, df::unit_action_type affectedActionType);
DFHACK_EXPORT void subtractCategoryActionTimers(df::unit *unit, int amount, df::unit_action_type_group affectedActionTypes); DFHACK_EXPORT void subtractCategoryActionTimers(df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypes);
DFHACK_EXPORT void multiplyActionTimer(df::unit *unit, float amount, df::unit_action_type affectedActionType); DFHACK_EXPORT void multiplyActionTimer(df::unit *unit, float amount, df::unit_action_type affectedActionType);
DFHACK_EXPORT void multiplyCategoryActionTimers(df::unit *unit, float amount, df::unit_action_type_group affectedActionTypes); DFHACK_EXPORT void multiplyCategoryActionTimers(df::unit *unit, float amount, df::unit_action_type_group affectedActionTypes);
DFHACK_EXPORT void setActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType); DFHACK_EXPORT void setActionTimer(df::unit *unit, int32_t amount, df::unit_action_type affectedActionType);
DFHACK_EXPORT void setCategoryActionTimers(df::unit *unit, int amount, df::unit_action_type_group affectedActionTypes); DFHACK_EXPORT void setCategoryActionTimers(df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypes);
} }
} }

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

@ -2008,7 +2008,7 @@ int32_t *getActionTimerPointer(df::unit_action *action) {
return nullptr; return nullptr;
} }
void Units::subtractActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType) void Units::subtractActionTimer(df::unit *unit, int32_t amount, df::unit_action_type affectedActionType)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {
@ -2020,7 +2020,7 @@ void Units::subtractActionTimer(df::unit *unit, int amount, df::unit_action_type
} }
} }
void Units::subtractCategoryActionTimers(df::unit *unit, int amount, df::unit_action_type_group affectedActionTypes) void Units::subtractCategoryActionTimers(df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypes)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {
@ -2076,7 +2076,7 @@ void Units::multiplyCategoryActionTimers(df::unit *unit, float amount, df::unit_
} }
} }
void Units::setActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType) void Units::setActionTimer(df::unit *unit, int32_t amount, df::unit_action_type affectedActionType)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {
@ -2088,7 +2088,7 @@ void Units::setActionTimer(df::unit *unit, int amount, df::unit_action_type affe
} }
} }
void Units::setCategoryActionTimers(df::unit *unit, int amount, df::unit_action_type_group affectedActionTypes) void Units::setCategoryActionTimers(df::unit *unit, int32_t amount, df::unit_action_type_group affectedActionTypes)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {