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

getFullName of the container AND the item, also exclude container of char (#1515) 

* getFullName of the container AND the item, also exclude container of char

* bit vector condition was backwards
develop
Pierre-David Bélanger 2020-03-09 14:12:04 -04:00 committed by GitHub
parent a2e34a3b71
commit a7d263fa67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/DataDefs.cpp
Unescape Escape View File

@ -540,7 +540,7 @@ const struct_field_info *DFHack::find_union_tag(const struct_field_info *fields,
} }
auto union_fields = ((struct_identity*)union_field->type)->getFields(); auto union_fields = ((struct_identity*)union_field->type)->getFields();
if (tag_container_type->getFullName(nullptr) != "vector<bool>" && if (tag_container_type->getFullName() == "vector<bool>" &&
union_fields[0].mode != struct_field_info::END && union_fields[0].mode != struct_field_info::END &&
union_fields[1].mode != struct_field_info::END && union_fields[1].mode != struct_field_info::END &&
union_fields[2].mode == struct_field_info::END) union_fields[2].mode == struct_field_info::END)