Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-01 19:57:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix calling dup mode stuff without a test

Browse source
This commit is contained in:
Eric House 2024-02-18 18:33:09 -08:00
parent f716768a71
commit b95c86e4e3
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/common/server.c
View file

@ -262,6 +262,7 @@ static void dupe_transmitPause( ServerCtxt* server, XWEnv xwe, DupPauseType typ,
XP_U16 turn, const XP_UCHAR* msg, XP_U16 turn, const XP_UCHAR* msg,
XP_S16 skipDev ); XP_S16 skipDev );
static void dupe_resetTimer( ServerCtxt* server, XWEnv xwe ); static void dupe_resetTimer( ServerCtxt* server, XWEnv xwe );
static void resetDupeTimerIf( ServerCtxt* server, XWEnv xwe );
static XP_Bool setDupCheckTimer( ServerCtxt* server, XWEnv xwe ); static XP_Bool setDupCheckTimer( ServerCtxt* server, XWEnv xwe );
static void sortTilesIf( ServerCtxt* server, XP_S16 turn ); static void sortTilesIf( ServerCtxt* server, XP_S16 turn );
@ -1421,6 +1422,14 @@ setDupTimerExpires( ServerCtxt* server, XWEnv xwe, XP_S32 newVal )
} }
} }
static void
resetDupeTimerIf( ServerCtxt* server, XWEnv xwe )
{
if ( inDuplicateMode( server ) ) {
dupe_resetTimer( server, xwe );
}
}
static void static void
dupe_resetTimer( ServerCtxt* server, XWEnv xwe ) dupe_resetTimer( ServerCtxt* server, XWEnv xwe )
{ {
@ -1957,9 +1966,7 @@ server_do( ServerCtxt* server, XWEnv xwe )
if ( assignTilesToAll( server, xwe ) ) { if ( assignTilesToAll( server, xwe ) ) {
SETSTATE( server, XWSTATE_INTURN ); SETSTATE( server, XWSTATE_INTURN );
setTurn( server, xwe, 0 ); setTurn( server, xwe, 0 );
if ( inDuplicateMode( server ) ) { resetDupeTimerIf( server, xwe );
dupe_resetTimer( server, xwe );
}
moreToDo = XP_TRUE; moreToDo = XP_TRUE;
} }
} }
@ -2327,7 +2334,7 @@ client_readInitialMessage( ServerCtxt* server, XWEnv xwe, XWStreamCtxt* stream )
players */ players */
informMissing( server, xwe ); informMissing( server, xwe );
setTurn( server, xwe, 0 ); setTurn( server, xwe, 0 );
dupe_resetTimer( server, xwe ); resetDupeTimerIf( server, xwe );
} }
return accepted; return accepted;
} /* client_readInitialMessage */ } /* client_readInitialMessage */
@ -2421,7 +2428,7 @@ sendInitialMessage( ServerCtxt* server, XWEnv xwe )
non-initial messages will have a non-0 connID. */ non-initial messages will have a non-0 connID. */
comms_setConnID( server->vol.comms, gameID, streamVersion ); comms_setConnID( server->vol.comms, gameID, streamVersion );
dupe_resetTimer( server, xwe ); resetDupeTimerIf( server, xwe );
} /* sendInitialMessage */ } /* sendInitialMessage */
static void static void