src/game.c

changeset 49
02c509a44e98
parent 48
0cedda2544da
child 50
41017d0a72c5
     1.1 --- a/src/game.c	Wed Jun 11 15:38:01 2014 +0200
     1.2 +++ b/src/game.c	Wed Jun 11 16:54:20 2014 +0200
     1.3 @@ -123,29 +123,9 @@
     1.4          }
     1.5  
     1.6          if (logelem) {
     1.7 -            Move move = logelem->move;
     1.8 -            if ((move.piece&PIECE_MASK) == KING &&
     1.9 -                abs(move.tofile-move.fromfile) == 2) {
    1.10 -                addstr(move.tofile==fileidx('c')?"O-O-O":"O-O");
    1.11 -            } else {
    1.12 -                char logstr[] = {
    1.13 -                    getpiecechr(move.piece),
    1.14 -                    filechr(move.fromfile), rowchr(move.fromrow),
    1.15 -                    move.capture ? 'x':'\0',
    1.16 -                    filechr(move.tofile), rowchr(move.torow),
    1.17 -                    move.check ? '+' : (move.promotion ? '=' : '\0'),
    1.18 -                    move.promotion ? getpiecechr(move.promotion) : '\0'
    1.19 -                };
    1.20 -                for (int stri = 0 ; stri < sizeof(logstr) ; stri++) {
    1.21 -                    if (logstr[stri]) {
    1.22 -                        addch(logstr[stri]);
    1.23 -                    }
    1.24 -                }
    1.25 -            }
    1.26 +            addstr(logelem->move.string);
    1.27              if (!logelem->next) {
    1.28 -                if (gamestate->checkmate) {
    1.29 -                    addstr("\b#");
    1.30 -                } else if (gamestate->stalemate) {
    1.31 +                if (gamestate->stalemate) {
    1.32                      addstr(" stalemate");
    1.33                  }
    1.34              }
    1.35 @@ -311,7 +291,8 @@
    1.36                  int eval_result = eval_move(gamestate, movestr, &move);
    1.37                  switch (eval_result) {
    1.38                  case VALID_MOVE_SYNTAX:
    1.39 -                    net_send_data(opponent, NETCODE_MOVE, &move, sizeof(Move));
    1.40 +                    net_send_data(opponent, NETCODE_MOVE, &move,
    1.41 +                        sizeof(Move)-8);
    1.42                      code = net_recieve_code(opponent);
    1.43                      move.check = code == NETCODE_CHECK ||
    1.44                          code == NETCODE_CHECKMATE;
    1.45 @@ -407,7 +388,7 @@
    1.46                  }
    1.47                  break;
    1.48              case NETCODE_MOVE:
    1.49 -                net_recieve_data(opponent, &move, sizeof(Move));
    1.50 +                net_recieve_data(opponent, &move, sizeof(Move)-8);
    1.51                  code = validate_move(gamestate, &move);
    1.52                  if (code == VALID_MOVE_SEMANTICS) {
    1.53                      apply_move(gamestate, &move);

mercurial