Skip to content

Commit 6dedaad

Browse files
committed
Fixes a couple minor bugs in hotkey parsing
1 parent 2191721 commit 6dedaad

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

sc2reader/eventparsers.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ def load_get_hotkey(self, event, bytes, first):
281281

282282
def load_get_hotkey_changed(self, event, bytes, first):
283283
event.name = 'get_hotkey_changed'
284-
285284
extras = first >> 3
286285
event.bytes += bytes.peek(extras+1)
287286
second = bytes.get_big_8()
@@ -291,6 +290,9 @@ def load_get_hotkey_changed(self, event, bytes, first):
291290
event.bytes += bytes.skip(1, byte_code=True)
292291
if second & 0x06 == 0x06:
293292
event.bytes += bytes.skip(1, byte_code=True)
293+
294+
def load_shift_set_hotkey(self, event, bytes, first):
295+
event.name = 'shift_set_hotkey'
294296

295297
def load(self, event, bytes):
296298
event.name = 'hotkey'
@@ -300,21 +302,22 @@ def load(self, event, bytes):
300302
event.bytes += byte
301303

302304
if first == 0x00: self.load_set_hotkey(event, bytes, first)
305+
elif first == 0x01: self.load_shift_set_hotkey(event, bytes, first)
303306
elif first == 0x02: self.load_get_hotkey(event, bytes, first)
304-
elif first > 0x03: self.load_get_hotkey_changed(event, bytes, first)
307+
elif first >= 0x03: self.load_get_hotkey_changed(event, bytes, first)
305308
else: pass
306309

307310
return event
308311

309312
class HotkeyEventParser_16561(HotkeyEventParser):
310313
def load_get_hotkey_changed(self, event, bytes, first):
311-
name = 'get_hotkey_changed'
314+
event.name = 'get_hotkey_changed'
312315
second, byte = bytes.get_big_8(byte_code=True)
313316
event.bytes += byte
314317

315318
if first & 0x08:
316319
event.bytes += bytes.skip(second & 0x0F, byte_code=True)
317-
else:
320+
else:
318321
extras = first >> 3
319322
event.bytes += bytes.skip(extras, byte_code=True)
320323
if extras == 0:

0 commit comments

Comments
 (0)