AnnaSnoeijs/AnnaConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed type stuff

Browse source
This commit is contained in:
AnnaSnoeijs 2025-06-06 21:32:00 +02:00
parent 355c79bac4
commit c0b357deb2
6 changed files with 65 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ui_ncurses.c
View file

@ -71,15 +71,17 @@ void initBoard( const board_t board ){
keypad(stdscr, TRUE);
nonl();
echo();
for( int column = 0; column < board.columns; column++ ){
for( columnsint_t column = 0; column < board.columns; column++ ){
char colnum[4];
sprintf( colnum, "%2d", column + FIRST_NUMBER );
snprintf(
colnum, sizeof(colnum), "%2d", column + FIRST_NUMBER
);
mvaddstr(
BOARD_Y,
BOARD_X + BOARD_DX * ( column + 1 ),
colnum
);
for(int row = 0; row < board.rows; row++){
for( rowsint_t row = 0; row < board.rows; row++ ){
mvaddstr(
BOARD_Y + BOARD_DY * ( row + 1 ),
BOARD_X + BOARD_DX * ( column + 1 ),
@ -92,9 +94,11 @@ void initBoard( const board_t board ){
colnum
);
}
for(int row = 0; row < board.rows; row++ ){
for( rowsint_t row = 0; row < board.rows; row++ ){
char rownum[4];
sprintf( rownum, "%2d", board.rows - row + FIRST_NUMBER - 1 );
snprintf(
rownum, sizeof(rownum), "%2d", board.rows - row + FIRST_NUMBER - 1
);
mvaddstr(
BOARD_Y + BOARD_DY * ( row + 1 ),
BOARD_X,
@ -106,7 +110,7 @@ void initBoard( const board_t board ){
rownum
);
}
for( int y = 0; y < SCOREBOARD_HEIGHT; y++ ){
for( uint_fast8_t y = 0; y < SCOREBOARD_HEIGHT; y++ ){
char *str;
switch(y){
case 0: str = "┌───────────────┬────┬────┐"; break;
@ -132,70 +136,70 @@ void initBoard( const board_t board ){
void updateBoard(
const wins_t wins,
const board_t board,
const int column
const columnsint_t column
){
int height = board.height[ column ];
rowsint_t height = board.height[ column ];
mvaddstr(
BOARD_Y + BOARD_DY * ( board.rows - height + 1 ),
BOARD_X + 1 + BOARD_DX * ( column + 1 ),
board.column[ column ] & 1 << ( height - 1 ) ? "1" : "0"
);
char num[4];
sprintf( num, "%3d", wins.count0.vertical );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count0.vertical );
mvaddstr(
SCOREBOARD_Y + 3,
SCOREBOARD_X + 17,
num
);
sprintf( num, "%3d", wins.count1.vertical );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count1.vertical );
mvaddstr(
SCOREBOARD_Y + 3,
SCOREBOARD_X + 22,
num
);
sprintf( num, "%3d", wins.count0.horizontal );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count0.horizontal );
mvaddstr(
SCOREBOARD_Y + 4,
SCOREBOARD_X + 17,
num
);
sprintf( num, "%3d", wins.count1.horizontal );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count1.horizontal );
mvaddstr(
SCOREBOARD_Y + 4,
SCOREBOARD_X + 22,
num
);
sprintf( num, "%3d", wins.count0.diagonalUp );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count0.diagonalUp );
mvaddstr(
SCOREBOARD_Y + 5,
SCOREBOARD_X + 17,
num
);
sprintf( num, "%3d", wins.count1.diagonalUp );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count1.diagonalUp );
mvaddstr(
SCOREBOARD_Y + 5,
SCOREBOARD_X + 22,
num
);
sprintf( num, "%3d", wins.count0.diagonalDown );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count0.diagonalDown );
mvaddstr(
SCOREBOARD_Y + 6,
SCOREBOARD_X + 17,
num
);
sprintf( num, "%3d", wins.count1.diagonalDown );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count1.diagonalDown );
mvaddstr(
SCOREBOARD_Y + 6,
SCOREBOARD_X + 22,
num
);
sprintf( num, "%3d", wins.count0.total );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count0.total );
mvaddstr(
SCOREBOARD_Y + 8,
SCOREBOARD_X + 17,
num
);
sprintf( num, "%3d", wins.count1.total );
snprintf( num, sizeof(num), WININT_FORMAT, wins.count1.total );
mvaddstr(
SCOREBOARD_Y + 8,
SCOREBOARD_X + 22,
@ -206,7 +210,7 @@ void updateBoard(
int askColumn(
const board_t board
){
int column = 0;
columnsint_t column = 0;
#ifdef ARROWS
move( BOARD_Y, BOARD_X );
if( board.player ) addstr( "p1" );