Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

get rid of ancient ifdef

Browse source
This commit is contained in:
Eric House 2024-01-03 17:40:43 -08:00
parent c68050e190
commit 7219206214
6 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/common/comms.c
View file

@ -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 );

6
xwords4/common/comms.h
View file

@ -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 );

6
xwords4/common/game.c
View file

@ -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;

6
xwords4/common/game.h
View file

@ -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,

1
xwords4/linux/Makefile
View file

@ -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

6
xwords4/linux/linuxmain.c
View file

@ -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