WebSVN – Games.Chess Giants – Diff – /chessengine.cpp

    // could the init file be opened ?
    if (fp != NULL)
+   {
       Debug_Log (L"===Found initialization file, parsing...===\n");
-      // SMP HACK -- is our engine Crafty ? if so, set the max CPUs to use to core max - 1
+      // SMP HACK -- is our engine Crafty or GNU Chess ? if so, set the max CPUs to use to core max - 1
       // (the computer will look like hung if all CPU is taken)
-      if (wcsistr (options.engine.name, L"Crafty") != NULL)
+      if ((wcsistr (options.engine.name, L"Crafty") != NULL) || (wcsistr (options.engine.name, L"GNU Chess") != NULL))
+      {
          GetSystemInfo (&sysinfo); // get the number of cores and build the corresponding engine initialization order
-         swprintf_s (widechar_buffer, WCHAR_SIZEOF (widechar_buffer), L"mt %d\n", max (1, sysinfo.dwNumberOfProcessors - 1));
+         Player_SendBuffer_Add (player, 1000, L"mt %d\n", max (1, sysinfo.dwNumberOfProcessors - 1));
-         Player_SendBuffer_Add (player, 1000, widechar_buffer);
+      }
       // read line per line
       while (fgetws (widechar_buffer, WCHAR_SIZEOF (widechar_buffer), fp) != NULL)
+      {
    unsigned long exit_code;
    unsigned long handle_flags;
    int attempt_index;
    // send the engine a quit command
-   Player_SendBuffer_Add (player, 1000, L"%s\n", options.engine.command_quit);
+   Player_SendBuffer_Add (player, 1000, options.engine.command_quit);
+   Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
    PlayerEngine_Send (player);
    // close the pipe handles
    if (hChessEngineStdinRd)
       CloseHandle (hChessEngineStdinRd);
       // is it NOT a hint, are blunders allowed, should we do one now AND can we do one now ?
       if (!is_hint && (options.engine.blunder_chances > 0) && (rand () % 100 < options.engine.blunder_chances)
           && Move_FindRandomMove (&the_board.moves[the_board.move_count - 1], player->color, &move))
+      {
-         Player_SendBuffer_Add (player, 1000, L"%s %s\n", options.engine.command_force, Move_BuildString (&move)); // send the blunderous move to the engine
+         Player_SendBuffer_Add (player, 1000, options.engine.command_force, Move_BuildString (&move)); // send the blunderous move to the engine
+         Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
+         if (wcscmp (options.engine.program, L"Crafty") == 0)
-         Player_SendBuffer_Add (player, 1000, L"disp\n");
+            Player_SendBuffer_Add (player, 1000, L"disp\n");
          Debug_Log (L"===Discarding engine move, forcing a blunderous move (%s) instead===\n", Move_BuildString (&move)); // blunder
+      }
       // mark the engine's selected and hovered squares
       Board_SetSelectedAndHovered (&the_board, move.source[0], move.source[1], move.target[0], move.target[1]);
    if (the_board.was_setup)
+   {
       Debug_Log (L"===Got board setup notification from interface===\n");
       // send a new game command to the chess engine
-      Player_SendBuffer_Add (player, 1000, L"%s\n", options.engine.command_new);
+      Player_SendBuffer_Add (player, 1000, options.engine.command_new);
+      Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
       // just set up the board from its Forsyth-Edwards notation
       Debug_Log (L"===setting up board using FEN string===\n");
       // instruct it about its allowed search depth BEFORE each table set (this ensures engine will be "ready" to handle the command)
       // then get the current game state in FEN format and feed it to the engine
-      Player_SendBuffer_Add (player, 1000, L"%s %d\n", options.engine.command_sd, options.engine.depth);
+      Player_SendBuffer_Add (player, 1000, options.engine.command_sd, options.engine.depth);
+      Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
-      Player_SendBuffer_Add (player, 1000, L"%s %s\n", options.engine.command_setboard, the_board.moves[the_board.move_count - 1].fen_string);
+      Player_SendBuffer_Add (player, 1000, options.engine.command_setboard, the_board.moves[the_board.move_count - 1].fen_string);
+      Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
       // and reset current obstinacy
       current_obstinacy = 0;
+      if (wcscmp (options.engine.program, L"Crafty") == 0)
-      Player_SendBuffer_Add (player, 1000, L"disp\n");
+         Player_SendBuffer_Add (player, 1000, L"disp\n");
+   }
    // have we been notified that players are swapping colors ? (N.B. when this happens in human vs. computer mode, it's always that the human player is *GIVING* his turn)
    if (the_board.want_playerswap)
+   {
       Debug_Log (L"===Got player SWAP notification from interface===\n");
-      Player_SendBuffer_Add (player, 1000, L"%s\n", options.engine.command_go); // tell engine it's now the current player
+      Player_SendBuffer_Add (player, 1000, options.engine.command_go); // tell engine it's now the current player
+      Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
+   }
    // have we been notified that the current player just changed ?
    if (the_board.has_playerchanged)
+   {
       if (Board_ColorToMove (&the_board) == player->color)
+      {
          // is it NOT a board setup AND has at least one move been played (meaning it was just the other's turn before) ?
          if (!the_board.was_setup && (the_board.move_count > 1))
+         {
-            Debug_Log (L"===Player just played, sending Crafty the chosen move===\n");
+            Debug_Log (L"===Player just played, sending the chosen move to engine===\n");
+            if (wcscmp (options.engine.program, L"Crafty") == 0)
-            Player_SendBuffer_Add (player, 1000, L"disp\n");
+               Player_SendBuffer_Add (player, 1000, L"disp\n");
             // instruct it about its allowed search depth BEFORE each move (this ensures engine will be "ready" to handle the command)
             // then build the move string, and send the move string to the engine
-            Player_SendBuffer_Add (player, 1000, L"%s %d\n", options.engine.command_sd, options.engine.depth);
+            Player_SendBuffer_Add (player, 1000, options.engine.command_sd, options.engine.depth);
+            Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
-            Player_SendBuffer_Add (player, 1000, L"%s\n", Move_BuildString (&the_board.moves[the_board.move_count - 1]));
+            Player_SendBuffer_Add (player, 1000, Move_BuildString (&the_board.moves[the_board.move_count - 1]));
+            Player_SendBuffer_Add (player, 1000, L"\n"); // end the send buffer with a carriage return
+         }
          // else game has not started yet, but it's our turn
          else
+         {
-            Player_SendBuffer_Add (player, 1000, L"%s\n", options.engine.command_go); // so let's start the game
+            Player_SendBuffer_Add (player, 1000, options.engine.command_go); // so let's start the game
+            Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
+         }
+      }
+   }
    // END NOTIFICATIONS PROCESSING
    ///////////////////////////////
+   {
       // does our opponent want a hint ?
       if (current_player->wants_hint)
+      {
          current_player->wants_hint = false; // don't ask twice
-         Debug_Log (L"===Hint requested, asking Crafty for it===\n");
+         Debug_Log (L"===Hint requested, asking engine for it===\n");
-         Player_SendBuffer_Add (player, 1000, L"%s\n", options.engine.command_hint); // ask for a hint
+         Player_SendBuffer_Add (player, 1000, options.engine.command_hint); // ask for a hint
+         Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
+      }
       // does our opponent want to cancel a move ?
       if (current_player->wants_cancel)
+      {
          current_player->wants_cancel = false; // don't ask twice (remember now before we switch players)
-         Debug_Log (L"===Move cancellation requested, rebuilding board and telling Crafty to backup 2 moves===\n");
+         Debug_Log (L"===Move cancellation requested, rebuilding board and telling engine to backup 2 moves===\n");
          // rewind game 2 moves back
          the_board.moves = (boardmove_t *) SAFE_realloc (the_board.moves, the_board.move_count, max (1, the_board.move_count - 2), sizeof (boardmove_t), false);
          the_board.move_count = max (1, the_board.move_count - 2); // figure out how many moves we have now
          the_board.viewed_move = the_board.move_count - 1; // take us back to the last move
          // just set up the board from its Forsyth-Edwards notation
          Debug_Log (L"===setting up board using FEN string===\n");
          // instruct it about its allowed search depth BEFORE each table set (this ensures engine will be "ready" to handle the command)
          // then get the current game state in FEN format and feed it to the engine
-         Player_SendBuffer_Add (player, 1000, L"%s %d\n", options.engine.command_sd, options.engine.depth);
+         Player_SendBuffer_Add (player, 1000, options.engine.command_sd, options.engine.depth);
+         Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
-         Player_SendBuffer_Add (player, 1000, L"%s %s\n", options.engine.command_setboard, the_board.moves[the_board.move_count - 1].fen_string);
+         Player_SendBuffer_Add (player, 1000, options.engine.command_setboard, the_board.moves[the_board.move_count - 1].fen_string);
+         Player_SendBuffer_Add (player, 1000, L"\n"); // since the format string was read from the options, don't forget to end it with a carriage return
+         if (wcscmp (options.engine.program, L"Crafty") == 0)
-         Player_SendBuffer_Add (player, 1000, L"disp\n");
+            Player_SendBuffer_Add (player, 1000, L"disp\n");
          do_update = true; // remember to update the 3D scene
+      }
+   }

Subversion Repositories Games.Chess Giants

Games.Chess Giants/chessengine.cpp – Rev 33 → 39