X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fsrc%2Fmain.py;h=3bb80f2ba2bb3a653448df59f87ef95118f83bc3;hp=44aa36075a8444ace5777991b5d1141923d020ac;hb=0a0868c019e4f68356a8793058d407539548759b;hpb=068745c990538769b9c4fd48f467a0f938e4c0d6

diff --git a/qchess/src/main.py b/qchess/src/main.py
index 44aa360..3bb80f2 100644
--- a/qchess/src/main.py
+++ b/qchess/src/main.py
@@ -20,6 +20,7 @@ sleep_timeout = None
 [game, graphics] = [None, None]
 
 def make_player(name, colour):
+	debug(name)
 	if name[0] == '@':
 		if name[1:] == "human":
 			return HumanPlayer(name, colour)
@@ -110,17 +111,7 @@ def main(argv):
 		i += 1
 		arg = argv[i]
 		if arg[0] != '-':
-			p = make_player(arg, colour)
-			if not isinstance(p, Player):
-				sys.stderr.write(sys.argv[0] + " : Fatal error creating " + colour + " player\n")
-				return 100
-			players.append(p)
-			if colour == "white":
-				colour = "black"
-			elif colour == "black":
-				pass
-			else:
-				sys.stderr.write(sys.argv[0] + " : Too many players (max 2)\n")
+			players.append(arg)
 			continue
 
 		# Option parsing goes here
@@ -205,11 +196,23 @@ def main(argv):
 				sys.stderr.write("Only a single player may be provided when --server is used\n")
 				return 1
 			if len(players) == 1:
-				return client(server_addr, players[0].name)
+				return client(server_addr, players[0])
 			else:
 				return client(server_addr)
 		
-
+	for i in xrange(len(players)):
+		p = make_player(players[i], colour)
+		if not isinstance(p, Player):
+			sys.stderr.write(sys.argv[0] + " : Fatal error creating " + colour + " player\n")
+			return 100
+		players[i] = p
+		if colour == "white":
+			colour = "black"
+		elif colour == "black":
+			pass
+		else:
+			sys.stderr.write(sys.argv[0] + " : Too many players (max 2)\n")
+		
 	# Create the board
 	
 	# Construct a GameThread! Make it global! Damn the consequences!