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

format last player whose turn it is, and track remaining space, so

Browse source 
platform code can include the name as a turn indicator.
This commit is contained in:
ehouse 2009-10-15 12:38:47 +00:00
parent dde7cfa9b1
commit e7f476c13e
1 changed files with 55 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
xwords4/common/scorebdp.c
View file

@ -59,7 +59,8 @@ drawScoreBoard( BoardCtxt* board )
XP_Rect scoreRect = board->scoreBdBounds;
XP_S16* adjustDim;
XP_S16* adjustPt;
XP_U16 totalDim, extra, nShares, remWidth, remHeight, remDim;
XP_U16 totalDim; /* don't really need this */
XP_U16 extra, remWidth, remHeight, remDim;
DrawScoreData* dp;
DrawScoreData datum[MAX_NUM_PLAYERS];
ScoresArray scores;
@ -70,6 +71,7 @@ drawScoreBoard( BoardCtxt* board )
XP_Bool focusAll = XP_FALSE;
XP_Bool remFocussed = XP_FALSE;
XP_S16 cursorIndex = -1;
XP_Bool skipCurTurn; /* skip the guy whose turn it is this pass? */
if ( (board->focussed == OBJ_SCORE) && !board->hideFocus ) {
focusAll = !board->focusHasDived;
@ -99,6 +101,7 @@ drawScoreBoard( BoardCtxt* board )
adjustPt = &scoreRect.left;
adjustDim = &scoreRect.width;
}
*adjustDim -= remDim;
/* Get the scores from the model or by calculating them based on
the end-of-game state. */
@ -112,10 +115,24 @@ drawScoreBoard( BoardCtxt* board )
totalDim = remDim;
/* Give as much room as possible to the entry for the player whose
turn it is so name can be drawn. Do that by formatting that
player's score last, and passing each time the amount of space
left. Platform code can then fill that space.
*/
/* figure spacing for each scoreboard entry */
XP_MEMSET( &datum, 0, sizeof(datum) );
for ( skipCurTurn = XP_TRUE; ; skipCurTurn = XP_FALSE ) {
for ( dp = datum, ii = 0; ii < nPlayers; ++ii, ++dp ) {
LocalPlayer* lp = &board->gi->players[ii];
LocalPlayer* lp;
XP_U16 dim;
if ( skipCurTurn == (ii == curTurn) ) {
continue;
}
lp = &board->gi->players[ii];
/* This is a hack! */
dp->dsi.lsc = board_ScoreCallback;
@ -135,22 +152,32 @@ drawScoreBoard( BoardCtxt* board )
dp->dsi.isRemote = !lp->isLocal;
dp->dsi.nTilesLeft = (nTilesInPool > 0)? -1:
model_getNumTilesTotal( model, ii );
draw_measureScoreText( board->draw, &scoreRect,
&dp->dsi, &dp->width, &dp->height );
XP_ASSERT( dp->width <= scoreRect.width );
XP_ASSERT( dp->height <= scoreRect.height );
totalDim += isVertical ? dp->height : dp->width;
dim = isVertical ? dp->height : dp->width;
totalDim += dim;
*adjustDim -= dim;
}
if ( !skipCurTurn ) { /* exit 2nd time through */
break;
}
}
scoreRect = board->scoreBdBounds; /* reset */
/* break extra space into chunks, one to follow REM and another to
preceed the timer, and then one for each player. Generally the
player's score will be centered in the rect it's given, so in
effect we're putting half the chunk on either side. The goal
here is for the scores to be closer to each other than they are
to the rem: string and timer on the ends. */
nShares = nPlayers;
XP_ASSERT( *adjustDim >= totalDim );
extra = (*adjustDim - totalDim) / nShares;
XP_ASSERT( *adjustDim >= totalDim ); /* ???? */
extra = (*adjustDim - totalDim) / nPlayers;
/* at this point, the scoreRect should be anchored at the
scoreboard rect's upper left. */