post prefsChangedEvent before newGameOkEvent

This commit is contained in:
ehouse 2003-11-30 18:55:29 +00:00
parent 4eaae2bddf
commit 78ec0b9493

View file

@ -276,9 +276,16 @@ newGameHandleEvent( EventPtr event )
/* if we put up the prefs form from within this one and the user /* if we put up the prefs form from within this one and the user
clicked ok, we need to make sure the main form gets the clicked ok, we need to make sure the main form gets the
notification so it can make use of any changes. */ notification so it can make use of any changes. This event
if ( globals->isNewGame ) { needs to arrive before the newGame event so any changes will
be incorporated. */
if ( state->forwardChange ) {
eventToPost.eType = prefsChangedEvent;
EvtAddEventToQueue( &eventToPost );
state->forwardChange = false;
}
if ( globals->isNewGame ) {
updatePlayerInfo( globals ); updatePlayerInfo( globals );
eventToPost.eType = newGameOkEvent; eventToPost.eType = newGameOkEvent;
@ -290,12 +297,6 @@ newGameHandleEvent( EventPtr event )
updatePlayerInfo( globals ); updatePlayerInfo( globals );
} }
if ( state->forwardChange ) {
eventToPost.eType = prefsChangedEvent;
EvtAddEventToQueue( &eventToPost );
state->forwardChange = false;
}
unloadNewGameState( globals ); unloadNewGameState( globals );
FrmReturnToForm( 0 ); FrmReturnToForm( 0 );