Merge branch 'ncurses' into network WIP
このコミットが含まれているのは:
コミット
461f53f339
182
uttt.c
182
uttt.c
|
@ -42,7 +42,7 @@ char ut_turn(char player)
|
|||
}
|
||||
|
||||
#define T(r, c) (tiles[offset + stride * r + c])
|
||||
char ut_winner(char *tiles, int offset, int stride) {
|
||||
char ut_winner(const char *tiles, int offset, int stride) {
|
||||
|
||||
// whoreizontal wins
|
||||
for (int y = 0; y < 3; y++)
|
||||
|
@ -87,10 +87,10 @@ int ut_move(struct ut_state *new_state, const struct ut_state *old_state, int ro
|
|||
if (old_state->playBoard != -1 && old_state->playBoard != 3 * (row / 3) + (col / 3)) {return 1;}
|
||||
|
||||
// bad move - tile is occupied
|
||||
if(old_state->tiles[row][col] != '\0') {return 1;} // replace with ' ' maybe
|
||||
if(old_state->tiles[row][col] != '\0') {return 1;}
|
||||
|
||||
// bad move - board is not playable
|
||||
if(old_state->boards[row / 3][col / 3] != '\0') {return 1;} // replace with ' ' maybe
|
||||
// bad move - board is finished
|
||||
if(old_state->boards[row / 3][col / 3] != '\0') {return 1;}
|
||||
|
||||
// copy old_state->{tiles,boards} to new_state->{tiles,boards}
|
||||
memmove(new_state->tiles, old_state->tiles, sizeof(old_state->tiles));
|
||||
|
@ -107,6 +107,135 @@ int ut_move(struct ut_state *new_state, const struct ut_state *old_state, int ro
|
|||
return 0;
|
||||
}
|
||||
|
||||
void ut_drawBoard(const char *tiles, int offset, int stride, int iy, int ix, char winner, bool highlight)
|
||||
{
|
||||
// 5x5 board display
|
||||
/*
|
||||
* X|X|X
|
||||
* -+-+-
|
||||
* X|X|X
|
||||
* -+-+-
|
||||
* X|X|X
|
||||
*/
|
||||
for(int r = 0; r < 3; r++)
|
||||
for(int c = 0; c < 3; c++)
|
||||
mvaddch(iy + 2 * r, ix + 2 * c, T(r, c) != '\0' ? T(r, c) : ' ');
|
||||
//char info = winner != '\0' ? winner : highlight ? '*' : ' ';
|
||||
for(int r = 0; r < 3; r++)
|
||||
for(int c = 0; c < 2; c++)
|
||||
mvaddch(iy + 2 * r, ix + 2 * c + 1, winner != '\0' ? winner : '|');
|
||||
for(int r = 0; r < 2; r++)
|
||||
for(int c = 0; c < 3; c++)
|
||||
mvaddch(iy + 2 * r + 1, ix + 2 * c, winner != '\0' ? winner : '-');
|
||||
for(int r = 0; r < 2; r++)
|
||||
for(int c = 0; c < 2; c++)
|
||||
mvaddch(iy + 2 * r + 1, ix + 2 * c + 1, winner != '\0' ? winner : highlight ? '*' : '+');
|
||||
}
|
||||
|
||||
void ut_draw(const struct ut_state *state)
|
||||
{
|
||||
for(int r = 0; r < 3; r++)
|
||||
for(int c = 0; c < 3; c++)
|
||||
ut_drawBoard((char *)state->tiles,
|
||||
27 * r + 3 * c, 9,
|
||||
7 * r + 1, 7 * c + 1,
|
||||
state->boards[r][c],
|
||||
state->playBoard == -1 || state->playBoard == 3 * r + c);
|
||||
//refresh();
|
||||
}
|
||||
|
||||
int ut_click(const struct ut_state *state, int *r, int *c)
|
||||
{
|
||||
#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))
|
||||
MEVENT event;
|
||||
mvaddstr(21, 0, "Select move with arrow keys or mouse.");
|
||||
if(state->playBoard == -1)
|
||||
{
|
||||
*r = 3 * (*r / 3) + 1;
|
||||
*c = 3 * (*c / 3) + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
*r = 3 * (state->playBoard / 3) + 1;
|
||||
*c = 3 * (state->playBoard % 3) + 1;
|
||||
}
|
||||
for(;;)
|
||||
{
|
||||
/*if(state->boards[*r / 3][*c / 3] != '\0')
|
||||
{
|
||||
*r = 3 * (*r / 3) + 1;
|
||||
*c = 3 * (*c / 3) + 1;
|
||||
}*/
|
||||
move((7 * (*r / 3) + 1) + (2 * (*r % 3)),
|
||||
(7 * (*c / 3) + 1) + (2 * (*c % 3)));
|
||||
refresh();
|
||||
switch(getch())
|
||||
{
|
||||
case KEY_MOUSE:
|
||||
if(getmouse(&event) == OK && (event.bstate & BUTTON1_CLICKED))
|
||||
{
|
||||
if(event.y < 0 || event.y >= 21) {break;}
|
||||
if(event.x < 0 || event.x >= 21) {break;}
|
||||
*r = (event.y % 7 - 1) / 2 + 3 * (event.y / 7);
|
||||
*c = (event.x % 7 - 1) / 2 + 3 * (event.x / 7);
|
||||
if(((event.y % 7) - 1) % 2 != 0) {break;}
|
||||
if(((event.x % 7) - 1) % 2 != 0) {break;}
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
case 'k': /* FALLTHROUGH */
|
||||
case 'w': /* FALLTHROUGH */
|
||||
case KEY_UP:
|
||||
//*r = (((*r - 1) % 9) + 9) % 9;
|
||||
for(int i = 0; i < 9 + 1; i++)
|
||||
{
|
||||
*r = (*r + 9 - 1) % 9;
|
||||
if(P(*r, *c, *r)) {break;}
|
||||
}
|
||||
break;
|
||||
case 'h': /* FALLTHROUGH */
|
||||
case 'a': /* FALLTHROUGH */
|
||||
case KEY_LEFT:
|
||||
//*c = (((*c - 1) % 9) + 9) % 9;
|
||||
for(int i = 0; i < 9 + 1; i++)
|
||||
{
|
||||
*c = (*c + 9 - 1) % 9;
|
||||
if(P(*r, *c, *c)) {break;}
|
||||
}
|
||||
break;
|
||||
case 'j': /* FALLTHROUGH */
|
||||
case 's': /* FALLTHROUGH */
|
||||
case KEY_DOWN:
|
||||
//*r = (*r + 1) % 9;
|
||||
for(int i = 0; i < 9 + 1; i++)
|
||||
{
|
||||
*r = (*r + 1) % 9;
|
||||
if(P(*r, *c, *r)) {break;}
|
||||
}
|
||||
break;
|
||||
case 'l': /* FALLTHROUGH */
|
||||
case 'd': /* FALLTHROUGH */
|
||||
case KEY_RIGHT:
|
||||
//*c = (*c + 1) % 9;
|
||||
for(int i = 0; i < 9 + 1; i++)
|
||||
{
|
||||
*c = (*c + 1) % 9;
|
||||
if(P(*r, *c, *c)) {break;}
|
||||
}
|
||||
break;
|
||||
case ' ': /* FALLTHROUGH */
|
||||
case '\r': /* FALLTHROUGH */
|
||||
case KEY_ENTER:
|
||||
return 0;
|
||||
case ERR: /* FALLTHROUGH */
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
#undef P
|
||||
}
|
||||
|
||||
void ut_show(const struct ut_state *state, FILE *file, bool as_comment) {
|
||||
#define tiles state->tiles
|
||||
printf("Turn: %c\nPlay board: %d\n", (int)state->player, state->playBoard);
|
||||
|
@ -264,13 +393,54 @@ void getpos_net(const struct ut_state *state, int conn, FILE* conn_file, int *x,
|
|||
|
||||
void finish(int sig)
|
||||
{
|
||||
putchar('\n');
|
||||
// putchar('\n');
|
||||
endwin();
|
||||
// other cleanup
|
||||
exit(0);
|
||||
}
|
||||
|
||||
void ut_local_game(struct ut_state *state) {
|
||||
/*int main(int argc, char *argv[]) {
|
||||
signal(SIGINT, finish);
|
||||
initscr();
|
||||
keypad(stdscr, TRUE);
|
||||
nonl(); // \r instead of \r\n
|
||||
cbreak();
|
||||
noecho();
|
||||
mousemask(BUTTON1_CLICKED, NULL);
|
||||
|
||||
struct ut_state state = ut_initial;
|
||||
while (true) {
|
||||
int r, c, err;
|
||||
erase();
|
||||
ut_draw(&state);
|
||||
char w = ut_winner((char *)state.boards, 0, 3);
|
||||
if(w)
|
||||
{
|
||||
if(w == ' ')
|
||||
{
|
||||
mvaddstr(21, 0, "Draw!");
|
||||
}
|
||||
else
|
||||
{
|
||||
mvaddch(21, 0, w);
|
||||
mvaddstr(21, 1, " Wins!");
|
||||
}
|
||||
mvaddstr(22, 0, "Press any key to exit.");
|
||||
refresh();
|
||||
mousemask(0, NULL);
|
||||
getch();
|
||||
break;
|
||||
}
|
||||
err = ut_click(&state, &r, &c);
|
||||
if (err) {continue;}
|
||||
err = ut_move(&state, &state, r, c);
|
||||
if (err) {continue;}
|
||||
}
|
||||
finish(0);
|
||||
return 0;
|
||||
}*/
|
||||
|
||||
void ut_local_game(struct ut_state *state) { // TODO replace with from ncurses main
|
||||
int x, y;
|
||||
while (true) {
|
||||
ut_show(state, stdout, false);
|
||||
|
|
読み込み中…
新しいイシューから参照