Use first engine as default for second

Rather than having the same fixed default for both engines, we noww only
have a fixed default for the first, and use the actual first as default
for the second. One advantage is that this guarantees the second engine
plays the same variants as the first by default.

diff --git a/args.h b/args.h
index 48cb3d7..29308b5 100644 (file)
--- a/args.h
+++ b/args.h
@@ -1395,6 +1395,8 @@ InitAppData(char *lpCmdLine)
      appData.NrRanks > BOARD_RANKS   )
       DisplayFatalError("Recompile with BOARD_RANKS or BOARD_FILES, to support this size", 0, 2);
 
+  if(!*appData.secondChessProgram) { ASSIGN(appData.secondChessProgram, appData.firstChessProgram); } // [HGM] scp defaults to fcp
+
   /* [HGM] After parsing the options from the .ini file, and overruling them
    * with options from the command line, we now make an even higher priority
    * overrule by WB options attached to the engine command line. This so that

diff --git a/gtk/xboard.h b/gtk/xboard.h
index 7a7d36f..ca8968e 100644 (file)
--- a/gtk/xboard.h
+++ b/gtk/xboard.h
@@ -119,7 +119,7 @@ typedef struct {
 #define BORDER_X_OFFSET 3
 #define BORDER_Y_OFFSET 27
 #define FIRST_CHESS_PROGRAM    "fairymax"
-#define SECOND_CHESS_PROGRAM   "fairymax"
+#define SECOND_CHESS_PROGRAM   ""
 #define FIRST_DIRECTORY         "."
 #define SECOND_DIRECTORY        "."
 #define SOUND_BELL              ""

diff --git a/xaw/xboard.h b/xaw/xboard.h
index 95fec39..bcfafb2 100644 (file)
--- a/xaw/xboard.h
+++ b/xaw/xboard.h
@@ -119,7 +119,7 @@ typedef struct {
 #define BORDER_X_OFFSET 3
 #define BORDER_Y_OFFSET 27
 #define FIRST_CHESS_PROGRAM    "fairymax"
-#define SECOND_CHESS_PROGRAM   "fairymax"
+#define SECOND_CHESS_PROGRAM   ""
 #define FIRST_DIRECTORY         "."
 #define SECOND_DIRECTORY        "."
 #define SOUND_BELL              ""

diff --git a/xboard.conf.in b/xboard.conf.in
index 74190e9..8ac0122 100644 (file)
--- a/xboard.conf.in
+++ b/xboard.conf.in
@@ -70,7 +70,6 @@
 ; Engines & adjudicatons in engine-engine games
 ;
 -firstChessProgram fairymax
--secondChessProgram fairymax
 -firstChessProgramNames {fairymax
 "Fruit 2.1" -fcp fruit -fUCI
 "Crafty" -fcp crafty