ninya9k
/
uttt
1
0
フォーク 0
コード イシュー プルリクエスト パッケージ プロジェクト リリース 1 Wiki アクティビティ

struct ut_move and move valid check

このコミットが含まれているのは:
woosh 2023-11-16 01:55:30 +00:00
親 2ccce9c493
コミット 36483f1d44
1個のファイルの変更、70行の追加、59行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

129
uttt.c
ファイルの表示

@ -28,6 +28,10 @@ const struct ut_state ut_initial = {
.playBoard = -1, .playBoard = -1,
.player = 'X', .player = 'X',
}; };
struct ut_move
{
char r, c;
};
const char HELP_TEXT[] = "\ const char HELP_TEXT[] = "\
Usage: uttt (--local | --host | --join)\n\ Usage: uttt (--local | --host | --join)\n\
@ -59,7 +63,7 @@ char ut_turn(char player)
} }
#define T(r, c) (tiles[offset + stride * r + c]) #define T(r, c) (tiles[offset + stride * r + c])
char ut_winner(const char *tiles, int offset, int stride) { char ut_winnerBoard(const char *tiles, int offset, int stride) {
// whoreizontal wins // whoreizontal wins
for (int y = 0; y < 3; y++) for (int y = 0; y < 3; y++)
@ -94,31 +98,38 @@ char ut_winner(const char *tiles, int offset, int stride) {
} }
return ' '; // draw return ' '; // draw
} }
char ut_winner(const struct ut_state *state)
{
return ut_winnerBoard((char *)state->boards, 0, 3);
}
int ut_move(struct ut_state *new_state, const struct ut_state *old_state, int row, int col) int ut_move(struct ut_state *new_state, const struct ut_state *old_state, struct ut_move m)
{ {
// bad move - out of bounds // bad move - out of bounds
if(row < 0 || row >= 9 || col < 0 || col >= 9) {return 1;} if(m.r < 0 || m.r >= 9 || m.c < 0 || m.c >= 9) {return 1;}
// state->playBoard == -1 means all boards playable; otherwise only one board is playable // state->playBoard == -1 means all boards playable; otherwise only one board is playable
if (old_state->playBoard != -1 && old_state->playBoard != 3 * (row / 3) + (col / 3)) {return 1;} if (old_state->playBoard != -1 && old_state->playBoard != 3 * (m.r / 3) + (m.c / 3)) {return 1;}
// bad move - tile is occupied // bad move - tile is occupied
if(old_state->tiles[row][col] != '\0') {return 1;} if(old_state->tiles[m.r][m.c] != '\0') {return 1;}
// bad move - board is finished // bad move - board is finished
if(old_state->boards[row / 3][col / 3] != '\0') {return 1;} if(old_state->boards[m.r / 3][m.c / 3] != '\0') {return 1;}
// just check if move valid
if(!new_state) {return 0;}
// copy old_state->{tiles,boards} to new_state->{tiles,boards} // copy old_state->{tiles,boards} to new_state->{tiles,boards}
memmove(new_state->tiles, old_state->tiles, sizeof(old_state->tiles)); memmove(new_state->tiles, old_state->tiles, sizeof(old_state->tiles));
memmove(new_state->boards, old_state->boards, sizeof(old_state->boards)); memmove(new_state->boards, old_state->boards, sizeof(old_state->boards));
// do move // do move
new_state->tiles[row][col] = old_state->player; new_state->tiles[m.r][m.c] = old_state->player;
new_state->boards[row / 3][col / 3] = ut_winner((char *)new_state->tiles, 27 * (row / 3) + 3 * (col / 3), 9); new_state->boards[m.r / 3][m.c / 3] = ut_winnerBoard((char *)new_state->tiles, 27 * (m.r / 3) + 3 * (m.c / 3), 9);
// next play board - if next play board is not playable, play any board // next play board - if next play board is not playable, play any board
new_state->playBoard = new_state->boards[row % 3][col % 3] == '\0' ? 3 * (row % 3) + (col % 3) : -1; new_state->playBoard = new_state->boards[m.r % 3][m.c % 3] == '\0' ? 3 * (m.r % 3) + (m.c % 3) : -1;
new_state->player = ut_turn(old_state->player); new_state->player = ut_turn(old_state->player);
return 0; return 0;
@ -208,7 +219,7 @@ void ut_drawBoard(void (*mvch)(void*, int, int, char), void *arg, const char *ti
} }
#define DTILES_Y 21 #define DTILES_Y 21
#define DTILES_X 21 #define DTILES_X 21
void ut_drawTiles(void (*mvch)(void*, int, int, char), void *arg, const struct ut_state *state, bool numbers, int lr, int lc) void ut_drawTiles(void (*mvch)(void*, int, int, char), void *arg, const struct ut_state *state, bool numbers, struct ut_move lm)
{ {
for(int r = 0; r < 3; r++) for(int r = 0; r < 3; r++)
for(int c = 0; c < 3; c++) for(int c = 0; c < 3; c++)
@ -226,10 +237,10 @@ void ut_drawTiles(void (*mvch)(void*, int, int, char), void *arg, const struct u
for(int r = 0; r < 3; r++) for(int r = 0; r < 3; r++)
mvch(arg, 7 * b + 2 * r + 1, 0, '0' + 3 * b + r); mvch(arg, 7 * b + 2 * r + 1, 0, '0' + 3 * b + r);
} }
if(lr >= 0 && lr < 9 && lc >= 0 && lc < 9) if(lm.r >= 0 && lm.r < 9 && lm.c >= 0 && lm.c < 9)
mvch(arg, 7 * (lr / 3) + 2 * (lr % 3) + 1, mvch(arg, 7 * (lm.r / 3) + 2 * (lm.r % 3) + 1,
7 * (lc / 3) + 2 * (lc % 3) + 1, 7 * (lm.c / 3) + 2 * (lm.c % 3) + 1,
state->tiles[lr][lc] == 'X' ? '%' : '0'); state->tiles[lm.r][lm.c] == 'X' ? '%' : '0');
} }
#define DBOARDS_Y 7 #define DBOARDS_Y 7
#define DBOARDS_X 7 #define DBOARDS_X 7
@ -273,7 +284,7 @@ void ut_cursdraw(const struct ut_state *state)
{ {
ut_cursprintf("Turn: %c Play board: %s\n", (int)state->player, PLAY_BOARDS[(state->playBoard + 10) % 10]); ut_cursprintf("Turn: %c Play board: %s\n", (int)state->player, PLAY_BOARDS[(state->playBoard + 10) % 10]);
dtiles_line = curs_line; dtiles_line = curs_line;
ut_drawTiles(ut_cursmvchc, NULL, state, false, -1, -1); // TODO some kind of move history to know the last move ut_drawTiles(ut_cursmvchc, NULL, state, false, (struct ut_move){-1, -1}); // TODO some kind of move history to know the last move
curs_line += DTILES_Y; curs_line += DTILES_Y;
//ut_drawBoards(ut_cursmvchc, NULL, state); //ut_drawBoards(ut_cursmvchc, NULL, state);
} }
@ -281,7 +292,7 @@ void ut_sockdraw(const struct ut_state *state, int fd)
{ {
ut_dprintf(fd, "Turn: %c\nPlay board: %s\n", (int)state->player, PLAY_BOARDS[(state->playBoard + 10) % 10]); ut_dprintf(fd, "Turn: %c\nPlay board: %s\n", (int)state->player, PLAY_BOARDS[(state->playBoard + 10) % 10]);
char dtiles[DTILES_Y][DTILES_X]; char dtiles[DTILES_Y][DTILES_X];
ut_drawTiles(ut_tmvch, dtiles, state, true, -1, -1); ut_drawTiles(ut_tmvch, dtiles, state, true, (struct ut_move){-1, -1});
for(int r = 0; r < DTILES_Y; r++) for(int r = 0; r < DTILES_Y; r++)
{ {
ut_dprintf(fd, "%.*s\n", DTILES_X, dtiles[r]); ut_dprintf(fd, "%.*s\n", DTILES_X, dtiles[r]);
@ -305,35 +316,35 @@ int ut_readfill(int fd, char *x, size_t l)
return 0; return 0;
} }
int ut_cursgetpos(const struct ut_state *state, int *r, int *c) int ut_cursgetpos(const struct ut_state *state, struct ut_move *m)
{ {
#define P(r, c, d) ((state->playBoard == -1 || state->playBoard == 3 * (r / 3) + (c / 3)) && \ #define P(r, c, d) ((state->playBoard == -1 || state->playBoard == 3 * (r / 3) + (c / 3)) && \
(state->boards[r / 3][c / 3] == '\0' || d % 3 == 1)) (state->boards[r / 3][c / 3] == '\0' || d % 3 == 1))
MEVENT event; MEVENT event;
ut_cursprintf("Select move with arrow keys or mouse.\n"); ut_cursprintf("Select move with arrow keys or mouse.\n");
if(*r < 0 || *r >= 9 || *c < 0 || *c >= 9) if(m->r < 0 || m->r >= 9 || m->c < 0 || m->c >= 9)
{ {
*r = 4; *c = 4; m->r = 4; m->c = 4;
} }
else if(state->playBoard == -1) else if(state->playBoard == -1)
{ {
*r = 3 * (*r / 3) + 1; m->r = 3 * (m->r / 3) + 1;
*c = 3 * (*c / 3) + 1; m->c = 3 * (m->c / 3) + 1;
} }
else else
{ {
*r = 3 * (state->playBoard / 3) + 1; m->r = 3 * (state->playBoard / 3) + 1;
*c = 3 * (state->playBoard % 3) + 1; m->c = 3 * (state->playBoard % 3) + 1;
} }
for(;;) for(;;)
{ {
/*if(state->boards[*r / 3][*c / 3] != '\0') /*if(state->boards[m->r / 3][m->c / 3] != '\0')
{ {
*r = 3 * (*r / 3) + 1; m->r = 3 * (m->r / 3) + 1;
*c = 3 * (*c / 3) + 1; m->c = 3 * (m->c / 3) + 1;
}*/ }*/
move(dtiles_line + (7 * (*r / 3) + 1) + (2 * (*r % 3)), move(dtiles_line + (7 * (m->r / 3) + 1) + (2 * (m->r % 3)),
(7 * (*c / 3) + 1) + (2 * (*c % 3))); (7 * (m->c / 3) + 1) + (2 * (m->c % 3)));
refresh(); refresh();
switch(getch()) switch(getch())
{ {
@ -343,8 +354,8 @@ int ut_cursgetpos(const struct ut_state *state, int *r, int *c)
event.y -= dtiles_line; event.y -= dtiles_line;
if(event.y < 0 || event.y >= 21) {break;} if(event.y < 0 || event.y >= 21) {break;}
if(event.x < 0 || event.x >= 21) {break;} if(event.x < 0 || event.x >= 21) {break;}
*r = (event.y % 7 - 1) / 2 + 3 * (event.y / 7); m->r = (event.y % 7 - 1) / 2 + 3 * (event.y / 7);
*c = (event.x % 7 - 1) / 2 + 3 * (event.x / 7); m->c = (event.x % 7 - 1) / 2 + 3 * (event.x / 7);
if(((event.y % 7) - 1) % 2 != 0) {break;} if(((event.y % 7) - 1) % 2 != 0) {break;}
if(((event.x % 7) - 1) % 2 != 0) {break;} if(((event.x % 7) - 1) % 2 != 0) {break;}
return 0; return 0;
@ -353,41 +364,41 @@ int ut_cursgetpos(const struct ut_state *state, int *r, int *c)
case 'k': /* FALLTHROUGH */ case 'k': /* FALLTHROUGH */
case 'w': /* FALLTHROUGH */ case 'w': /* FALLTHROUGH */
case KEY_UP: case KEY_UP:
//*r = (((*r - 1) % 9) + 9) % 9; //m->r = (((m->r - 1) % 9) + 9) % 9;
for(int i = 0; i < 9 + 1; i++) for(int i = 0; i < 9 + 1; i++)
{ {
*r = (*r + 9 - 1) % 9; m->r = (m->r + 9 - 1) % 9;
if(P(*r, *c, *r)) {break;} if(P(m->r, m->c, m->r)) {break;}
} }
break; break;
case 'h': /* FALLTHROUGH */ case 'h': /* FALLTHROUGH */
case 'a': /* FALLTHROUGH */ case 'a': /* FALLTHROUGH */
case KEY_LEFT: case KEY_LEFT:
//*c = (((*c - 1) % 9) + 9) % 9; //m->c = (((m->c - 1) % 9) + 9) % 9;
for(int i = 0; i < 9 + 1; i++) for(int i = 0; i < 9 + 1; i++)
{ {
*c = (*c + 9 - 1) % 9; m->c = (m->c + 9 - 1) % 9;
if(P(*r, *c, *c)) {break;} if(P(m->r, m->c, m->c)) {break;}
} }
break; break;
case 'j': /* FALLTHROUGH */ case 'j': /* FALLTHROUGH */
case 's': /* FALLTHROUGH */ case 's': /* FALLTHROUGH */
case KEY_DOWN: case KEY_DOWN:
//*r = (*r + 1) % 9; //m->r = (m->r + 1) % 9;
for(int i = 0; i < 9 + 1; i++) for(int i = 0; i < 9 + 1; i++)
{ {
*r = (*r + 1) % 9; m->r = (m->r + 1) % 9;
if(P(*r, *c, *r)) {break;} if(P(m->r, m->c, m->r)) {break;}
} }
break; break;
case 'l': /* FALLTHROUGH */ case 'l': /* FALLTHROUGH */
case 'd': /* FALLTHROUGH */ case 'd': /* FALLTHROUGH */
case KEY_RIGHT: case KEY_RIGHT:
//*c = (*c + 1) % 9; //m->c = (m->c + 1) % 9;
for(int i = 0; i < 9 + 1; i++) for(int i = 0; i < 9 + 1; i++)
{ {
*c = (*c + 1) % 9; m->c = (m->c + 1) % 9;
if(P(*r, *c, *c)) {break;} if(P(m->r, m->c, m->c)) {break;}
} }
break; break;
case ' ': /* FALLTHROUGH */ case ' ': /* FALLTHROUGH */
@ -414,7 +425,7 @@ int ut_ignore_line(int sock) {
return 2; return 2;
} }
int ut_sockgetpos(const struct ut_state *state, int sock, int *y, int *x, bool readable) { int ut_sockgetpos(const struct ut_state *state, int sock, struct ut_move *m, bool readable) {
int index = 0; int index = 0;
char byte; char byte;
while (true) { while (true) {
@ -426,9 +437,9 @@ int ut_sockgetpos(const struct ut_state *state, int sock, int *y, int *x, bool r
if (index == 0 && byte == '|') { if (index == 0 && byte == '|') {
if (ut_ignore_line(sock)) {return -1;} if (ut_ignore_line(sock)) {return -1;}
} else if (index == 0) { } else if (index == 0) {
*x = byte - 0x30; m->c = byte - 0x30;
} else if (index == 2) { } else if (index == 2) {
*y = byte - 0x30; m->r = byte - 0x30;
} else if (index == 1 && byte != ',' || index == 3 && byte != '\n') { } else if (index == 1 && byte != ',' || index == 3 && byte != '\n') {
ut_cursprintf("Partner sent malformed coords - retrying\n"); ut_cursprintf("Partner sent malformed coords - retrying\n");
if (ut_ignore_line(sock)) {return 2;} if (ut_ignore_line(sock)) {return 2;}
@ -441,17 +452,17 @@ int ut_sockgetpos(const struct ut_state *state, int sock, int *y, int *x, bool r
index++; index++;
if (index == 4) {break;} if (index == 4) {break;}
} }
//printf("x=%d y=%d\n", *x, *y); //printf("x=%d y=%d\n", (int)m->c, (int)m->r);
return 0; return 0;
} }
int ut_local_game(struct ut_state *state) { int ut_local_game(struct ut_state *state) {
for(;;) for(;;)
{ {
int r = 4, c = 4; struct ut_move m = {4, 4};
ut_curserase(); ut_curserase();
ut_cursdraw(state); ut_cursdraw(state);
char w = ut_winner((char *)state->boards, 0, 3); char w = ut_winner(state);
if(w) if(w)
{ {
if(w == ' ') if(w == ' ')
@ -464,19 +475,19 @@ int ut_local_game(struct ut_state *state) {
} }
break; break;
} }
if(ut_cursgetpos(state, &r, &c)) {continue;} if(ut_cursgetpos(state, &m)) {continue;}
if(ut_move(state, state, r, c)) {continue;} if(ut_move(state, state, m)) {continue;}
} }
return 0; return 0;
} }
int ut_network_game(struct ut_state *state, int sock, char player, bool readable) { int ut_network_game(struct ut_state *state, int sock, char player, bool readable) {
while (true) { while (true) {
int r = 4, c = 4; struct ut_move m = {4, 4};
ut_curserase(); ut_curserase();
ut_cursdraw(state); ut_cursdraw(state);
if (readable) ut_sockdraw(state, sock); if (readable) ut_sockdraw(state, sock);
char w = ut_winner((char *)state->boards, 0, 3); char w = ut_winner(state);
if(w) if(w)
{ {
if(w == ' ') if(w == ' ')
@ -495,17 +506,17 @@ 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, &m)) {continue;}
ut_dprintf(sock, "%d,%d\n", c, r); ut_dprintf(sock, "%d,%d\n", (int)m.c, (int)m.r);
} else { } else {
ut_cursprintf("Waiting for game partner ...\n"); ut_cursprintf("Waiting for game partner ...\n");
refresh(); 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: ", (int)ut_turn(player));
} }
int err = ut_sockgetpos(state, sock, &r, &c, readable); int err = ut_sockgetpos(state, sock, &m, readable);
ut_cursprintf("received row=%d col=%d\n", r, c); ut_cursprintf("received row=%d col=%d\n", (int)m.r, (int)m.c);
if (err == 1) { if (err == 1) {
ut_cursprintf("Connection closed.\n"); ut_cursprintf("Connection closed.\n");
return 1; return 1;
@ -515,7 +526,7 @@ 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, m)) {continue;}
if (readable) {ut_dprintf(sock, "\n");} if (readable) {ut_dprintf(sock, "\n");}
} }
return 0; return 0;
@ -582,7 +593,7 @@ int ut_host_game(struct ut_state *state) {
} }
// tell partner X or O // tell partner X or O
ut_dprintf(conn, "%c\n", ut_turn(player)); ut_dprintf(conn, "%c\n", (int)ut_turn(player));
if (readable) { if (readable) {
ut_dprintf(conn, "You play as: %c\n\n", ut_turn(player)); ut_dprintf(conn, "You play as: %c\n\n", ut_turn(player));
} }