Last active
November 16, 2017 22:17
-
-
Save tylerreisinger/9efc0c4d70d59200462ed03f6a1fe5f4 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/client.py b/client.py | |
index ea827a0..5cbcd67 100644 | |
--- a/client.py | |
+++ b/client.py | |
@@ -59,7 +59,7 @@ def get_list(s): | |
net_dic_data = s.recv(4096) | |
debug_print('net dictest', net_dic_data) #debugprint | |
- while len(net_dic_data) == 0: | |
+ if len(net_dic_data) == 0: | |
print("RECIEVED 0") | |
net_dic_data = s.recv(4096) | |
@@ -144,9 +144,9 @@ while new_game: | |
debug_print("netboard in main", net_board) #debugprint | |
tictactoe2.print_board(net_board) #inital board from client file | |
- tictactoe2.game_body_case_net(player_one_name, player_two_name, | |
- net_reserve_list, net_board, player_one_mark, | |
- player_two_mark) | |
+ #tictactoe2.game_body_case_net(player_one_name, player_two_name, | |
+ # net_reserve_list, net_board, player_one_mark, | |
+ # player_two_mark) | |
send_data_to_server(s, net_board, net_reserve_list) | |
print('net board after step', net_board) | |
diff --git a/server.py b/server.py | |
index 23d2d6d..e07765b 100644 | |
--- a/server.py | |
+++ b/server.py | |
@@ -36,9 +36,9 @@ def send_list_to_second(s, board, reserve, name_one, mark_two, round_numb): | |
def recieve_data(s): | |
recv_dict_data = s.recv(4096) | |
serv_decoded = recv_dict_data.decode('utf-8') | |
- loaded_data = json.loads(net_decoded) | |
+ loaded_data = json.loads(serv_decoded) | |
player_board = loaded_data['board'] | |
- reserve = loaded_date['reserv'] | |
+ reserve = loaded_date['reserve'] | |
return board, reserve | |
@@ -92,11 +92,11 @@ while turn_counter <= MAX_TURNS: | |
print(board) | |
if turn_counter % 2 == 1: | |
send_list_to_first(s, board, reserve_list, name_two, player_one_mark, turn_counter) | |
- s.close() | |
+ board, reserve_list = recieve_data(first_connection) | |
elif turn_counter % 2 == 0: | |
print('board in else', board) | |
send_list_to_second(s, board, reserve_list, name_one, player_two_mark, turn_counter) | |
- board, reserve_list = recieve_data(s) | |
+ board, reserve_list = recieve_data(sec_connection) | |
print('after recieve', board, reserve_list) | |
turn_counter += 1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment