werks.
fixes ncurses stuck display, swapped coordinates on network. handles comment line arriving before player token line.
このコミットが含まれているのは:
コミット
a57d6c2c50
29
uttt.c
29
uttt.c
|
@ -304,6 +304,7 @@ int ut_readfill(int fd, char *x, size_t l)
|
||||||
int r = read(fd, x, l);
|
int r = read(fd, x, l);
|
||||||
if(r < 0)
|
if(r < 0)
|
||||||
{
|
{
|
||||||
|
//printf("ut_readfill read:%d errno=%d\n", r, errno);
|
||||||
if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||||
else {return 1;}
|
else {return 1;}
|
||||||
}
|
}
|
||||||
|
@ -531,9 +532,10 @@ int ut_network_game(struct ut_state *state, int sock, char player, bool readable
|
||||||
if (state->player == player) {
|
if (state->player == player) {
|
||||||
if (readable) {ut_dprintf(sock, "Waiting for game partner ...\n");}
|
if (readable) {ut_dprintf(sock, "Waiting for game partner ...\n");}
|
||||||
if(ut_cursgetpos(state, &r, &c)) {continue;}
|
if(ut_cursgetpos(state, &r, &c)) {continue;}
|
||||||
ut_dprintf(sock, "%d,%d\n", r, c);
|
ut_dprintf(sock, "%d,%d\n", c, r);
|
||||||
} else {
|
} else {
|
||||||
ut_cursprintf("Waiting for game partner ...\n");
|
ut_cursprintf("Waiting for game partner ...\n");
|
||||||
|
refresh();
|
||||||
if (readable) {
|
if (readable) {
|
||||||
// line feed aligns game board each turn
|
// line feed aligns game board each turn
|
||||||
ut_dprintf(sock, "\nPlace token %c in position x,y: ", ut_turn(player));
|
ut_dprintf(sock, "\nPlace token %c in position x,y: ", ut_turn(player));
|
||||||
|
@ -549,8 +551,8 @@ int ut_network_game(struct ut_state *state, int sock, char player, bool readable
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(ut_move(state, state, r, c)) {continue;}
|
if (ut_move(state, state, r, c)) {continue;}
|
||||||
ut_dprintf(sock, "\n");
|
if (readable) {ut_dprintf(sock, "\n");}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -604,7 +606,7 @@ int ut_host_game(struct ut_state *state) {
|
||||||
}
|
}
|
||||||
bool readable = byte != '\0';
|
bool readable = byte != '\0';
|
||||||
if (byte != '\n') {
|
if (byte != '\n') {
|
||||||
int err = ut_ignore_line(sock);
|
int err = ut_ignore_line(conn);
|
||||||
if (err == 1) {
|
if (err == 1) {
|
||||||
printf("Connection closed.\n");
|
printf("Connection closed.\n");
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -646,10 +648,21 @@ int ut_join_game(struct ut_state *state) {
|
||||||
|
|
||||||
// host decides X or O
|
// host decides X or O
|
||||||
char player_buf[2];
|
char player_buf[2];
|
||||||
char *player = (char*)&player_buf;
|
char *player = player_buf;
|
||||||
int r = ut_readfill(sock, player_buf, 2);
|
for (int i = 0; i < 10; i++) {
|
||||||
if (r == 2) {printf("Connection closed.\n");}
|
int r = ut_readfill(sock, player_buf, 1);
|
||||||
if (r != 0) {return 1;}
|
ut_ignore_line(sock);
|
||||||
|
if (*player == '|') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (r == 2) {printf("Connection closed.\n");}
|
||||||
|
if (r != 0) {return 1;}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (*player != 'X' && *player != 'O') {
|
||||||
|
printf("Host is retarded.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
return ut_network_game(state, sock, *player, false);
|
return ut_network_game(state, sock, *player, false);
|
||||||
}
|
}
|
||||||
|
|
読み込み中…
新しいイシューから参照