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

Additional fix for issue #4.

Browse Source 
Moved timer resets with mode resets. Solves the problem of extra
messages being sent after a game ends caused by disk I/O lag.
This commit is contained in:
Yizhe Shen 2014-03-06 08:45:02 -05:00
parent a9cb639378
commit e0f598a2b0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/wolfgame.py
View File

@ -160,7 +160,13 @@ def reset_settings():
setattr(var, attr, var.ORIGINAL_SETTINGS[attr]) setattr(var, attr, var.ORIGINAL_SETTINGS[attr])
dict.clear(var.ORIGINAL_SETTINGS) dict.clear(var.ORIGINAL_SETTINGS)
def reset_modes(cli): def reset_modes_timers(cli):
# Reset game timers
for x, timr in var.TIMERS.items():
timr.cancel()
var.TIMERS = {}
# Reset modes
cli.mode(botconfig.CHANNEL, "-m") cli.mode(botconfig.CHANNEL, "-m")
cmodes = [] cmodes = []
for plr in var.list_players(): for plr in var.list_players():
@ -172,10 +178,6 @@ def reset_modes(cli):
def reset(cli): def reset(cli):
var.PHASE = "none" var.PHASE = "none"
for x, timr in var.TIMERS.items():
timr.cancel()
var.TIMERS = {}
var.GAME_ID = 0 var.GAME_ID = 0
var.DEAD = [] var.DEAD = []
@ -207,7 +209,7 @@ def forced_exit(cli, nick, *rest): # Admin Only
if var.PHASE in ("day", "night"): if var.PHASE in ("day", "night"):
stop_game(cli) stop_game(cli)
else: else:
reset_modes(cli) reset_modes_timers(cli)
reset(cli) reset(cli)
cli.quit("Forced quit from "+nick) cli.quit("Forced quit from "+nick)
@ -222,7 +224,7 @@ def restart_program(cli, nick, *rest):
if var.PHASE in ("day", "night"): if var.PHASE in ("day", "night"):
stop_game(cli) stop_game(cli)
else: else:
reset_modes(cli) reset_modes_timers(cli)
reset(cli) reset(cli)
cli.quit("Forced restart from "+nick) cli.quit("Forced restart from "+nick)
@ -825,7 +827,7 @@ def stop_game(cli, winner = ""):
var.plural(role))) var.plural(role)))
cli.msg(chan, " ".join(roles_msg)) cli.msg(chan, " ".join(roles_msg))
reset_modes(cli) reset_modes_timers(cli)
plrl = [] plrl = []
for role,ppl in var.ORIGINAL_ROLES.items(): for role,ppl in var.ORIGINAL_ROLES.items():
@ -895,7 +897,7 @@ def chk_win(cli, end_game = True):
if lpl == 0: if lpl == 0:
#cli.msg(chan, "No more players remaining. Game ended.") #cli.msg(chan, "No more players remaining. Game ended.")
reset_modes(cli) reset_modes_timers(cli)
reset(cli) reset(cli)
return True return True
@ -2668,7 +2670,7 @@ def reset_game(cli, nick, chan, rest):
if var.PHASE != "join": if var.PHASE != "join":
stop_game(cli) stop_game(cli)
else: else:
reset_modes(cli) reset_modes_timers(cli)
reset(cli) reset(cli)