Added LTO and fixed warnings
This commit is contained in:
parent
3e450b5909
commit
15fb694d7b
3 changed files with 25 additions and 20 deletions
26
ui_ncurses.c
26
ui_ncurses.c
|
|
@ -71,7 +71,6 @@ void initBoard( const board_t board ){
|
|||
keypad(stdscr, TRUE);
|
||||
nonl();
|
||||
echo();
|
||||
__attribute__((assume(board.columns < 999)));
|
||||
for( columnsint_t column = 0; column < board.columns; column++ ){
|
||||
char colnum[4];
|
||||
snprintf(
|
||||
|
|
@ -79,37 +78,36 @@ void initBoard( const board_t board ){
|
|||
);
|
||||
mvaddstr(
|
||||
BOARD_Y,
|
||||
BOARD_X + BOARD_DX * ( column + 1 ),
|
||||
(int)(BOARD_X + BOARD_DX * ( column + 1 )),
|
||||
colnum
|
||||
);
|
||||
for( rowsint_t row = 0; row < board.rows; row++ ){
|
||||
mvaddstr(
|
||||
BOARD_Y + BOARD_DY * ( row + 1 ),
|
||||
BOARD_X + BOARD_DX * ( column + 1 ),
|
||||
(int)(BOARD_Y + BOARD_DY * ( row + 1 )),
|
||||
(int)(BOARD_X + BOARD_DX * ( column + 1 )),
|
||||
"[ ]"
|
||||
);
|
||||
}
|
||||
mvaddstr(
|
||||
BOARD_Y + BOARD_DY * ( board.rows + 1 ),
|
||||
BOARD_X + BOARD_DX * ( column + 1 ),
|
||||
(int)(BOARD_Y + BOARD_DY * ( board.rows + 1 )),
|
||||
(int)(BOARD_X + BOARD_DX * ( column + 1 )),
|
||||
colnum
|
||||
);
|
||||
}
|
||||
for( rowsint_t row = 0; row < board.rows; row++ ){
|
||||
char rownum[4];
|
||||
const int intToPrint = board.rows - row + FIRST_NUMBER - 1;
|
||||
__attribute__((assume(intToPrint <= 256)));
|
||||
snprintf(
|
||||
rownum, sizeof(rownum), "%2d", intToPrint
|
||||
);
|
||||
mvaddstr(
|
||||
BOARD_Y + BOARD_DY * ( row + 1 ),
|
||||
(int)(BOARD_Y + BOARD_DY * ( row + 1 )),
|
||||
BOARD_X,
|
||||
rownum
|
||||
);
|
||||
mvaddstr(
|
||||
BOARD_Y + BOARD_DY * ( row + 1 ),
|
||||
BOARD_X + BOARD_DX * ( board.columns + 1 ),
|
||||
(int)(BOARD_Y + BOARD_DY * ( row + 1 )),
|
||||
(int)(BOARD_X + BOARD_DX * ( board.columns + 1 )),
|
||||
rownum
|
||||
);
|
||||
}
|
||||
|
|
@ -142,8 +140,8 @@ void updateBoard(
|
|||
){
|
||||
rowsint_t height = board.height[ column ];
|
||||
mvaddstr(
|
||||
BOARD_Y + BOARD_DY * ( board.rows - height + 1 ),
|
||||
BOARD_X + 1 + BOARD_DX * ( column + 1 ),
|
||||
(int)(BOARD_Y + BOARD_DY * ( board.rows - height + 1 )),
|
||||
(int)(BOARD_X + 1 + BOARD_DX * ( column + 1 )),
|
||||
board.column[ column ] & 1 << ( height - 1 ) ? "1" : "0"
|
||||
);
|
||||
char num[4];
|
||||
|
|
@ -226,8 +224,8 @@ columnsint_t askColumn(
|
|||
}
|
||||
for(;;){
|
||||
int ch = mvgetch(
|
||||
BOARD_Y + BOARD_DY * ( board.rows - board.height[ column ] ),
|
||||
BOARD_X + 1 + BOARD_DX * ( column + 1 )
|
||||
(int)(BOARD_Y + BOARD_DY * ( board.rows - board.height[ column ] )),
|
||||
(int)(BOARD_X + 1 + BOARD_DX * ( column + 1 ))
|
||||
);
|
||||
switch( ch ){
|
||||
case KEY_RIGHT:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue