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

Build with Bluetooth on; add alpha-only text to About dlg; show About

Browse source 
dlg on startup first time; fix null ptr deref bug.
This commit is contained in:
ehouse 2006-10-15 14:22:32 +00:00
parent c695d8644c
commit b73ac76775
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/palm/Makefile
View file

@ -117,7 +117,7 @@ MYDEFS_COMMON += -DXWFEATURE_SEARCHLIMIT
# MYDEFS_COMMON += -DXWFEATURE_RELAY
# turn on bluetooth comms option for 68K and ARM -- which won't work yet
# BLUETOOTH = -DXWFEATURE_BLUETOOTH
BLUETOOTH = -DXWFEATURE_BLUETOOTH
#MYDEFS_COMMON += $(BLUETOOTH)
# Add menu allowing to choose to run 68K or ARM

9
xwords4/palm/l10n/StrRes_en_US.pre
View file

@ -124,7 +124,7 @@
{ "STR_LOCALPLAYERS", "Local players" },
{ "STR_TOTALPLAYERS", "Total players" },
#ifdef BEYOND_IR
#ifdef XWFEATURE_RELAY
{ "STR_RELAY_TIMEOUT", "Relay error: Other devices failed to "
"connect." },
{ "STR_RELAY_LOST_OTHER", "Relay error: another device has lost its "
@ -132,6 +132,13 @@
{ "STR_RELAY_GENERIC", "Relay error: something's wrong." },
#endif
{ "STR_ABOUT_CONTENT",
#if 1
"THANKS FOR LOOKING at this alpha version of "
"Crosswords. Please see the notes and caveats at "
"xwords.sf.net/bt_palm.php. Please report bugs to "
"ehouse@users.sf.net. Enjoy!\n\n"
#endif
"Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \
"Copyright 1998-2006 by Eric House. "\
"Released under the GNU Public License.\n\n"\

9
xwords4/palm/palmmain.c
View file

@ -1073,6 +1073,11 @@ startApplication( PalmAppGlobals** globalsP )
getResString,
&globals->drawingPrefs );
if ( !globals->gState.reserved1 ) {
palmaskFromStrId( globals, STR_ABOUT_CONTENT, STR_ABOUT_TITLE );
globals->gState.reserved1 = XP_TRUE;
}
FrmGotoForm( XW_MAIN_FORM );
/* do this first so players who don't exist have default names */
@ -1466,7 +1471,9 @@ static void
showBTState( PalmAppGlobals* globals )
{
char ch[] = { ' ', ' ' };
if ( COMMS_CONN_BT == comms_getConType( globals->game.comms ) ) {
CommsCtxt* comms = globals->game.comms;
if ( (comms != NULL)
&& COMMS_CONN_BT == comms_getConType( globals->game.comms ) ) {
switch( globals->btUIState ) {
case BTUI_NONE:
ch[0] = 'x'; break;