mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-30 08:34:16 +01:00
add palm_util_addrChange; track whether running on POSE to work around
NetLibSelect bug.
This commit is contained in:
parent
83e24bb9fa
commit
88f4c3749b
1 changed files with 22 additions and 3 deletions
|
@ -151,6 +151,10 @@ static XWStreamCtxt* palm_util_makeStreamFromAddr( XW_UtilCtxt* uc,
|
||||||
static XP_UCHAR* palm_util_getUserString( XW_UtilCtxt* uc, XP_U16 stringCode );
|
static XP_UCHAR* palm_util_getUserString( XW_UtilCtxt* uc, XP_U16 stringCode );
|
||||||
static XP_Bool palm_util_warnIllegalWord( XW_UtilCtxt* uc, BadWordInfo* bwi,
|
static XP_Bool palm_util_warnIllegalWord( XW_UtilCtxt* uc, BadWordInfo* bwi,
|
||||||
XP_U16 turn, XP_Bool turnLost );
|
XP_U16 turn, XP_Bool turnLost );
|
||||||
|
#ifdef BEYOND_IR
|
||||||
|
static void palm_util_addrChange( XW_UtilCtxt* uc, const CommsAddrRec* oldAddr,
|
||||||
|
const CommsAddrRec* newAddr );
|
||||||
|
#endif
|
||||||
#ifdef XWFEATURE_SEARCHLIMIT
|
#ifdef XWFEATURE_SEARCHLIMIT
|
||||||
static XP_Bool palm_util_getTraySearchLimits( XW_UtilCtxt* uc, XP_U16* min,
|
static XP_Bool palm_util_getTraySearchLimits( XW_UtilCtxt* uc, XP_U16* min,
|
||||||
XP_U16* max );
|
XP_U16* max );
|
||||||
|
@ -541,7 +545,7 @@ loadGamePrefs( /*PalmAppGlobals* globals, */XWStreamCtxt* stream )
|
||||||
{
|
{
|
||||||
/* Keep in sync with games saved in prev version, which foolishly saved
|
/* Keep in sync with games saved in prev version, which foolishly saved
|
||||||
hintsNotAllowed separate from the current game's value for the same
|
hintsNotAllowed separate from the current game's value for the same
|
||||||
thing. When the version changes get rid of this bit. */
|
thing. When the version changes get rid of this bit. PENDING */
|
||||||
(void)stream_getBits( stream, 1 );
|
(void)stream_getBits( stream, 1 );
|
||||||
} /* loadGamePrefs */
|
} /* loadGamePrefs */
|
||||||
|
|
||||||
|
@ -644,6 +648,9 @@ initUtilFuncs( PalmAppGlobals* globals )
|
||||||
#endif
|
#endif
|
||||||
vtable->m_util_getUserString = palm_util_getUserString;
|
vtable->m_util_getUserString = palm_util_getUserString;
|
||||||
vtable->m_util_warnIllegalWord = palm_util_warnIllegalWord;
|
vtable->m_util_warnIllegalWord = palm_util_warnIllegalWord;
|
||||||
|
#ifdef BEYOND_IR
|
||||||
|
vtable->m_util_addrChange = palm_util_addrChange;
|
||||||
|
#endif
|
||||||
#ifdef XWFEATURE_SEARCHLIMIT
|
#ifdef XWFEATURE_SEARCHLIMIT
|
||||||
vtable->m_util_getTraySearchLimits = palm_util_getTraySearchLimits;
|
vtable->m_util_getTraySearchLimits = palm_util_getTraySearchLimits;
|
||||||
#endif
|
#endif
|
||||||
|
@ -1097,6 +1104,7 @@ startApplication( PalmAppGlobals** globalsP )
|
||||||
PalmAppGlobals* globals;
|
PalmAppGlobals* globals;
|
||||||
Boolean leftyFlag;
|
Boolean leftyFlag;
|
||||||
Int16 vers;
|
Int16 vers;
|
||||||
|
UInt32 ignore;
|
||||||
MPSLOT;
|
MPSLOT;
|
||||||
|
|
||||||
#if defined FOR_GREMLINS
|
#if defined FOR_GREMLINS
|
||||||
|
@ -1118,6 +1126,8 @@ startApplication( PalmAppGlobals** globalsP )
|
||||||
initHighResGlobals( globals );
|
initHighResGlobals( globals );
|
||||||
getSizes( globals );
|
getSizes( globals );
|
||||||
|
|
||||||
|
globals->runningOnPOSE = FtrGet( 'pose', 0, &ignore) != ftrErrNoSuchFeature;
|
||||||
|
|
||||||
globals->vtMgr = make_vtablemgr( MPPARM_NOCOMMA(globals->mpool) );
|
globals->vtMgr = make_vtablemgr( MPPARM_NOCOMMA(globals->mpool) );
|
||||||
|
|
||||||
globals->romVersion = romVersion();
|
globals->romVersion = romVersion();
|
||||||
|
@ -3449,8 +3459,7 @@ palm_send( XP_U8* buf, XP_U16 len, CommsAddrRec* addr, void* closure )
|
||||||
} /* palm_send */
|
} /* palm_send */
|
||||||
|
|
||||||
void
|
void
|
||||||
checkAndDeliver( PalmAppGlobals* globals, XWStreamCtxt* instream,
|
checkAndDeliver( PalmAppGlobals* globals, XWStreamCtxt* instream )
|
||||||
CommsAddrRec* addr )
|
|
||||||
{
|
{
|
||||||
if ( comms_checkIncomingStream( globals->game.comms,
|
if ( comms_checkIncomingStream( globals->game.comms,
|
||||||
instream, NULL ) ) {
|
instream, NULL ) ) {
|
||||||
|
@ -3505,6 +3514,16 @@ palm_util_warnIllegalWord( XW_UtilCtxt* uc, BadWordInfo* bwi, XP_U16 turn,
|
||||||
return result;
|
return result;
|
||||||
} /* palm_util_warnIllegalWord */
|
} /* palm_util_warnIllegalWord */
|
||||||
|
|
||||||
|
#ifdef BEYOND_IR
|
||||||
|
static void
|
||||||
|
palm_util_addrChange( XW_UtilCtxt* uc, const CommsAddrRec* oldAddr,
|
||||||
|
const CommsAddrRec* newAddr )
|
||||||
|
{
|
||||||
|
PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure;
|
||||||
|
ip_addr_change( globals, oldAddr, newAddr );
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef XWFEATURE_SEARCHLIMIT
|
#ifdef XWFEATURE_SEARCHLIMIT
|
||||||
static XP_Bool
|
static XP_Bool
|
||||||
palm_util_getTraySearchLimits( XW_UtilCtxt* uc, XP_U16* min, XP_U16* max )
|
palm_util_getTraySearchLimits( XW_UtilCtxt* uc, XP_U16* min, XP_U16* max )
|
||||||
|
|
Loading…
Add table
Reference in a new issue