From 7219206214c441dfb3e8359e85c5864c48983aff Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Wed, 3 Jan 2024 17:40:43 -0800
Subject: [PATCH] get rid of ancient ifdef

---
 xwords4/common/comms.c    | 15 ++-------------
 xwords4/common/comms.h    |  6 +-----
 xwords4/common/game.c     |  6 ------
 xwords4/common/game.h     |  6 +-----
 xwords4/linux/Makefile    |  1 -
 xwords4/linux/linuxmain.c |  6 +-----
 6 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c
index ea5ec7eb5..c7ff42df0 100644
--- a/xwords4/common/comms.c
+++ b/xwords4/common/comms.c
@@ -475,11 +475,7 @@ comms_make( MPFORMAL XWEnv xwe, XW_UtilCtxt* util, XP_Bool isServer,
             XP_U16 nPlayersHere, XP_U16 nPlayersTotal,
             RoleChangeProc rcp, void* rcClosure,
 #endif
-            XP_U16 forceChannel
-#ifdef SET_GAMESEED
-            , XP_U16 gameSeed
-#endif
-            )
+            XP_U16 forceChannel )
 {
     CommsCtxt* comms = (CommsCtxt*)XP_CALLOC( mpool, sizeof(*comms) );
     comms->util = util;
@@ -508,9 +504,6 @@ comms_make( MPFORMAL XWEnv xwe, XW_UtilCtxt* util, XP_Bool isServer,
     comms->rcClosure = rcClosure;
 
     init_relay( comms, xwe, nPlayersHere, nPlayersTotal );
-# ifdef SET_GAMESEED
-    comms->channelSeed = gameSeed;
-# endif
 #endif
 
     if ( !!selfAddr ) {
@@ -837,11 +830,7 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
 #ifdef XWFEATURE_RELAY
                                    nPlayersHere, nPlayersTotal, rcp, rcClosure,
 #endif
-                                   forceChannel
-#ifdef SET_GAMESEED
-                                   , 0
-#endif
-                                   );
+                                   forceChannel );
 #ifndef XWFEATURE_RELAY
     XP_USE( nPlayersHere );
     XP_USE( nPlayersTotal );
diff --git a/xwords4/common/comms.h b/xwords4/common/comms.h
index 02cc22353..b860e6724 100644
--- a/xwords4/common/comms.h
+++ b/xwords4/common/comms.h
@@ -155,11 +155,7 @@ CommsCtxt* comms_make( MPFORMAL XWEnv xwe, XW_UtilCtxt* util,
                        XP_U16 nPlayersHere, XP_U16 nPlayersTotal,
                        RoleChangeProc rcp, void* rcClosure,
 #endif
-                       XP_U16 forceChannel
-#ifdef SET_GAMESEED
-                       ,XP_U16 gameSeed
-#endif
-                       );
+                       XP_U16 forceChannel );
 
 void comms_resetSame( CommsCtxt* comms, XWEnv xwe );
 
diff --git a/xwords4/common/game.c b/xwords4/common/game.c
index 80e006943..129beafeb 100644
--- a/xwords4/common/game.c
+++ b/xwords4/common/game.c
@@ -162,9 +162,6 @@ game_makeNewGame( MPFORMAL XWEnv xwe, XWGame* game, CurGameInfo* gi,
                   XW_UtilCtxt* util,
                   DrawCtx* draw, const CommonPrefs* cp,
                   const TransportProcs* procs
-#ifdef SET_GAMESEED
-                  ,XP_U16 gameSeed 
-#endif
                   )
 {
     XP_ASSERT( gi == util->gameInfo ); /* if holds, remove gi param */
@@ -204,9 +201,6 @@ game_makeNewGame( MPFORMAL XWEnv xwe, XWGame* game, CurGameInfo* gi,
                                       onRoleChanged, game,
 #endif
                                       gi->forceChannel
-#ifdef SET_GAMESEED
-                                      , gameSeed
-#endif
                                       );
         } else {
             game->comms = (CommsCtxt*)NULL;
diff --git a/xwords4/common/game.h b/xwords4/common/game.h
index 8db4d2515..23abbb001 100644
--- a/xwords4/common/game.h
+++ b/xwords4/common/game.h
@@ -81,11 +81,7 @@ typedef struct _XWGame {
 XP_Bool game_makeNewGame( MPFORMAL XWEnv xwe, XWGame* game, CurGameInfo* gi,
                           const CommsAddrRec* selfAddr, const CommsAddrRec* hostAddr,
                           XW_UtilCtxt* util, DrawCtx* draw, const CommonPrefs* cp,
-                          const TransportProcs* procs
-#ifdef SET_GAMESEED
-                          ,XP_U16 gameSeed
-#endif
-                          );
+                          const TransportProcs* procs );
 
 XP_Bool game_makeRematch( const XWGame* game, XWEnv xwe, XW_UtilCtxt* util,
                           const CommonPrefs* cp, const TransportProcs* procs,
diff --git a/xwords4/linux/Makefile b/xwords4/linux/Makefile
index 7e2bdd931..337d45d5e 100644
--- a/xwords4/linux/Makefile
+++ b/xwords4/linux/Makefile
@@ -106,7 +106,6 @@ DEFINES += -DXWFEATURE_RAISETILE
 DEFINES += -DXWFEATURE_CROSSHAIRS
 DEFINES += -DXWFEATURE_CHAT
 DEFINES += -DDISABLE_TILE_SEL
-# DEFINES += -DSET_GAMESEED
 DEFINES += -DTEXT_MODEL
 DEFINES += -DXWFEATURE_WALKDICT
 DEFINES += -DXWFEATURE_TESTPATSTR
diff --git a/xwords4/linux/linuxmain.c b/xwords4/linux/linuxmain.c
index 71f7ca65e..30dd3231f 100644
--- a/xwords4/linux/linuxmain.c
+++ b/xwords4/linux/linuxmain.c
@@ -202,11 +202,7 @@ linuxOpenGame( CommonGlobals* cGlobals )
         }
         game_makeNewGame( MEMPOOL NULL_XWE, &cGlobals->game, cGlobals->gi,
                           &cGlobals->selfAddr, hostAddr, cGlobals->util,
-                          cGlobals->draw, &cGlobals->cp, &cGlobals->procs
-#ifdef SET_GAMESEED
-                          , params->gameSeed
-#endif
-                          );
+                          cGlobals->draw, &cGlobals->cp, &cGlobals->procs );
 #ifdef XWFEATURE_RELAY
         bool savedGame = false;
 #endif