X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fgame.py;h=d90aa0b0f8a47350536244d7f3fab39ffdb01fce;hb=61e7b58cf8be7a0c24d78a1336e54fdbf088deea;hp=406d96d2675ca00930d7999fed48fd648d62ac15;hpb=f7f11798a90187ab83d038f737368317a99e15b0;p=plomrogue2-experiments
diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index 406d96d..d90aa0b 100755
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -1,9 +1,9 @@
from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
Task_FLATTEN_SURROUNDINGS)
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, PlayError
from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING,
cmd_TURN, cmd_MAP_LINE, cmd_MAP, cmd_GET_ANNOTATION,
- cmd_ANNOTATE)
+ cmd_ANNOTATE, cmd_GET_GAMESTATE)
from plomrogue.io import GameIO
from plomrogue.misc import quote
from plomrogue.things import Thing, ThingPlayer
@@ -50,6 +50,7 @@ class Game(GameBase):
'TURN': cmd_TURN,
'MAP_LINE': cmd_MAP_LINE,
'GET_ANNOTATION': cmd_GET_ANNOTATION,
+ 'GET_GAMESTATE': cmd_GET_GAMESTATE,
'ANNOTATE': cmd_ANNOTATE,
'MAP': cmd_MAP,
'PING': cmd_PING}
@@ -93,13 +94,18 @@ class Game(GameBase):
def run_tick(self):
to_delete = []
for connection_id in self.sessions:
- if not connection_id in self.io.server.clients:
+ connection_id_found = False
+ for server in self.io.servers:
+ if connection_id in server.clients:
+ connection_id_found = True
+ break
+ if not connection_id_found:
t = self.get_thing(self.sessions[connection_id], create_unfound=False)
self.things.remove(t)
to_delete += [connection_id]
for connection_id in to_delete:
del self.sessions[connection_id]
- self.changed = True
+ self.changed = True
for t in [t for t in self.things]:
if t in self.things:
try:
@@ -108,6 +114,10 @@ class Game(GameBase):
for connection_id in [c_id for c_id in self.sessions
if self.sessions[c_id] == t.id_]:
self.io.send('GAME_ERROR ' + quote(str(e)), connection_id)
+ except PlayError as e:
+ for connection_id in [c_id for c_id in self.sessions
+ if self.sessions[c_id] == t.id_]:
+ self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id)
if self.changed:
self.turn += 1
self.send_gamestate()