|
@@ -880,16 +880,20 @@ class ProxyMenu(object):
|
|
|
|
|
|
elif key == "X":
|
|
elif key == "X":
|
|
self.queue_game.put(self.c + key + self.r + self.nl)
|
|
self.queue_game.put(self.c + key + self.r + self.nl)
|
|
|
|
+ self.queue_game.put("Proxy done." + self.nl)
|
|
self.observer.load(self.save)
|
|
self.observer.load(self.save)
|
|
self.save = None
|
|
self.save = None
|
|
# It isn't running (NOW), so don't try to stop it.
|
|
# It isn't running (NOW), so don't try to stop it.
|
|
# self.keepalive.stop()
|
|
# self.keepalive.stop()
|
|
self.keepalive = None
|
|
self.keepalive = None
|
|
- self.queue_game.put(self.prompt)
|
|
|
|
|
|
+ # Ok, this is a HORRIBLE idea, because the prompt might be
|
|
|
|
+ # outdated.
|
|
|
|
+ # self.queue_game.put(self.prompt)
|
|
self.prompt = None
|
|
self.prompt = None
|
|
|
|
|
|
# Possibly: Send '\r' to re-display the prompt
|
|
# Possibly: Send '\r' to re-display the prompt
|
|
# instead of displaying the original one.
|
|
# instead of displaying the original one.
|
|
|
|
+ self.game.queue_player.put("d")
|
|
|
|
|
|
# Were we asked to do something when we were done here?
|
|
# Were we asked to do something when we were done here?
|
|
if self.defer:
|
|
if self.defer:
|
|
@@ -906,7 +910,7 @@ class ProxyMenu(object):
|
|
self.observer.connect("player", self.scripts_player)
|
|
self.observer.connect("player", self.scripts_player)
|
|
self.scripts_menu()
|
|
self.scripts_menu()
|
|
|
|
|
|
- def deactivate_scripts_menu(self):
|
|
|
|
|
|
+ def deactivate_scripts_menu(self, *_):
|
|
self.observer.disconnect("player", self.scripts_player)
|
|
self.observer.disconnect("player", self.scripts_player)
|
|
self.observer.connect("player", self.player)
|
|
self.observer.connect("player", self.player)
|
|
self.welcome_back()
|
|
self.welcome_back()
|
|
@@ -936,8 +940,10 @@ class ProxyMenu(object):
|
|
# Activate this magical event here
|
|
# Activate this magical event here
|
|
ports = ScriptPort(self.game)
|
|
ports = ScriptPort(self.game)
|
|
d = ports.whenDone()
|
|
d = ports.whenDone()
|
|
- d.addCallback(self.scripts_menu)
|
|
|
|
- d.addErrback(self.scripts_menu)
|
|
|
|
|
|
+ # d.addCallback(self.scripts_menu)
|
|
|
|
+ # d.addErrback(self.scripts_menu)
|
|
|
|
+ d.addCallback(self.deactivate_scripts_menu)
|
|
|
|
+ d.addErrback(self.deactivate_scripts_menu)
|
|
return
|
|
return
|
|
elif key == 'X':
|
|
elif key == 'X':
|
|
self.queue_game.put(self.c + key + self.r + self.nl)
|
|
self.queue_game.put(self.c + key + self.r + self.nl)
|