Skip to content

Fix MapInfo parsing for version 0x26 #11

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
merged 1 commit into from
Apr 19, 2016
Merged

Fix MapInfo parsing for version 0x26 #11

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
Fix MapInfo parsing for version 0x26
  • Loading branch information
@gravelweb
gravelweb committed Apr 18, 2016
commit 73d11a9a1cd7bd2a2991014bc9f7352c394d83d0
19 changes: 12 additions & 7 deletions sc2reader/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,14 @@ def __init__(self, contents):

if self.version >= 0x1f:
self.unknown3 = data.read_cstring()
self.unknown4 = data.read_uint32()

self.unknown5 = data.read_uint32()
if self.version >= 0x26:
self.unknown4 = data.read_cstring()

if self.version >= 0x1f:
self.unknown5 = data.read_uint32()

self.unknown6 = data.read_uint32()

#: The type of fog of war used on the map
self.fog_type = data.read_cstring()
Expand Down Expand Up @@ -575,7 +580,7 @@ def __init__(self, contents):
self.load_screen_path = data.read_cstring()

#: Unknown string, usually empty
self.unknown6 = data.read_bytes(data.read_uint16()).decode('utf8')
self.unknown7 = data.read_bytes(data.read_uint16()).decode('utf8')

#: Load screen image scaling strategy: 0 = normal, 1 = aspect scaling, 2 = stretch the image.
self.load_screen_scaling = data.read_uint32()
Expand Down Expand Up @@ -617,16 +622,16 @@ def __init__(self, contents):
#:
self.data_flags = data.read_uint32()

self.unknown7 = data.read_uint32()
self.unknown8 = data.read_uint32()

if self.version >= 0x19:
self.unknown8 = data.read_bytes(8)
self.unknown9 = data.read_bytes(8)

if self.version >= 0x1f:
self.unknown9 = data.read_bytes(9)
self.unknown10 = data.read_bytes(9)

if self.version >= 0x20:
self.unknown10 = data.read_bytes(4)
self.unknown11 = data.read_bytes(4)

#: The number of players enabled via the data editor
self.player_count = data.read_uint32()
Expand Down