Update xml and fix knowledge_scholar_category_flag::value() custom method

Allows bitfields within unions (#1047, dfhack/df-structures#169)
2016-12-27 23:24:22 -05:00 · 2016-12-27 23:24:22 -05:00 · 538b07d214
parent cd0d9fed18
commit 538b07d214
2 changed files with 2 additions and 2 deletions
--- a/library/include/df/custom/knowledge_scholar_category_flag.methods.inc
+++ b/library/include/df/custom/knowledge_scholar_category_flag.methods.inc
@ -3,7 +3,7 @@ df::enums::dfhack_knowledge_scholar_flag::dfhack_knowledge_scholar_flag value()
    int32_t value = category * 32;
    for (int32_t i = 0; i < 32; i++)
    {
-        if (flags & (1 << i))
+        if (flags.whole & (1 << i))
        {
            value += i;
            break;
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 666f4c7f5fc578240d2a2ab2aa097bfc5c60d6ad
+Subproject commit e84bdcd0280495aeb49f12c124b4e52c62aaafc9