Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix double-start of new game

Browse source
This commit is contained in:
ehouse 2003-12-09 05:18:47 +00:00
parent d0d75307d6
commit 5e53ed901a
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wince/cemain.c
View file

@ -584,8 +584,9 @@ InitInstance(HINSTANCE hInstance, int nCmdShow)
TCHAR szWindowClass[MAX_LOADSTRING]; // The window class name
CEAppGlobals* globals;
BOOL result = TRUE;
XP_Bool loaded;
XP_Bool oldGameLoaded;
XP_Bool prevStateExists;
XP_Bool newDone = XP_FALSE;
MPSLOT;
#ifdef MEM_DEBUG
@ -630,7 +631,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow)
But that's a long ways off. */
prevStateExists = ceLoadPrefs( globals );
if ( result && prevStateExists && ceLoadSavedGame( globals ) ) {
loaded = XP_TRUE;
oldGameLoaded = XP_TRUE;
/* nothing to do? */
} else {
ceInitPrefs( globals );
@ -639,12 +640,13 @@ InitInstance(HINSTANCE hInstance, int nCmdShow)
&globals->util, globals->draw, &globals->appPrefs.cp,
(TransportSend)NULL, globals );
if ( result
&& !doNewGame( globals, XP_TRUE ) ) { /* calls ceInitAndStartBoard */
result = FALSE;
/* we want to exit now! */
if ( result ) {
newDone = doNewGame( globals, XP_TRUE ); /* calls ceInitAndStartBoard */
if ( !newDone ) {
result = FALSE;
}
}
loaded = XP_FALSE;
oldGameLoaded = XP_FALSE;
}
ShowWindow(hWnd, nCmdShow);
@ -653,8 +655,8 @@ InitInstance(HINSTANCE hInstance, int nCmdShow)
CommandBar_Show(globals->hwndCB, TRUE);
}
if ( result ) {
ceInitAndStartBoard( globals, !loaded, NULL );
if ( result && !newDone ) {
ceInitAndStartBoard( globals, !oldGameLoaded, NULL );
}
return result;
@ -1553,6 +1555,7 @@ ce_util_userPickTile( XW_UtilCtxt* uc, PickInfo* pi,
CEAppGlobals* globals = (CEAppGlobals*)uc->closure;
XP_MEMSET( &state, 0, sizeof(state) );
state.globals = globals;
state.texts = texts;
state.nTiles = nTiles;
state.playerNum = playerNum;