From: Sam Moore <matches@ucc.asn.au>
Date: Wed, 27 Mar 2013 05:05:54 +0000 (+0800)
Subject: Remove types_revealed from network.py
X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=commitdiff_plain;h=3f610d389d45acf294bd66dc01e135d5ed406aa7

Remove types_revealed from network.py
---

diff --git a/qchess/qchess.py b/qchess/qchess.py
index e2293ae..24766e2 100755
--- a/qchess/qchess.py
+++ b/qchess/qchess.py
@@ -1240,7 +1240,7 @@ class NetworkSender(Player,Network):
 		if selected != None and selected.colour == self.colour and len(s) > 2 and not "->" in s:
 			s = " ".join(s[0:3])
 			for i in range(2):
-				if selected.types_revealed[i] == True:
+				if selected.types[i][0] == '?':
 					s += " " + str(selected.types[i])
 				else:
 					s += " unknown"
@@ -1301,9 +1301,9 @@ class NetworkReceiver(Player,Network):
 			for i in range(2):
 				selected.types[i] = str(s[3+i])
 				if s[3+i] == "unknown":
-					selected.types_revealed[i] = False
+					selected.types[i] = '?'+selected.types[i]
 				else:
-					selected.types_revealed[i] = True
+					selected.types[i] = selected.types[i][1:]
 			selected.current_type = selected.types[selected.choice]	
 		else:
 			pass
@@ -2633,4 +2633,4 @@ if __name__ == "__main__":
 		sys.exit(102)
 
 # --- main.py --- #
-# EOF - created from make on Wed Mar 27 12:42:42 WST 2013
+# EOF - created from make on Wed Mar 27 13:05:44 WST 2013
diff --git a/qchess/src/network.py b/qchess/src/network.py
index 20f632b..75df117 100644
--- a/qchess/src/network.py
+++ b/qchess/src/network.py
@@ -116,7 +116,7 @@ class NetworkSender(Player,Network):
 		if selected != None and selected.colour == self.colour and len(s) > 2 and not "->" in s:
 			s = " ".join(s[0:3])
 			for i in range(2):
-				if selected.types_revealed[i] == True:
+				if selected.types[i][0] == '?':
 					s += " " + str(selected.types[i])
 				else:
 					s += " unknown"
@@ -177,9 +177,9 @@ class NetworkReceiver(Player,Network):
 			for i in range(2):
 				selected.types[i] = str(s[3+i])
 				if s[3+i] == "unknown":
-					selected.types_revealed[i] = False
+					selected.types[i] = '?'+selected.types[i]
 				else:
-					selected.types_revealed[i] = True
+					selected.types[i] = selected.types[i][1:]
 			selected.current_type = selected.types[selected.choice]	
 		else:
 			pass