util function sig change

This commit is contained in:
ehouse 2005-01-13 04:37:36 +00:00
parent 958754dbfe
commit be8b96424a

View file

@ -124,8 +124,8 @@ static XP_Bool palm_util_userQuery( XW_UtilCtxt* uc, UtilQueryID id,
static XWBonusType palm_util_getSquareBonus( XW_UtilCtxt* uc, static XWBonusType palm_util_getSquareBonus( XW_UtilCtxt* uc,
ModelCtxt* model, ModelCtxt* model,
XP_U16 col, XP_U16 row ); XP_U16 col, XP_U16 row );
static XP_S16 palm_util_userPickTile( XW_UtilCtxt* uc, PickInfo* pi, static XP_S16 palm_util_userPickTile( XW_UtilCtxt* uc, const PickInfo* pi,
XP_U16 playerNum, XP_UCHAR4* texts, XP_U16 playerNum, const XP_UCHAR4* texts,
XP_U16 nTiles ); XP_U16 nTiles );
static XP_Bool palm_util_askPassword( XW_UtilCtxt* uc, const XP_UCHAR* name, static XP_Bool palm_util_askPassword( XW_UtilCtxt* uc, const XP_UCHAR* name,
XP_UCHAR* buf, XP_U16* len ); XP_UCHAR* buf, XP_U16* len );
@ -1198,6 +1198,7 @@ startApplication( PalmAppGlobals** globalsP )
globals->isFirstLaunch = false; globals->isFirstLaunch = false;
} else { } else {
DictListEntry* dlep; DictListEntry* dlep;
XP_U32 gameID;
/* if we're here because dict missing, don't re-init all prefs! */ /* if we're here because dict missing, don't re-init all prefs! */
if ( !prefsFound ) { if ( !prefsFound ) {
@ -1214,8 +1215,10 @@ startApplication( PalmAppGlobals** globalsP )
globals->gameInfo.dictName = copyString( MPPARM(globals->mpool) globals->gameInfo.dictName = copyString( MPPARM(globals->mpool)
dlep->baseName ); dlep->baseName );
gameID = TimGetSeconds();
game_makeNewGame( MEMPOOL &globals->game, &globals->gameInfo, game_makeNewGame( MEMPOOL &globals->game, &globals->gameInfo,
&globals->util, globals->draw, &globals->gState.cp, &globals->util, globals->draw, gameID,
&globals->gState.cp,
palm_send, globals ); palm_send, globals );
FrmPopupForm( XW_NEWGAMES_FORM ); FrmPopupForm( XW_NEWGAMES_FORM );
} }
@ -3035,8 +3038,8 @@ handleKeysInBlank( EventPtr event )
} /* handleKeysInBlank */ } /* handleKeysInBlank */
static XP_S16 static XP_S16
askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, PickInfo* pi, askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, const PickInfo* pi,
XP_U16 nTiles, XP_UCHAR4* texts ) XP_U16 nTiles, const XP_UCHAR4* texts )
{ {
FormPtr form, prevForm; FormPtr form, prevForm;
ListPtr lettersList; ListPtr lettersList;
@ -3263,8 +3266,9 @@ palm_util_getSquareBonus( XW_UtilCtxt* uc, ModelCtxt* model,
} /* palm_util_getSquareBonus */ } /* palm_util_getSquareBonus */
static XP_S16 static XP_S16
palm_util_userPickTile( XW_UtilCtxt* uc, PickInfo* pi, palm_util_userPickTile( XW_UtilCtxt* uc, const PickInfo* pi,
XP_U16 playerNum, XP_UCHAR4* texts, XP_U16 nTiles ) XP_U16 playerNum, const XP_UCHAR4* texts,
XP_U16 nTiles )
{ {
PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure; PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure;
return askBlankValue( globals, playerNum, pi, nTiles, texts ); return askBlankValue( globals, playerNum, pi, nTiles, texts );