Skip to content

Commit 42f7b7f

Browse files
committed
Fix camera location parsing.
1 parent cbe6628 commit 42f7b7f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

sc2reader/readers.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,8 @@ def player_request_resource_event(self, data, fstamp, pid, event_type):
365365

366366
def camera_event(self, data, fstamp, pid, event_type):
367367
# From https://github.com/Mischanix/sc2replay-csharp/wiki/replay.game.events
368-
block = data.read_int(BIG_ENDIAN)
369-
x = (block >> 16)/256.0
370-
y = (block & 0xFFFF)/256.0
368+
x = data.read_short(BIG_ENDIAN)/256.0
369+
y = data.read_short(BIG_ENDIAN)/256.0
371370
distance = pitch = yaw = height = 0
372371
if data.read_bits(1):
373372
distance = data.read_short(BIG_ENDIAN)/256.0
@@ -500,9 +499,8 @@ class GameEventsReader_Beta(GameEventsReader_22612):
500499
def camera_event(self, data, fstamp, pid, event_type):
501500
x = y= distance = pitch = yaw = height = 0
502501
if data.read_bits(1):
503-
block = data.read_int(BIG_ENDIAN)
504-
x = (block >> 16)/256.0
505-
y = (block & 0xFFFF)/256.0
502+
x = data.read_short(BIG_ENDIAN)/256.0
503+
y = data.read_short(BIG_ENDIAN)/256.0
506504
if data.read_bits(1):
507505
distance = data.read_short(BIG_ENDIAN)/256.0
508506
if data.read_bits(1):
@@ -532,4 +530,4 @@ def player_selection_event(self, data, fstamp, pid, event_type):
532530
return SelectionEvent(fstamp, pid, event_type, bank, units, overlay)
533531

534532
class GameEventsReader_Beta_23925(GameEventsReader_Beta):
535-
PLAYER_JOIN_FLAGS = 32
533+
PLAYER_JOIN_FLAGS = 32

0 commit comments

Comments
 (0)