notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change event dispatchers to not pass in mutable arguments

Browse Source
This commit is contained in:
Vgr E.Barry 2015-06-14 23:24:48 -04:00
parent 4d15ee0421
commit 4d8576481b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/settings.py
View File

@ -782,8 +782,9 @@ class RandomMode(GameMode):
def teardown(self): def teardown(self):
events.remove_listener("role_attribution", self.role_attribution, 1) events.remove_listener("role_attribution", self.role_attribution, 1)
def role_attribution(self, evt, cli, var, villagers, addroles): def role_attribution(self, evt, cli, var, villagers):
lpl = len(villagers) - 1 lpl = len(villagers) - 1
addroles = evt.data["addroles"]
for role in var.ROLE_GUIDE: for role in var.ROLE_GUIDE:
addroles[role] = 0 addroles[role] = 0

8
src/wolfgame.py
View File

@ -5946,8 +5946,8 @@ def start(cli, nick, chan, forced = False, restart = ""):
addroles = {} addroles = {}
event = Event("role_attribution", {}) event = Event("role_attribution", {"addroles": addroles})
if event.dispatch(cli, var, villagers, addroles): if event.dispatch(cli, var, villagers):
for index in range(len(var.ROLE_INDEX) - 1, -1, -1): for index in range(len(var.ROLE_INDEX) - 1, -1, -1):
if var.ROLE_INDEX[index] <= len(villagers): if var.ROLE_INDEX[index] <= len(villagers):
addroles.update({k:v[index] for k,v in var.ROLE_GUIDE.items()}) addroles.update({k:v[index] for k,v in var.ROLE_GUIDE.items()})
@ -5957,8 +5957,8 @@ def start(cli, nick, chan, forced = False, restart = ""):
return return
if var.ORIGINAL_SETTINGS and not restart: # Custom settings if var.ORIGINAL_SETTINGS and not restart: # Custom settings
event = Event("roles_check", {}) event = Event("roles_check", {"addroles": addroles})
if event.dispatch(var, addroles): if event.dispatch(var):
need_reset = True need_reset = True
wvs = sum(addroles[r] for r in var.WOLFCHAT_ROLES) wvs = sum(addroles[r] for r in var.WOLFCHAT_ROLES)
if len(villagers) < (sum(addroles.values()) - sum(addroles[r] for r in var.TEMPLATE_RESTRICTIONS.keys())): if len(villagers) < (sum(addroles.values()) - sum(addroles[r] for r in var.TEMPLATE_RESTRICTIONS.keys())):