change name of field. No code change. Pending on symbian and franklin which don't compile.

This commit is contained in:
ehouse 2008-02-02 15:17:53 +00:00
parent 2386ab6b31
commit 19ea3e1f6e
6 changed files with 7 additions and 6 deletions

View file

@ -45,7 +45,7 @@ typedef struct DrawScoreInfo {
void* lscClosure;
XP_UCHAR* name;
XP_U16 playerNum;
XP_S16 score;
XP_S16 totalScore;
XP_S16 nTilesLeft; /* < 0 means don't use */
CellFlags flags;
XP_Bool isTurn;

View file

@ -119,7 +119,7 @@ drawScoreBoard( BoardCtxt* board )
}
#endif
dp->dsi.playerNum = i;
dp->dsi.score = scores[i];
dp->dsi.totalScore = scores[i];
dp->dsi.isTurn = (i == curTurn);
dp->dsi.name = emptyStringIfNull(lp->name);
dp->dsi.selected = board->trayVisState != TRAY_HIDDEN

View file

@ -176,7 +176,7 @@ formatScoreText( XP_UCHAR* buf, const DrawScoreInfo* dsi )
++len;
strcat( buf, " " );
}
len += sprintf( buf + len, "%.3d", dsi->score );
len += sprintf( buf + len, "%.3d", dsi->totalScore );
if ( (*dsi->lsc)( dsi->lscClosure, dsi->playerNum, recbuf, &recBufLen ) ) {
while ( len < RECENT_COL ) {

View file

@ -755,7 +755,7 @@ static void
scoreWidthAndText( GtkDrawCtx* XP_UNUSED(dctx), PangoLayout* layout, char* buf,
const DrawScoreInfo* dsi, XP_U16* widthP, XP_U16* heightP )
{
XP_S16 score = dsi->score;
XP_S16 score = dsi->totalScore;
XP_U16 nTilesLeft = dsi->nTilesLeft;
XP_Bool isTurn = dsi->isTurn;
char* borders = "";

View file

@ -1068,7 +1068,8 @@ palmFormatScore( char* buf, const DrawScoreInfo* dsi, XP_Bool vertical )
*remPart = '\0';
}
(void)StrPrintF( buf, "%s%d%s%s", borders, dsi->score, remPart, borders );
(void)StrPrintF( buf, "%s%d%s%s", borders, dsi->totalScore,
remPart, borders );
} /* palmFormatScore */
static void

View file

@ -671,7 +671,7 @@ ceWidthAndText( CEDrawCtx* dctx, const DrawScoreInfo* dsi,
strcpy( buf, bullet );
sprintf( tmp, "%d", dsi->score );
sprintf( tmp, "%d", dsi->totalScore );
strcat( buf, tmp );
if ( dsi->nTilesLeft >= 0 ) {