Skip to content

Commit 73d11a9

Browse files
committed
Fix MapInfo parsing for version 0x26
1 parent b36791c commit 73d11a9

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

sc2reader/objects.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,14 @@ def __init__(self, contents):
539539

540540
if self.version >= 0x1f:
541541
self.unknown3 = data.read_cstring()
542-
self.unknown4 = data.read_uint32()
543542

544-
self.unknown5 = data.read_uint32()
543+
if self.version >= 0x26:
544+
self.unknown4 = data.read_cstring()
545+
546+
if self.version >= 0x1f:
547+
self.unknown5 = data.read_uint32()
548+
549+
self.unknown6 = data.read_uint32()
545550

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

577582
#: Unknown string, usually empty
578-
self.unknown6 = data.read_bytes(data.read_uint16()).decode('utf8')
583+
self.unknown7 = data.read_bytes(data.read_uint16()).decode('utf8')
579584

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

620-
self.unknown7 = data.read_uint32()
625+
self.unknown8 = data.read_uint32()
621626

622627
if self.version >= 0x19:
623-
self.unknown8 = data.read_bytes(8)
628+
self.unknown9 = data.read_bytes(8)
624629

625630
if self.version >= 0x1f:
626-
self.unknown9 = data.read_bytes(9)
631+
self.unknown10 = data.read_bytes(9)
627632

628633
if self.version >= 0x20:
629-
self.unknown10 = data.read_bytes(4)
634+
self.unknown11 = data.read_bytes(4)
630635

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

0 commit comments

Comments
 (0)