From d6a5564602e587a17e2b90998acef41a54ca24a1 Mon Sep 17 00:00:00 2001 From: Noah69420 Date: Sun, 15 Dec 2024 23:01:31 +0100 Subject: [PATCH] bug fix --- src/pipes_test.c | 142 +++++++++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 61 deletions(-) diff --git a/src/pipes_test.c b/src/pipes_test.c index bb148a5..0b0c736 100644 --- a/src/pipes_test.c +++ b/src/pipes_test.c @@ -63,7 +63,7 @@ int getch_pipes(){ } #endif -void print_grid(int x, int y, char **grid, int how_many_targets) { +int print_grid(int x, int y, char **grid, int how_many_targets, int *lul) { int target_count = 0; for (int i = 0; i < y; i++) { printf("\n"); @@ -76,7 +76,7 @@ void print_grid(int x, int y, char **grid, int how_many_targets) { } else if(grid[i][j] == 3){ printf("%s█","\033[31m" ); } else if(grid[i][j] != 0 && grid[i][j] != 1 && grid[i][j] != 2 && grid[i][j] != 3){ - return; + return 1; } else if(grid[i - 1][j] == 0 && grid[i + 1][j] == 0 && grid[i][j - 1] != 0 && grid[i][j + 1] != 0 && grid[i][j] == 1 ){ printf("%s━", color); @@ -183,68 +183,86 @@ void print_grid(int x, int y, char **grid, int how_many_targets) { printf(" █ █ █ █ █ █ ██ █ █ █ █ ███\n"); printf(" █ █████ █████ █ █ █████ █ ██\n"); printf("\n"); - printf("Targets overritten: %i\n", 8*how_many_targets-target_count); + printf("Targets overritten: %i\n", 2*how_many_targets-target_count); if (target_count > 3) { printf("\nspecial achivement!!!!!!\n"); + printf("'q' for start menue"); + return 1; } else { + *lul += 1; + printf("lul = %i\n", *lul); system("xdg-open https://bit.ly/3BlS71b"); + printf("'q' for start menue"); + return 1; } - printf("'q' for start menue"); - return; } + return 0; } -void generate_pipe_x(int GRID_GROESSE_X, int GRID_GROESSE_Y, char **grid, int *x_start, int *y_start, int laenge, int how_many_targets) { - if(laenge < 0){ +int generate_pipe_x(int GRID_GROESSE_X, int GRID_GROESSE_Y, char **grid, int *x_start, int *y_start, int laenge, int how_many_targets, int *return_code, int *lul) { + if (laenge < 0){ for (int i = *x_start; i > *x_start + laenge; i--) { + if (*return_code == 1) { + return 0; + } if (i <= -laenge/2 -1) { *x_start = GRID_GROESSE_X + laenge/2; - return; + return 0; } grid[*y_start][i] = INFILL_X_PIPE; printf("\33[H\033[J"); - print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets); + *return_code = print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets, lul); } - } else{ + } else { for (int i = *x_start; i < *x_start + laenge; i++) { + if (*return_code == 1) { + return 0; + } if (i >= GRID_GROESSE_X - laenge/2+1) { *x_start = laenge/2; - return; + return 0; } grid[*y_start][i] = INFILL_X_PIPE; printf("\33[H\033[J"); - print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets); + *return_code = print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets, lul); } } *x_start += laenge; + return 0; } -void generate_pipe_y(int GRID_GROESSE_X, int GRID_GROESSE_Y, char **grid, int *x_start, int *y_start, int laenge, int how_many_targets) { - if(laenge < 0){ +int generate_pipe_y(int GRID_GROESSE_X, int GRID_GROESSE_Y, char **grid, int *x_start, int *y_start, int laenge, int how_many_targets, int *return_code, int *lul) { + if (laenge < 0){ for (int i = *y_start; i > *y_start + laenge/2; i--) { + if (*return_code == 1) { + return 0; + } if (i <= -laenge/2) { *y_start = GRID_GROESSE_Y + laenge/2; - return; + return 0; } grid[i][*x_start] = INFILL_Y_PIPE; printf("\33[H\033[J"); - print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets); + *return_code = print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets, lul); } } else{ for (int i = *y_start; i < *y_start + laenge/2; i++) { + if (*return_code == 1) { + return 0; + } if (i >= (GRID_GROESSE_Y / 2)*2 - 1) { *y_start = laenge/2; - return; + return 0; } grid[i][*x_start] = INFILL_Y_PIPE; printf("\33[H\033[J"); - print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets); + *return_code = print_grid(GRID_GROESSE_X, GRID_GROESSE_Y, grid, how_many_targets, lul); } } - *y_start += laenge/2; + return 0; } void generate_target(int GRID_GROESSE_X, int GRID_GROESSE_Y, char **grid, int *x_start, int *y_start, int laenge) { @@ -267,7 +285,7 @@ void generate_target(int GRID_GROESSE_X, int GRID_GROESSE_Y, char **grid, int *x int pipes(int GRID_GROESSE_X, int GRID_GROESSE_Y) { //int main() { // system("chcp 65001 >null"); -// int GRID_GROESSE_X = 120; // x:y -> 2:1 for a square looking grid +// int GRID_GROESSE_X = 100; // x:y -> 2:1 for a square looking grid // int GRID_GROESSE_Y = 60; int x_start = GRID_GROESSE_X / 2; @@ -276,6 +294,8 @@ int pipes(int GRID_GROESSE_X, int GRID_GROESSE_Y) { int max_l = MAX_LAENGE_PIPE + 1 - MIN_LAENGE_PIPE; int min_l = MIN_LAENGE_PIPE - 1; int color_c_p = COLOR_CHANGING_PROBABILITY + 1; + int return_code = 0; + int lul = 0; srand(time(NULL)); random_color(); @@ -291,14 +311,14 @@ int pipes(int GRID_GROESSE_X, int GRID_GROESSE_Y) { } } - int richtungswechsler = 1; + // int richtungswechsler = 1; int how_many_targets = 3; for (int i = 1; i <= how_many_targets; i++) { generate_target(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge); } - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, 1, how_many_targets); + return_code = generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, 1, how_many_targets, &return_code, &lul); - while (!DEBUGGER_RANDOM) { + if (!DEBUGGER_RANDOM) { while (!AUTOMATISCH) { if ((rand() %color_c_p) <= 1) { @@ -313,50 +333,50 @@ int pipes(int GRID_GROESSE_X, int GRID_GROESSE_Y) { char key_input = (char)getch(); #endif switch (key_input) { - case 'h': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets); break; - case 'a': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets); break; - case 'l': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); break; - case 'd': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); break; - case 'j': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); break; - case 's': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); break; - case 'k': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets); break; - case 'w': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets); break; + case 'h': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets, &return_code, &lul); break; + case 'a': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets, &return_code, &lul); break; + case 'l': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets, &return_code, &lul); break; + case 'd': generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets, &return_code, &lul); break; + case 'j': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets, &return_code, &lul); break; + case 's': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets, &return_code, &lul); break; + case 'k': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets, &return_code, &lul); break; + case 'w': generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets, &return_code, &lul); break; case 'q': return 0; default: continue; } } - while (AUTOMATISCH) { - if ((rand() %color_c_p) <= 1) { - random_color(); - } - if ((rand() %2)-1) { - laenge = ((rand() %max_l)+min_l); - } else { - laenge = ((rand() %max_l)+min_l)*-1; - } - - if (richtungswechsler == 1) { - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); - richtungswechsler *= -1; - } else { - generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); - richtungswechsler *= -1; - } - } - } - - if (DEBUGGER_RANDOM) { - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); - generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); - generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -0.1, how_many_targets); - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1.05, how_many_targets); - generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets); - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * 0.1, how_many_targets); - generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * 0.9, how_many_targets); - generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); +// while (AUTOMATISCH) { +// if ((rand() %color_c_p) <= 1) { +// random_color(); +// } +// if ((rand() %2)-1) { +// laenge = ((rand() %max_l)+min_l); +// } else { +// laenge = ((rand() %max_l)+min_l)*-1; +// } +// +// if (richtungswechsler == 1) { +// generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); +// richtungswechsler *= -1; +// } else { +// generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); +// richtungswechsler *= -1; +// } +// } +// } +// +// if (DEBUGGER_RANDOM) { +// generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); +// generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); +// generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); +// generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -0.1, how_many_targets); +// generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1.05, how_many_targets); +// generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * -1, how_many_targets); +// generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * 0.1, how_many_targets); +// generate_pipe_y(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge * 0.9, how_many_targets); +// generate_pipe_x(GRID_GROESSE_X, GRID_GROESSE_Y, grid, &x_start, &y_start, laenge, how_many_targets); }