Skip to content

Commit adadbaa

Browse files
committed
An assortment of listener related fixes.
1 parent ff93159 commit adadbaa

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

docs/source/supportstructures.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Length
1818

1919
.. autoclass:: Length
2020

21-
.. autoattribute:: seconds
2221
.. autoattribute:: hours
2322
.. autoattribute:: mins
2423
.. autoattribute:: secs

sc2reader/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def register_listener(self, events, listener, filterfunc=lambda r: True):
253253
for event in events:
254254
self.registered_listeners[event].append((filterfunc, listener))
255255
except TypeError:
256-
self.registered_listeners[event].append((filterfunc, listener))
256+
self.registered_listeners[events].append((filterfunc, listener))
257257

258258
def register_reader(self, data_file, reader, filterfunc=lambda r: True):
259259
"""

sc2reader/listeners/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
from collections import defaultdict
44

55
from sc2reader.listeners.apm import APMTracker
6-
from sc2reader.listeners.selection import SelectionTracker
6+
from sc2reader.listeners.selection import SelectionListener

sc2reader/listeners/apm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class APMTracker(object):
66

77
def setup(self, replay):
8-
for player in replay.players
8+
for player in replay.players:
99
player.aps = defaultdict(int)
1010
player.apm = defaultdict(int)
1111
player.avg_apm = 0

sc2reader/listeners/selection.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ def copy(self):
6161
class SelectionListener(object):
6262

6363
def setup(self, replay):
64-
for player in replay.players:
64+
for player in replay.people:
6565
player.selections = GameState(PlayerSelection())
6666

6767
def __call__(self, event, replay):
68-
selections = event.player.selections[event.frame]
6968

7069
if isinstance(event, events.HotkeyEvent):
70+
selections = event.player.selections[event.frame]
7171
hotkey_selection = selections[event.hotkey]
7272

7373
if isinstance(event, events.SetToHotkeyEvent):
@@ -86,6 +86,7 @@ def __call__(self, event, replay):
8686
event.selected = selections[event.hotkey]
8787

8888
if isinstance(event, events.SelectionEvent):
89+
selections = event.player.selections[event.frame]
8990
selections[0x0A].deselect(*event.deselect)
9091
selections[0x0A].select(event.objects)
9192

0 commit comments

Comments
 (0)