sharing is almost kind of working

2 files changed, 12 insertions, 5 deletions

diff --git a/PathsActivity.py b/PathsActivity.py
index f725a47..d96e97a 100644
--- a/PathsActivity.py
+++ b/PathsActivity.py
@@ -501,11 +501,10 @@ state=%d' % (id, initiator, type, service, params, state))
                 generate_xo(colors=self._player_colors[
                         self._game.buddies.index(nick)])))
         self.player.set_tooltip_text(nick)
-        if not self.initiating:  # Initiator took a turn above.
-            if nick == self.nick:
-                self._game.its_my_turn()
-            else:
-                self._game.its_their_turn(nick)
+        if nick == self.nick:
+            self._game.its_my_turn()
+        else:
+            self._game.its_their_turn(nick)
 
     def send_event(self, entry):
         """ Send event through the tube. """
diff --git a/game.py b/game.py
index c066056..0c6946b 100644
--- a/game.py
+++ b/game.py
@@ -259,6 +259,14 @@ class Game():
             gobject.timeout_add(1000, self._robot_turn)
         elif not self.we_are_sharing():
             self.its_my_turn()
+        else:
+            self.whos_turn += 1
+            if self.whos_turn == len(self.buddies):
+                self.whos_turn = 0
+            else:
+                print "it is %s's turn" % (self.buddies[self.whos_turn])
+                self._activity.send_event('t|%s' % (
+                        self.buddies[self.whos_turn]))
 
     def _robot_turn(self):
         self._robot_play()