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

change defaults so a with-games-ui/udp game interface comes up by

Browse source 
default.
This commit is contained in:
Eric House 2015-06-26 07:35:24 -07:00
parent d426db7a49
commit d479486521
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/linux/linuxmain.c
View file

@ -631,6 +631,7 @@ typedef enum {
,CMD_SPLITPACKETS ,CMD_SPLITPACKETS
,CMD_CHAT ,CMD_CHAT
,CMD_USEUDP ,CMD_USEUDP
,CMD_NOUDP
,CMD_DROPSENDRELAY ,CMD_DROPSENDRELAY
,CMD_DROPRCVRELAY ,CMD_DROPRCVRELAY
,CMD_DROPSENDSMS ,CMD_DROPSENDSMS
@ -747,7 +748,8 @@ static CmdInfoRec CmdInfoRecs[] = {
,{ CMD_SPLITPACKETS, true, "split-packets", "send tcp packets in " ,{ CMD_SPLITPACKETS, true, "split-packets", "send tcp packets in "
"sections every random MOD <n> seconds to test relay reassembly" } "sections every random MOD <n> seconds to test relay reassembly" }
,{ CMD_CHAT, true, "send-chat", "send a chat every <n> seconds" } ,{ CMD_CHAT, true, "send-chat", "send a chat every <n> seconds" }
,{ CMD_USEUDP, false, "use-udp", "connect to relay new-style, via udp not tcp" } ,{ CMD_USEUDP, false, "use-udp", "connect to relay new-style, via udp not tcp (on by default)" }
,{ CMD_NOUDP, false, "no-use-udp", "connect to relay old-style, via tcp not udp" }
,{ CMD_DROPSENDRELAY, false, "drop-send-relay", "start new games with relay send disabled" } ,{ CMD_DROPSENDRELAY, false, "drop-send-relay", "start new games with relay send disabled" }
,{ CMD_DROPRCVRELAY, false, "drop-receive-relay", "start new games with relay receive disabled" } ,{ CMD_DROPRCVRELAY, false, "drop-receive-relay", "start new games with relay receive disabled" }
@ -2085,6 +2087,8 @@ main( int argc, char** argv )
mainParams.allowPeek = XP_TRUE; mainParams.allowPeek = XP_TRUE;
mainParams.showRobotScores = XP_FALSE; mainParams.showRobotScores = XP_FALSE;
mainParams.useMmap = XP_TRUE; mainParams.useMmap = XP_TRUE;
mainParams.useUdp = true;
mainParams.dbName = "xwgames.sql";
char* envDictPath = getenv( "XW_DICTDIR" ); char* envDictPath = getenv( "XW_DICTDIR" );
XP_LOGF( "%s: envDictPath=%s", __func__, envDictPath ); XP_LOGF( "%s: envDictPath=%s", __func__, envDictPath );
@ -2189,6 +2193,7 @@ main( int argc, char** argv )
break; break;
case CMD_GAMEFILE: case CMD_GAMEFILE:
mainParams.fileName = optarg; mainParams.fileName = optarg;
mainParams.dbName = NULL; /* clear the default */
break; break;
case CMD_DBFILE: case CMD_DBFILE:
mainParams.dbName = optarg; mainParams.dbName = optarg;
@ -2206,6 +2211,7 @@ main( int argc, char** argv )
"disabling XWFEATURE_SEARCHLIMIT" ); "disabling XWFEATURE_SEARCHLIMIT" );
# endif # endif
mainParams.dbFileName = optarg; mainParams.dbFileName = optarg;
mainParams.dbName = NULL;
break; break;
case CMD_GAMEDB_ID: case CMD_GAMEDB_ID:
mainParams.dbFileID = atoi(optarg); mainParams.dbFileID = atoi(optarg);
@ -2369,6 +2375,9 @@ main( int argc, char** argv )
case CMD_USEUDP: case CMD_USEUDP:
mainParams.useUdp = true; mainParams.useUdp = true;
break; break;
case CMD_NOUDP:
mainParams.useUdp = false;
break;
case CMD_DROPSENDRELAY: case CMD_DROPSENDRELAY:
mainParams.commsDisableds[COMMS_CONN_RELAY][1] = XP_TRUE; mainParams.commsDisableds[COMMS_CONN_RELAY][1] = XP_TRUE;