mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-18 22:26:30 +01:00
apply human-count test when hiding tray when quitting. No replaces
Cancel.
This commit is contained in:
parent
eff5ed5fc6
commit
8a4ebebe5a
1 changed files with 4 additions and 3 deletions
|
@ -1429,6 +1429,7 @@ eventLoop( PalmAppGlobals* globals )
|
||||||
&& !!globals->game.board ) {
|
&& !!globals->game.board ) {
|
||||||
if ( !globals->menuIsDown /* hi Marcus :-) */
|
if ( !globals->menuIsDown /* hi Marcus :-) */
|
||||||
&& closeNonMainForms(globals)
|
&& closeNonMainForms(globals)
|
||||||
|
&& gi_countHumans( &globals->gameInfo ) > 1
|
||||||
&& board_hideTray( globals->game.board ) ) {
|
&& board_hideTray( globals->game.board ) ) {
|
||||||
board_draw( globals->game.board );
|
board_draw( globals->game.board );
|
||||||
}
|
}
|
||||||
|
@ -2278,8 +2279,8 @@ mainViewHandleEvent( EventPtr event )
|
||||||
case XW_FINISH_PULLDOWN_ID:
|
case XW_FINISH_PULLDOWN_ID:
|
||||||
if ( server_getGameIsOver( globals->game.server ) ) {
|
if ( server_getGameIsOver( globals->game.server ) ) {
|
||||||
displayFinalScores( globals );
|
displayFinalScores( globals );
|
||||||
} else if ( palmaskFromStrId(globals, STR_CONFIRM_END_GAME,
|
} else if ( palmaskFromStrId( globals, STR_CONFIRM_END_GAME,
|
||||||
-1, -1) ) {
|
-1, STR_NO ) ) {
|
||||||
server_endGame( globals->game.server );
|
server_endGame( globals->game.server );
|
||||||
draw = true;
|
draw = true;
|
||||||
}
|
}
|
||||||
|
@ -2347,7 +2348,7 @@ mainViewHandleEvent( EventPtr event )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case XW_ABOUT_PULLDOWN_ID:
|
case XW_ABOUT_PULLDOWN_ID:
|
||||||
palmaskFromStrId(globals, STR_ABOUT_CONTENT, STR_ABOUT_TITLE,-1);
|
palmaskFromStrId( globals, STR_ABOUT_CONTENT, STR_ABOUT_TITLE,-1 );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case XW_HINT_PULLDOWN_ID:
|
case XW_HINT_PULLDOWN_ID:
|
||||||
|
|
Loading…
Reference in a new issue