summaryrefslogtreecommitdiff
path: root/library/DataDefs.cpp
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-09-01 11:25:24 +0400
committerAlexander Gavrilov2012-09-01 11:25:24 +0400
commite0097d8d43013d72d729e2ae71cdd6a73a110d8d (patch)
treea03b0e71f2d9712d14193f26a0acd2bc3bc4470e /library/DataDefs.cpp
parentc68afdaad23ccb9e1c33ec118514c78e5376a72e (diff)
downloaddfhack-e0097d8d43013d72d729e2ae71cdd6a73a110d8d.tar.gz
dfhack-e0097d8d43013d72d729e2ae71cdd6a73a110d8d.tar.bz2
dfhack-e0097d8d43013d72d729e2ae71cdd6a73a110d8d.tar.xz
Fix access to unnamed bits in bitfields, and allow hook.apply(false)
Diffstat (limited to 'library/DataDefs.cpp')
-rw-r--r--library/DataDefs.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp
index 34116444..fa2aacf7 100644
--- a/library/DataDefs.cpp
+++ b/library/DataDefs.cpp
@@ -374,7 +374,7 @@ void DFHack::bitfieldToString(std::vector<std::string> *pvec, const void *p,
unsigned size, const bitfield_item_info *items)
{
for (unsigned i = 0; i < size; i++) {
- int value = getBitfieldField(p, i, std::min(1,items[i].size));
+ int value = getBitfieldField(p, i, std::max(1,items[i].size));
if (value) {
std::string name = format_key(items[i].name, i);