terminal-chess: comparison src/game.c

-:41bbfd4d17a3
+:824c9522ce66
 #include <ncurses.h>
 #include <string.h>
 static const uint8_t boardx = 10, boardy = 10;
-static void draw_board(Board board, MoveListRoot *movelist, uint8_t mycolor) {
+static void draw_board(GameState *gamestate) {
 for (uint8_t y = 0 ; y < 8 ; y++) {
 for (uint8_t x = 0 ; x < 8 ; x++) {
-uint8_t col = board[y][x] & COLOR_MASK;
+uint8_t col = gamestate->board[y][x] & COLOR_MASK;
-uint8_t piece = board[y][x] & PIECE_MASK;
+uint8_t piece = gamestate->board[y][x] & PIECE_MASK;
 char piecec;
 if (piece) {
 piecec = piece == PAWN ? 'P' : getpiecechr(piece);
 } else {
 piecec = ' ';
 }
 attrset((col == WHITE ? A_BOLD : A_DIM) |
 COLOR_PAIR((y&1)==(x&1) ? COL_WB : COL_BW));
-int cy = mycolor == WHITE ? boardy-y : boardy-7+y;
+int cy = gamestate->mycolor == WHITE ? boardy-y : boardy-7+y;
-int cx = mycolor == WHITE ? boardx+x*3 : boardx+21-x*3;
+int cx = gamestate->mycolor == WHITE ? boardx+x*3 : boardx+21-x*3;
 mvaddch(cy, cx, ' ');
 mvaddch(cy, cx+1, piecec);
 mvaddch(cy, cx+2, ' ');
 }
 }
 attrset(A_NORMAL);
 for (uint8_t i = 0 ; i < 8 ; i++) {
-int x = mycolor == WHITE ? boardx+i*3+1 : boardx+22-i*3;
+int x = gamestate->mycolor == WHITE ? boardx+i*3+1 : boardx+22-i*3;
-int y = mycolor == WHITE ? boardy-i : boardy-7+i;
+int y = gamestate->mycolor == WHITE ? boardy-i : boardy-7+i;
 mvaddch(boardy+1, x, 'a'+i);
 mvaddch(y, boardx-2, '1'+i);
 }
 /* move log */
 // TODO: introduce window to avoid bugs with a long move log
 uint8_t logy = 0;
 const uint8_t logx = boardx + 30;
 int logi = 1;
-MoveList *logelem = movelist->first;
+MoveList *logelem = gamestate->movelist;
 while (logelem) {
 logi++;
 if (logi % 2 == 0) {
 if ((logi - 2) % 4 == 0) {
 logy++;
-wmove(tchess_window, logy, logx);
+move(logy, logx);
 }
 printw("%d. ", logi / 2);
 }
 if (logelem) {
 }
 }
 }
-static int sendmove(Board board, MoveListRoot *movelist,
+static int sendmove(GameState *gamestate, int opponent) {
-uint8_t mycolor, int opponent) {
 const size_t buflen = 8;
 char movestr[buflen];
 _Bool remisrejected = FALSE;
 uint8_t code;
-int inputy = getmaxy(tchess_window) - 6;
+int inputy = getmaxy(stdscr) - 6;
 while (1) {
 move(inputy, 0);
 if (remisrejected) {
 printw(
 "Use chess notation to enter your move.\n"
 remisrejected = TRUE;
 }
 }
 } else {
 Move move;
-int eval_result = eval_move(board, mycolor, movestr, &move);
+int eval_result = eval_move(gamestate, movestr, &move);
 switch (eval_result) {
 case VALID_MOVE_SYNTAX:
 net_send_data(opponent, NETCODE_MOVE, &move, sizeof(Move));
 code = net_recieve_code(opponent);
 move.check = code == NETCODE_CHECK;
 move.checkmate = code == NETCODE_CHECKMATE;
 if (code == NETCODE_DECLINE) {
 printw("Invalid move.");
 } else {
-apply_move(board, &move);
+apply_move(gamestate, &move);
-addmove(movelist, &move);
 if (move.checkmate) {
 printw("Checkmate!");
 clrtoeol();
 return 1;
 } else {
 clrtoeol();
 }
 }
 }
-static int recvmove(Board board, MoveListRoot *movelist, int opponent) {
+static int recvmove(GameState *gamestate, int opponent) {
-int inputy = getmaxy(tchess_window) - 6;
+int inputy = getmaxy(stdscr) - 6;
 while (1) {
 move(inputy, 0);
 printw("Awaiting opponent move...");
 clrtoeol();
 refresh();
 net_send_code(opponent, NETCODE_DECLINE);
 }
 break;
 case NETCODE_MOVE:
 net_recieve_data(opponent, &move, sizeof(Move));
-if (validate_move(board, &move)) {
+if (validate_move(gamestate, &move)) {
-apply_move(board, &move);
+apply_move(gamestate, &move);
-addmove(movelist, &move);
 if (move.check) {
 net_send_code(opponent, NETCODE_CHECK);
 } else if (move.checkmate) {
 net_send_code(opponent, NETCODE_CHECKMATE);
 } else {
 }
 }
 }
 }
-void freemovelist(MoveListRoot* list) {
-MoveList *elem;
-elem = list->first;
-while (elem) {
-MoveList *cur = elem;
-elem = elem->next;
-free(cur);
-};
-free(list);
-}
-void addmove(MoveListRoot* list, Move *move) {
-MoveList *elem = malloc(sizeof(MoveList));
-elem->next = NULL;
-elem->move = *move;
-if (list->last) {
-list->last->next = elem;
-list->last = elem;
-} else {
-list->first = list->last = elem;
-}
-}
 void game_start(Settings *settings, int opponent) {
 _Bool myturn = is_server(settings) ==
 (settings->gameinfo.servercolor == WHITE);
-uint8_t mycolor = myturn ? WHITE:BLACK;
+GameState gamestate;
-_Bool running;
+Board initboard = {
-MoveListRoot* movelist = calloc(1, sizeof(MoveListRoot));
-Board board = {
 {WROOK, WKNIGHT, WBISHOP, WQUEEN, WKING, WBISHOP, WKNIGHT, WROOK},
 {WPAWN, WPAWN,   WPAWN,   WPAWN,  WPAWN, WPAWN,   WPAWN,   WPAWN},
 {0,     0,       0,       0,      0,     0,       0,       0},
 {0,     0,       0,       0,      0,     0,       0,       0},
 {0,     0,       0,       0,      0,     0,       0,       0},
 {0,     0,       0,       0,      0,     0,       0,       0},
 {BPAWN, BPAWN,   BPAWN,   BPAWN,  BPAWN, BPAWN,   BPAWN,   BPAWN},
 {BROOK, BKNIGHT, BBISHOP, BQUEEN, BKING, BBISHOP, BKNIGHT, BROOK}
 };
+memcpy(gamestate.board, initboard, sizeof(Board));
+gamestate.mycolor = myturn ? WHITE:BLACK;
+gamestate.movelist = gamestate.lastmove = NULL;
+_Bool running;
 do {
 clear();
-draw_board(board, movelist, mycolor);
+draw_board(&gamestate);
 if (myturn) {
-running = !sendmove(board, movelist, mycolor, opponent);
+running = !sendmove(&gamestate, opponent);
 } else {
-running = !recvmove(board, movelist, opponent);
+running = !recvmove(&gamestate, opponent);
 flushinp(); // flush any input the user hacked in while waiting
 }
 myturn ^= TRUE;
 }  while (running);
-freemovelist(movelist);
+gamestate_cleanup(&gamestate);
-mvaddstr(getmaxy(tchess_window)-1, 0,
+mvaddstr(getmaxy(stdscr)-1, 0,
 "Game has ended. Press any key to leave...");
 getch();
 }

Mercurial > hg > terminal-chess / file comparison

comparison: src/game.c

src/game.c