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

silence compiler warnings.

Browse source
This commit is contained in:
ehouse 2006-05-28 16:16:46 +00:00
parent b8d3d477a5
commit e26e149f4c
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
xwords4/wince/cedraw.c
View file

@ -278,13 +278,16 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
InsetRect( &rt, 1, 1 ); InsetRect( &rt, 1, 1 );
/* always init to silence compiler warning */
foreColorRef = dctx->globals->appPrefs.colors[getPlayerColor(owner)];
if ( (!!letters && letters[0] != '\0' ) || !!bitmap ) { if ( (!!letters && letters[0] != '\0' ) || !!bitmap ) {
if ( isPending ) { if ( isPending ) {
bkIndex = BLACK_COLOR; bkIndex = BLACK_COLOR;
foreColorRef = dctx->globals->appPrefs.colors[WHITE_COLOR]; foreColorRef = dctx->globals->appPrefs.colors[WHITE_COLOR];
} else { } else {
foreColorRef = dctx->globals->appPrefs.colors[getPlayerColor(owner)];
bkIndex = TILEBACK_COLOR; bkIndex = TILEBACK_COLOR;
// foreColorRef already has right val
} }
} else if ( bonus == BONUS_NONE ) { } else if ( bonus == BONUS_NONE ) {
bkIndex = BKG_COLOR; bkIndex = BKG_COLOR;
@ -821,17 +824,24 @@ DRAW_FUNC_NAME(getMiniWText)( DrawCtx* p_dctx, XWMiniTextType whichText )
switch( whichText ) { switch( whichText ) {
case BONUS_DOUBLE_LETTER: case BONUS_DOUBLE_LETTER:
str = "Double letter"; break; str = "Double letter";
break;
case BONUS_DOUBLE_WORD: case BONUS_DOUBLE_WORD:
str = "Double word"; break; str = "Double word";
break;
case BONUS_TRIPLE_LETTER: case BONUS_TRIPLE_LETTER:
str = "Triple letter"; break; str = "Triple letter";
break;
case BONUS_TRIPLE_WORD: case BONUS_TRIPLE_WORD:
str = "Triple word"; break; str = "Triple word";
break;
case INTRADE_MW_TEXT: case INTRADE_MW_TEXT:
str = "Trading tiles;" XP_CR "select 'Turn done' when ready"; break; str = "Trading tiles;" XP_CR "select 'Turn done' when ready";
break;
default: default:
XP_ASSERT( XP_FALSE ); XP_ASSERT( XP_FALSE );
str = NULL;
break;
} }
return str; return str;