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

update structures

develop
Ben Lubar 2020-03-02 20:41:13 -06:00
parent 4da0a761ea
commit 66ded03bc1
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,7 +1001,7 @@ int Units::computeMovementSpeed(df::unit *unit)
if (in_magma) if (in_magma)
speed *= 2; speed *= 2;
if (craw->flags.is_set(caste_raw_flags::SWIMS_LEARNED)) if (craw->flags.is_set(caste_raw_flags::CAN_SWIM))
{ {
int skill = Units::getEffectiveSkill(unit, job_skill::SWIMMING); int skill = Units::getEffectiveSkill(unit, job_skill::SWIMMING);
@ -1441,7 +1441,7 @@ int8_t Units::getCasteProfessionColor(int race, int casteid, df::profession pid)
{ {
if (auto caste = vector_get(creature->caste, casteid)) if (auto caste = vector_get(creature->caste, casteid))
{ {
if (caste->flags.is_set(caste_raw_flags::CASTE_COLOR)) if (caste->flags.is_set(caste_raw_flags::HAS_COLOR))
return caste->caste_color[0] + caste->caste_color[2] * 8; return caste->caste_color[0] + caste->caste_color[2] * 8;
} }
return creature->color[0] + creature->color[2] * 8; return creature->color[0] + creature->color[2] * 8;

2
library/xml

@ -1 +1 @@
Subproject commit dc94de37c459129dd75d79458eb255db5c8fea33 Subproject commit fa22bd5c5a6ea6ffbd883aea5dfcd2bb18d76dcf