diff --git a/xwords4/common/board.c b/xwords4/common/board.c index 7375bbcd9..842b43411 100644 --- a/xwords4/common/board.c +++ b/xwords4/common/board.c @@ -1340,7 +1340,7 @@ timerFiredForPen( BoardCtxt* board, XWEnv xwe ) putting up a square bonus if we're on a square with something that can be dragged */ #ifdef XWFEATURE_RAISETILE - draw = dragDropSetAdd( board ); + draw = dragDropSetAdd( board, xwe ); #endif } @@ -1461,7 +1461,7 @@ p_tray_timerFired( void* closure, XWEnv xwe, XWTimerReason why ) XP_Bool draw = XP_FALSE; BoardCtxt* board = (BoardCtxt*)closure; if ( why == TIMER_PENDOWN ) { - draw = dragDropSetAdd( board ); + draw = dragDropSetAdd( board, xwe ); } return draw; } diff --git a/xwords4/common/dragdrpp.c b/xwords4/common/dragdrpp.c index 895b33ac6..6ed215d82 100644 --- a/xwords4/common/dragdrpp.c +++ b/xwords4/common/dragdrpp.c @@ -349,11 +349,9 @@ dragDropSetAdd( BoardCtxt* board, XWEnv xwe ) draw = dragDropInProgress(board) && !dragDropIsDividerDrag( board ) && !dragDropHasMoved( board ); if ( draw ) { - if ( draw ) { - ds->yyAdd = (board->trayBounds.height * 2) / 3; - draw = dragDropContinueImpl( board, xwe, board->penDownX, - board->penDownY, NULL ); - } + ds->yyAdd = (board->trayBounds.height * 2) / 3; + draw = dragDropContinueImpl( board, xwe, board->penDownX, + board->penDownY, NULL ); } return draw; } diff --git a/xwords4/common/dragdrpp.h b/xwords4/common/dragdrpp.h index d13306578..fb8e59e8e 100644 --- a/xwords4/common/dragdrpp.h +++ b/xwords4/common/dragdrpp.h @@ -38,7 +38,7 @@ XP_Bool dragDropEnd( BoardCtxt* board, XWEnv xwe, XP_U16 xx, XP_U16 yy, XP_Bool* dragged ); #ifdef XWFEATURE_RAISETILE -XP_Bool dragDropSetAdd( BoardCtxt* board ); +XP_Bool dragDropSetAdd( BoardCtxt* board, XWEnv xwe ); #endif XP_Bool dragDropGetBoardTile( const BoardCtxt* board, XP_U16* col, XP_U16* row );