From 42717e8c18ad8b608ab695be0ca99869f5565d0f Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sat, 9 Nov 2013 17:56:06 +0100 Subject: [PATCH] Refactor InputCommand, removing last need for NOT_CURSES macro. --- gnushogi/commondsp.c | 21 +++++++-------------- gnushogi/gnushogi.h | 2 -- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/gnushogi/commondsp.c b/gnushogi/commondsp.c index 422dab6..ca7c482 100644 --- a/gnushogi/commondsp.c +++ b/gnushogi/commondsp.c @@ -1529,15 +1529,13 @@ SetMachineTime(char *s) * Process the user's command. If easy mode is OFF (the computer is thinking * on opponents time) and the program is out of book, then make the 'hint' * move on the board and call SelectMove() to find a response. The user - * terminates the search by entering ^C (quit siqnal) before entering a - * command. If the opponent does not make the hint move, then set Sdepth to - * zero. + * terminates the search by entering a command. If the opponent does not make + * the hint move, then set Sdepth to zero. */ void InputCommand(char *command) { - int eof = 0; short have_shown_prompt = false; short ok, done, is_move = false; unsigned short mv; @@ -1631,21 +1629,16 @@ InputCommand(char *command) #endif /* QUIETBACKGROUND */ if (command == NULL) { - if (NOT_CURSES) - s[0] = '\0'; - - eof = dsp->GetString(sx); + int eof = dsp->GetString(sx); + if (eof) + dsp->ExitShogi(); } else { strcpy(sx, command); done = true; } - sscanf(sx, "%s", s); - - if (eof) - dsp->ExitShogi(); - - if (s[0] == '\0') + /* extract first word */ + if (sscanf(sx, "%s", s) < 1) continue; if (strcmp(s, "bd") == 0) /* bd -- display board */ diff --git a/gnushogi/gnushogi.h b/gnushogi/gnushogi.h index bbefe5f..fb9d849 100644 --- a/gnushogi/gnushogi.h +++ b/gnushogi/gnushogi.h @@ -59,8 +59,6 @@ typedef enum { extern display_t display_type; #define XSHOGI (display_type == DISPLAY_X) -#define NOT_CURSES ((display_type == DISPLAY_X) \ - || (display_type == DISPLAY_RAW)) /* Miscellaneous globals. */ -- 1.7.0.4