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

Fix timer positioning; provide default values for w32 height & width;

Browse source 
put up dialog on assertion failures now that they're uncommon.
This commit is contained in:
ehouse 2008-11-13 05:46:21 +00:00
parent 2ce70b6e7b
commit 2a517c3d32
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wince/cemain.c
View file

@ -1,4 +1,4 @@
/* -*- fill-column: 77; c-basic-offset: 4; compile-command: "make TARGET_OS=wince DEBUG=TRUE" -*- */ /* -*- fill-column: 77; compile-command: "make -j TARGET_OS=wince DEBUG=TRUE" -*- */
/* /*
* Copyright 2002-2008 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 2002-2008 by Eric House (xwords@eehouse.org). All rights reserved.
* *
@ -238,7 +238,7 @@ WinMain( HINSTANCE hInstance,
HACCEL hAccelTable; HACCEL hAccelTable;
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
XP_U16 width, height; XP_U16 width = 320, height = 320;
parseCmdLine( lpCmdLine, &width, &height ); parseCmdLine( lpCmdLine, &width, &height );
#endif #endif
@ -632,7 +632,7 @@ figureBoardParms( CEAppGlobals* globals, const XP_U16 nRows,
} else { } else {
bparms->timerLeft = 0; bparms->timerLeft = 0;
bparms->timerHeight = vScale * 2; bparms->timerHeight = vScale * 2;
bparms->timerTop = scrnHeight - bparms->timerHeight; bparms->timerTop = scoreHeight - bparms->timerHeight;
bparms->timerWidth = scoreWidth; bparms->timerWidth = scoreWidth;
scoreHeight -= bparms->timerHeight; scoreHeight -= bparms->timerHeight;
@ -734,8 +734,9 @@ cePositionBoard( CEAppGlobals* globals )
setOwnedRects( globals, nCols, &bparms ); setOwnedRects( globals, nCols, &bparms );
if ( globals->gameInfo.timerEnabled ) { if ( globals->gameInfo.timerEnabled ) {
board_setTimerLoc( globals->game.board, bparms.timerLeft, board_setTimerLoc( globals->game.board,
bparms.timerTop, bparms.timerWidth, bparms.adjLeft + bparms.timerLeft,
bparms.adjTop + bparms.timerTop, bparms.timerWidth,
bparms.timerHeight ); bparms.timerHeight );
} }
@ -2709,7 +2710,7 @@ void
wince_assert( XP_UCHAR* XP_UNUSED_LOG(s), int XP_UNUSED_LOG(line), wince_assert( XP_UCHAR* XP_UNUSED_LOG(s), int XP_UNUSED_LOG(line),
char* XP_UNUSED_LOG(fileName) ) char* XP_UNUSED_LOG(fileName) )
{ {
XP_DEBUGF( "ASSERTION FAILED %s: file %s, line %d\n", s, fileName, line ); XP_WARNF( "ASSERTION FAILED %s: file %s, line %d\n", s, fileName, line );
} /* wince_assert */ } /* wince_assert */
#ifdef ENABLE_LOGGING #ifdef ENABLE_LOGGING