From 66ded03bc1a554b1c642ac343fbf3e533dedd4ab Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Mon, 2 Mar 2020 20:41:13 -0600 Subject: [PATCH] update structures --- library/modules/Units.cpp | 4 ++-- library/xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 1907b1641..3ac235203 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -1001,7 +1001,7 @@ int Units::computeMovementSpeed(df::unit *unit) if (in_magma) 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); @@ -1441,7 +1441,7 @@ int8_t Units::getCasteProfessionColor(int race, int casteid, df::profession pid) { 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 creature->color[0] + creature->color[2] * 8; diff --git a/library/xml b/library/xml index dc94de37c..fa22bd5c5 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit dc94de37c459129dd75d79458eb255db5c8fea33 +Subproject commit fa22bd5c5a6ea6ffbd883aea5dfcd2bb18d76dcf