Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compile when XWFEATURE_RAISETILE defined

Browse source 
Doesn't seem to work, and that's not addressed by this.
This commit is contained in:
Eric House 2020-12-02 17:21:47 -08:00
parent aa5bacdd5f
commit 3760d735bc
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/common/board.c
View file

@ -1340,7 +1340,7 @@ timerFiredForPen( BoardCtxt* board, XWEnv xwe )
putting up a square bonus if we're on a square with putting up a square bonus if we're on a square with
something that can be dragged */ something that can be dragged */
#ifdef XWFEATURE_RAISETILE #ifdef XWFEATURE_RAISETILE
draw = dragDropSetAdd( board ); draw = dragDropSetAdd( board, xwe );
#endif #endif
} }
@ -1461,7 +1461,7 @@ p_tray_timerFired( void* closure, XWEnv xwe, XWTimerReason why )
XP_Bool draw = XP_FALSE; XP_Bool draw = XP_FALSE;
BoardCtxt* board = (BoardCtxt*)closure; BoardCtxt* board = (BoardCtxt*)closure;
if ( why == TIMER_PENDOWN ) { if ( why == TIMER_PENDOWN ) {
draw = dragDropSetAdd( board ); draw = dragDropSetAdd( board, xwe );
} }
return draw; return draw;
} }

2
xwords4/common/dragdrpp.c
View file

@ -348,13 +348,11 @@ dragDropSetAdd( BoardCtxt* board, XWEnv xwe )
XP_Bool draw; XP_Bool draw;
draw = dragDropInProgress(board) && !dragDropIsDividerDrag( board ) draw = dragDropInProgress(board) && !dragDropIsDividerDrag( board )
&& !dragDropHasMoved( board ); && !dragDropHasMoved( board );
if ( draw ) {
if ( draw ) { if ( draw ) {
ds->yyAdd = (board->trayBounds.height * 2) / 3; ds->yyAdd = (board->trayBounds.height * 2) / 3;
draw = dragDropContinueImpl( board, xwe, board->penDownX, draw = dragDropContinueImpl( board, xwe, board->penDownX,
board->penDownY, NULL ); board->penDownY, NULL );
} }
}
return draw; return draw;
} }
#endif #endif

2
xwords4/common/dragdrpp.h
View file

@ -38,7 +38,7 @@ XP_Bool dragDropEnd( BoardCtxt* board, XWEnv xwe, XP_U16 xx, XP_U16 yy,
XP_Bool* dragged ); XP_Bool* dragged );
#ifdef XWFEATURE_RAISETILE #ifdef XWFEATURE_RAISETILE
XP_Bool dragDropSetAdd( BoardCtxt* board ); XP_Bool dragDropSetAdd( BoardCtxt* board, XWEnv xwe );
#endif #endif
XP_Bool dragDropGetBoardTile( const BoardCtxt* board, XP_U16* col, XP_U16* row ); XP_Bool dragDropGetBoardTile( const BoardCtxt* board, XP_U16* col, XP_U16* row );