Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add support for a config button as a cleaner alternative to launching

Browse source 
comms config dialogs on changes to host type (which often involved
platform-specific hackery to trigger the dialog when user doesn't want
to change role)
This commit is contained in:
ehouse 2009-03-08 19:54:14 +00:00
parent bcc4783fee
commit f7e6e584ad
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/nwgamest.c
View file

@ -48,6 +48,9 @@ struct NewGameCtx {
XP_Bool isNewGame;
XP_Bool changedNPlayers;
XP_TriEnable juggleEnabled;
#ifndef XWFEATURE_STANDALONE_ONLY
XP_TriEnable settingsEnabled;
#endif
MPSLOT
};
@ -57,7 +60,7 @@ static void enableOne( NewGameCtx* ngc, XP_U16 player, NewGameColumn col,
static void adjustAllRows( NewGameCtx* ngc, XP_Bool force );
static void adjustOneRow( NewGameCtx* ngc, XP_U16 player, XP_Bool force );
static void setRoleStrings( NewGameCtx* ngc );
static void considerEnableJuggle( NewGameCtx* ngc );
static void considerEnable( NewGameCtx* ngc );
static void storePlayer( NewGameCtx* ngc, XP_U16 player, LocalPlayer* lp );
static void loadPlayer( NewGameCtx* ngc, XP_U16 player,
const LocalPlayer* lp );
@ -110,6 +113,7 @@ newg_load( NewGameCtx* ngc, const CurGameInfo* gi )
XP_Bool shown[MAX_NUM_PLAYERS] = { XP_FALSE, XP_FALSE, XP_FALSE, XP_FALSE};
ngc->juggleEnabled = TRI_ENAB_NONE;
ngc->settingsEnabled = TRI_ENAB_NONE;
for ( ii = 0; ii < NG_NUM_COLS; ++ii ) {
for ( jj = 0; jj < MAX_NUM_PLAYERS; ++jj ) {
ngc->enabled[ii][jj] = TRI_ENAB_NONE;
@ -145,7 +149,7 @@ newg_load( NewGameCtx* ngc, const CurGameInfo* gi )
TRI_ENAB_ENABLED : TRI_ENAB_DISABLED );
setRoleStrings( ngc );
considerEnableJuggle( ngc );
considerEnable( ngc );
/* Load local players first */
nLoaded = 0;
@ -260,7 +264,7 @@ newg_attrChanged( NewGameCtx* ngc, NewGameAttr attr, NGValue value )
}
if ( changed ) {
considerEnableJuggle( ngc );
considerEnable( ngc );
adjustAllRows( ngc, XP_FALSE );
}
}
@ -534,7 +538,7 @@ setRoleStrings( NewGameCtx* ngc )
} /* setRoleStrings */
static void
considerEnableJuggle( NewGameCtx* ngc )
considerEnable( NewGameCtx* ngc )
{
XP_TriEnable newEnable;
newEnable = (ngc->isNewGame && ngc->nPlayersShown > 1)?
@ -544,7 +548,17 @@ considerEnableJuggle( NewGameCtx* ngc )
(*ngc->enableAttrProc)( ngc->closure, NG_ATTR_CANJUGGLE, newEnable );
ngc->juggleEnabled = newEnable;
}
} /* considerEnableJuggle */
#ifndef XWFEATURE_STANDALONE_ONLY
newEnable = (ngc->role == SERVER_STANDALONE)?
TRI_ENAB_HIDDEN : TRI_ENAB_ENABLED;
if ( newEnable != ngc->settingsEnabled ) {
ngc->settingsEnabled = newEnable;
(*ngc->enableAttrProc)( ngc->closure, NG_ATTR_CANCONFIG, newEnable );
}
#endif
} /* considerEnable */
static void
storePlayer( NewGameCtx* ngc, XP_U16 player, LocalPlayer* lp )

1
common/nwgamest.h
View file

@ -53,6 +53,7 @@ typedef enum {
typedef enum {
#ifndef XWFEATURE_STANDALONE_ONLY
NG_ATTR_ROLE,
NG_ATTR_CANCONFIG,
NG_ATTR_REMHEADER,
#endif
NG_ATTR_NPLAYERS