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

tweak score layout, and remove a U8 that was overflowing on win32

Browse source
This commit is contained in:
ehouse 2006-05-10 13:42:44 +00:00
parent 7297ab4be8
commit c496593800
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/common/board.c
View file

@ -1210,11 +1210,7 @@ drawScoreBoard( BoardCtxt* board )
here is for the scores to be closer to each other than they are here is for the scores to be closer to each other than they are
to the rem: string and timer on the ends. */ to the rem: string and timer on the ends. */
nShares = nPlayers; nShares = nPlayers;
if ( remDim > 0 ) {
++nShares;
}
XP_ASSERT( *adjustDim >= totalDim ); XP_ASSERT( *adjustDim >= totalDim );
/* XP_LOGF( "*adjustDim=%d, totalDim=%d", *adjustDim, totalDim ); */
extra = (*adjustDim - totalDim) / nShares; extra = (*adjustDim - totalDim) / nShares;
/* at this point, the scoreRect should be anchored at the /* at this point, the scoreRect should be anchored at the
@ -1226,7 +1222,6 @@ drawScoreBoard( BoardCtxt* board )
draw_drawRemText( board->draw, &scoreRect, &scoreRect, draw_drawRemText( board->draw, &scoreRect, &scoreRect,
nTilesInPool ); nTilesInPool );
remDim += extra;
*adjustPt += remDim; *adjustPt += remDim;
} }

2
xwords4/common/boardp.h
View file

@ -125,7 +125,7 @@ struct BoardCtxt {
#endif #endif
XP_U8 dividerLoc[MAX_NUM_PLAYERS]; /* 0 means left of 0th tile, etc. */ XP_U8 dividerLoc[MAX_NUM_PLAYERS]; /* 0 means left of 0th tile, etc. */
XP_U8 scoreDims[MAX_NUM_PLAYERS]; XP_U16 scoreDims[MAX_NUM_PLAYERS];
/* scoreboard state */ /* scoreboard state */
XP_Rect scoreBdBounds; XP_Rect scoreBdBounds;