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

Fix a couple warnings in the Units module (#1615)

develop
lethosor 2020-08-08 14:34:47 -04:00
parent 7ee58ada7b
commit 8c5b21b7ee
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,9 +181,9 @@ DFHACK_EXPORT std::string getCasteProfessionName(int race, int caste, df::profes
DFHACK_EXPORT int8_t getProfessionColor(df::unit *unit, bool ignore_noble = false); DFHACK_EXPORT int8_t getProfessionColor(df::unit *unit, bool ignore_noble = false);
DFHACK_EXPORT int8_t getCasteProfessionColor(int race, int caste, df::profession pid); DFHACK_EXPORT int8_t getCasteProfessionColor(int race, int caste, df::profession pid);
DFHACK_EXPORT df::goal_type getGoalType(df::unit *unit, int goalIndex = 0); DFHACK_EXPORT df::goal_type getGoalType(df::unit *unit, size_t goalIndex = 0);
DFHACK_EXPORT std::string getGoalName(df::unit *unit, int goalIndex = 0); DFHACK_EXPORT std::string getGoalName(df::unit *unit, size_t goalIndex = 0);
DFHACK_EXPORT bool isGoalAchieved(df::unit *unit, int goalIndex = 0); DFHACK_EXPORT bool isGoalAchieved(df::unit *unit, size_t goalIndex = 0);
DFHACK_EXPORT std::string getSquadName(df::unit *unit); DFHACK_EXPORT std::string getSquadName(df::unit *unit);

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

@ -1439,7 +1439,7 @@ int8_t Units::getCasteProfessionColor(int race, int casteid, df::profession pid)
return 3; return 3;
} }
df::goal_type Units::getGoalType(df::unit *unit, int goalIndex) df::goal_type Units::getGoalType(df::unit *unit, size_t goalIndex)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
@ -1452,7 +1452,7 @@ df::goal_type Units::getGoalType(df::unit *unit, int goalIndex)
return goal; return goal;
} }
std::string Units::getGoalName(df::unit *unit, int goalIndex) std::string Units::getGoalName(df::unit *unit, size_t goalIndex)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
@ -1471,7 +1471,7 @@ std::string Units::getGoalName(df::unit *unit, int goalIndex)
return goal_name; return goal_name;
} }
bool Units::isGoalAchieved(df::unit *unit, int goalIndex) bool Units::isGoalAchieved(df::unit *unit, size_t goalIndex)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);