Skip to content

DFReader: Fix some missing bitmask info in dump verbose #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbarker merged 1 commit into from
Jun 1, 2024
Merged

DFReader: Fix some missing bitmask info in dump verbose #947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions DFReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,30 +327,26 @@ def dump_verbose_bitmask(self, f, c, val, field_metadata):
if bit_offset > highest:
highest = bit_offset

for i in range(bit_offset):
for i in range(highest+1):
bit_value = 1 << i
if val & bit_value:
bang = " "
else:
bang = "!"
done = False
for bit in bitmask.bit:
if bit["value"] != bit_value:
continue
if val & bit_value:
bang = ""
else:
bang = "!"
bit_name = bit.get('name')
bit_desc = None
try:
bit_desc = bit["description"]
except KeyError:
pass
if bit_desc is None:
f.write(" %s%s\n" % (bang, bit_name,))
f.write(" %s %s" % (bang, bit_name,))
if hasattr(bit, 'description'):
f.write(" (%s)\n" % bit["description"])
else:
f.write(" %s%s (%s)\n" % (bang, bit_name, bit_desc))
f.write("\n")
done = True
break
if not done:
f.write(" %{s}UNKNOWN_BIT%s\n" % (bang, str(i)))
f.write(" %s UNKNOWN_BIT%d\n" % (bang, i))
except Exception as e:
# print(e)
pass
Expand Down