Removed __builtin_popcount() from logic by making calcWins() just increment stuff with new wins instead of fully counting everything
This commit is contained in:
parent
a6df3ae0dd
commit
8810175693
2 changed files with 75 additions and 62 deletions
43
connect4.c
43
connect4.c
|
|
@ -45,16 +45,6 @@ extern char _binary_LICENSE_end[];
|
|||
|
||||
int main( int argc, char *argv[] ){
|
||||
// Initialise variables
|
||||
wins_t wins = {
|
||||
.count0 = {
|
||||
.total = 0,
|
||||
.vertical = 0,
|
||||
.horizontal = 0,
|
||||
.diagonalUp = 0,
|
||||
.diagonalDown = 0,
|
||||
},
|
||||
};
|
||||
wins.count1 = wins.count0;
|
||||
board_t playboard = {
|
||||
.player = 0,
|
||||
.rows = BOARD_HEIGHT,
|
||||
|
|
@ -148,18 +138,29 @@ int main( int argc, char *argv[] ){
|
|||
"under certain condtions. See `%s --license`\n", argv[0]
|
||||
);
|
||||
// board, innit?
|
||||
wins_t wins = {
|
||||
.count0 = {
|
||||
.total = 0,
|
||||
.vertical = 0,
|
||||
.horizontal = 0,
|
||||
.diagonalUp = 0,
|
||||
.diagonalDown = 0,
|
||||
},
|
||||
};
|
||||
wins.count1 = wins.count0;
|
||||
// Allocate the board
|
||||
playboard.height = calloc( playboard.columns, sizeof(int) );
|
||||
playboard.column = calloc( playboard.columns, sizeof(int) );
|
||||
wins.win0 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.win1 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.vertical2 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.horizontal2 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.diagonalUp2 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.diagonalDown2 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.vertical4 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.horizontal4 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.diagonalUp4 = calloc( playboard.columns, sizeof(int) );
|
||||
wins.same.diagonalDown4 = calloc( playboard.columns, sizeof(int) );
|
||||
playboard.column = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.win0 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.win1 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.vertical2 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.horizontal2 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.diagonalUp2 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.diagonalDown2 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.vertical4 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.horizontal4 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.diagonalUp4 = calloc( playboard.columns, sizeof(column_t) );
|
||||
wins.same.diagonalDown4 = calloc( playboard.columns, sizeof(column_t) );
|
||||
initBoard( playboard );
|
||||
// Begin loopin
|
||||
for(;; playboard.player = !playboard.player ){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue