summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CAO_Client.py8
-rw-r--r--CAO_Game.py1
2 files changed, 7 insertions, 2 deletions
diff --git a/CAO_Client.py b/CAO_Client.py
index 67ce54f..6eccc2d 100644
--- a/CAO_Client.py
+++ b/CAO_Client.py
@@ -12,9 +12,13 @@ class CAO_Client():
if self.game is not None:
return cao_error('You are already in a game')
- self.game = self.game_manager.join_game(game_name)
- return self.game.try_join(self)
+ game = self.game_manager.join_game(game_name)
+ # XXX self.game will be assigned by game.try_join()
+ return game.try_join(self)
+
+ def set_game(self, game):
+ self.game = game
def set_player(self, player):
self.player = player
diff --git a/CAO_Game.py b/CAO_Game.py
index 54bbf48..fda7707 100644
--- a/CAO_Game.py
+++ b/CAO_Game.py
@@ -40,6 +40,7 @@ class CAO_Game():
player = CAO_Player(client, cards)
client.set_player(player)
+ client.set_game(self)
self.players.append(player)