Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

protect changeDict feature with compile-time flags (since it can't be

Browse source 
used on Android)
This commit is contained in:
Eric House 2012-10-24 06:46:54 -07:00
parent c69dbda36f
commit 13c74cfbd5
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/common/game.c
View file

@ -44,8 +44,9 @@ assertUtilOK( XW_UtilCtxt* util )
# define assertUtilOK(u) # define assertUtilOK(u)
#endif #endif
#ifdef XWFEATURE_CHANGEDICT
static void gi_setDict( MPFORMAL CurGameInfo* gi, const DictionaryCtxt* dict ); static void gi_setDict( MPFORMAL CurGameInfo* gi, const DictionaryCtxt* dict );
#endif
static void static void
checkServerRole( CurGameInfo* gi, XP_U16* nPlayersHere, XP_U16* nPlayersTotal ) checkServerRole( CurGameInfo* gi, XP_U16* nPlayersHere, XP_U16* nPlayersTotal )
@ -186,6 +187,7 @@ game_reset( MPFORMAL XWGame* game, CurGameInfo* gi,
board_prefsChanged( game->board, cp ); board_prefsChanged( game->board, cp );
} /* game_reset */ } /* game_reset */
#ifdef XWFEATURE_CHANGEDICT
void void
game_changeDict( MPFORMAL XWGame* game, CurGameInfo* gi, DictionaryCtxt* dict ) game_changeDict( MPFORMAL XWGame* game, CurGameInfo* gi, DictionaryCtxt* dict )
{ {
@ -194,6 +196,7 @@ game_changeDict( MPFORMAL XWGame* game, CurGameInfo* gi, DictionaryCtxt* dict )
gi_setDict( MPPARM(mpool) gi, dict ); gi_setDict( MPPARM(mpool) gi, dict );
server_resetEngines( game->server ); server_resetEngines( game->server );
} }
#endif
XP_Bool XP_Bool
game_makeFromStream( MPFORMAL XWStreamCtxt* stream, XWGame* game, game_makeFromStream( MPFORMAL XWStreamCtxt* stream, XWGame* game,
@ -572,6 +575,7 @@ gi_writeToStream( XWStreamCtxt* stream, const CurGameInfo* gi )
} }
} /* gi_writeToStream */ } /* gi_writeToStream */
#ifdef XWFEATURE_CHANGEDICT
static void static void
gi_setDict( MPFORMAL CurGameInfo* gi, const DictionaryCtxt* dict ) gi_setDict( MPFORMAL CurGameInfo* gi, const DictionaryCtxt* dict )
{ {
@ -583,6 +587,7 @@ gi_setDict( MPFORMAL CurGameInfo* gi, const DictionaryCtxt* dict )
XP_FREEP( mpool, &pl->dictName ); XP_FREEP( mpool, &pl->dictName );
} }
} }
#endif
XP_Bool XP_Bool
player_hasPasswd( LocalPlayer* player ) player_hasPasswd( LocalPlayer* player )

2
xwords4/common/server.c
View file

@ -1581,6 +1581,7 @@ server_getEngineFor( ServerCtxt* server, XP_U16 playerNum )
return engine; return engine;
} /* server_getEngineFor */ } /* server_getEngineFor */
#ifdef XWFEATURE_CHANGEDICT
void void
server_resetEngines( ServerCtxt* server ) server_resetEngines( ServerCtxt* server )
{ {
@ -1589,6 +1590,7 @@ server_resetEngines( ServerCtxt* server )
server_resetEngine( server, nPlayers ); server_resetEngine( server, nPlayers );
} }
} }
#endif
void void
server_resetEngine( ServerCtxt* server, XP_U16 playerNum ) server_resetEngine( ServerCtxt* server, XP_U16 playerNum )

2
xwords4/linux/Makefile
View file

@ -108,6 +108,8 @@ DEFINES += -DXWFEATURE_TRAYUNDO_ONE
DEFINES += -DXWFEATURE_BONUSALL DEFINES += -DXWFEATURE_BONUSALL
# DEFINES += -DXWFEATURE_BONUSALLHINT # DEFINES += -DXWFEATURE_BONUSALLHINT
DEFINES += -DXWFEATURE_HILITECELL DEFINES += -DXWFEATURE_HILITECELL
# allow change dict inside running game
DEFINES += -DXWFEATURE_CHANGEDICT
# MAX_ROWS controls STREAM_VERS_BIGBOARD and with it move hashing # MAX_ROWS controls STREAM_VERS_BIGBOARD and with it move hashing
DEFINES += -DMAX_ROWS=32 DEFINES += -DMAX_ROWS=32

6
xwords4/linux/gtkmain.c
View file

@ -861,6 +861,7 @@ save_game( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* XP_UNUSED(globals) )
{ {
} /* save_game */ } /* save_game */
#ifdef XWFEATURE_CHANGEDICT
static void static void
change_dictionary( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* globals ) change_dictionary( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* globals )
{ {
@ -877,6 +878,7 @@ change_dictionary( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* globals )
} }
g_slist_free( dicts ); g_slist_free( dicts );
} /* change_dictionary */ } /* change_dictionary */
#endif
static void static void
handle_undo( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* XP_UNUSED(globals) ) handle_undo( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* XP_UNUSED(globals) )
@ -1020,10 +1022,10 @@ makeMenus( GtkAppGlobals* globals, int XP_UNUSED(argc),
GTK_SIGNAL_FUNC(load_game), globals ); GTK_SIGNAL_FUNC(load_game), globals );
(void)createAddItem( fileMenu, "Save game", (void)createAddItem( fileMenu, "Save game",
GTK_SIGNAL_FUNC(save_game), globals ); GTK_SIGNAL_FUNC(save_game), globals );
#ifdef XWFEATURE_CHANGEDICT
(void)createAddItem( fileMenu, "Change dictionary", (void)createAddItem( fileMenu, "Change dictionary",
GTK_SIGNAL_FUNC(change_dictionary), globals ); GTK_SIGNAL_FUNC(change_dictionary), globals );
#endif
(void)createAddItem( fileMenu, "Cancel trade", (void)createAddItem( fileMenu, "Cancel trade",
GTK_SIGNAL_FUNC(handle_trade_cancel), globals ); GTK_SIGNAL_FUNC(handle_trade_cancel), globals );