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

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

Allows bitfields within unions (#1047, dfhack/df-structures#169)
develop
lethosor 2016-12-27 23:24:22 -05:00
parent cd0d9fed18
commit 538b07d214
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/df/custom/knowledge_scholar_category_flag.methods.inc
Unescape Escape View File

@ -3,7 +3,7 @@ df::enums::dfhack_knowledge_scholar_flag::dfhack_knowledge_scholar_flag value()
int32_t value = category * 32; int32_t value = category * 32;
for (int32_t i = 0; i < 32; i++) for (int32_t i = 0; i < 32; i++)
{ {
if (flags & (1 << i)) if (flags.whole & (1 << i))
{ {
value += i; value += i;
break; break;

2
library/xml

@ -1 +1 @@
Subproject commit 666f4c7f5fc578240d2a2ab2aa097bfc5c60d6ad Subproject commit e84bdcd0280495aeb49f12c124b4e52c62aaafc9