Added who we are waiting for

FenixFeather · Dec 3, 2013 · 2c478f4 · 2c478f4
1 parent 1c4a77a
commit 2c478f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/cards-client.py b/cards-client.py
@@ -155,8 +155,9 @@ def update(s):
 #    time.sleep(30)
     while True:
         try:
-            update("Waiting for others...")
-            if me.myTurn():
+            myTurn, slowPlayer = me.myTurn()
+            update("Waiting for {0}...".format(slowPlayer))            
+            if myTurn:
                 print("Your turn!")            
                 me.updateTurnInfo()
                 if me.isJudge:
@@ -186,7 +187,7 @@ def update(s):
                     update("Waiting for judgement.. ")    
                     time.sleep(0.5)
             time.sleep(0.5)
-            update("Waiting for others.. ")
+            update("Waiting for {0}.. ".format(slowPlayer))
             time.sleep(0.5)
         except KeyboardInterrupt:
             sys.exit(0)

diff --git a/cards-server.py b/cards-server.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#TODO:Send cards to people, who are we waiting for?
+#TODO:who are we waiting for?
 #An outline of an engine for concept-to-description/category matching card game.
 
 import random
@@ -162,7 +162,7 @@ def newRound(self):
                     conn,addr = self.serv.accept()
                     data = pickle.loads(conn.recv(self.BUFSIZE))
                     if str(data[1]) == 'myturn':
-                        conn.send(pickle.dumps(hash(player) == data[0]))
+                        conn.send(pickle.dumps((hash(player) == data[0],player.name)))
                         conn.close()
                     elif str(data[1]) == 'roundEnd':
                         conn.send(pickle.dumps(False))
@@ -190,7 +190,7 @@ def newRound(self):
             conn,addr = self.serv.accept()
             data = pickle.loads(conn.recv(self.BUFSIZE))
             if str(data[1]) == 'myturn':
-                conn.send(pickle.dumps(hash(self.judge) == data[0]))
+                conn.send(pickle.dumps((hash(player) == data[0],player.name)))
                 conn.close()
             elif str(data[1]) == 'roundEnd':
                 conn.send(pickle.dumps(False))