From 6627896dba18252d122d7b4bbfc152a1521f52e2 Mon Sep 17 00:00:00 2001 From: Racoonicorn Date: Tue, 27 Dec 2016 14:00:59 +0100 Subject: [PATCH] Code cleanup --- Roofus.c | 332 ++++++++++++++++++++++++------------------------------- 1 file changed, 144 insertions(+), 188 deletions(-) diff --git a/Roofus.c b/Roofus.c index 513dfba..972dedc 100644 --- a/Roofus.c +++ b/Roofus.c @@ -1,4 +1,4 @@ -#define VERSION "1.02" +#define VERSION "1.03" #define N 9 #define USERNAME_LENGTH 10 @@ -7,7 +7,6 @@ #include #include #include - #include void restoregrid (); @@ -31,68 +30,60 @@ int gridset = 0; FILE *fp; int main () { - initscr(); - noecho(); - cbreak(); - keypad(stdscr, true); + initscr (); + noecho (); + cbreak (); + keypad (stdscr, true); - if (has_colors() == TRUE) { - start_color(); - init_pair(1, COLOR_BLACK, COLOR_WHITE); + if (has_colors () == TRUE) { + start_color (); + init_pair (1, COLOR_BLACK, COLOR_WHITE); } - srand (time(NULL)); + srand (time (NULL)); fp = fopen ("roofus.txt", "a+"); if (fp == NULL) { printw ("Error opening file"); - refresh(); - }else{ + refresh (); + } else { restoregrid (); menu (); } fclose (fp); - printw ("\n\n\n\nRoofus v%s", VERSION); - refresh (); - endwin(); + endwin (); return 0; } // restore last grid size void restoregrid () { int gridtemp, length; - fseek(fp, 0, SEEK_END); - length = ftell(fp); - fseek(fp, (length - 2), SEEK_SET); // go to grid size character - gridtemp = fgetc(fp) - 48; // -48 to convert char in int + fseek (fp, 0, SEEK_END); + length = ftell (fp); + fseek (fp, (length - 2), SEEK_SET); // go to grid size character + gridtemp = fgetc (fp) - '0'; // convert char to int if (gridtemp < 3 || gridtemp > 9) grid = 5; else grid = gridtemp; } -void menu (){ - int mode; - +void menu () { while (1) { - clear(); - printw ("~~~ ROOFUS ~~~\n\n[1] Play\n[2] Ranking\n[3] Settings\n[4] Rules\n[q] Quit\n\n"); - refresh(); - mode = getch(); - - switch (mode) { - case 'q': return; - case '1': play (); break; - case '2': ranking (); break; - case '3': settings (); break; - case '4': rules (); break; + clear (); + printw ("~~~ ROOFUS %dx%d ~~~\n\n[1] Play\n[2] Ranking\n[3] Settings\n[4] Rules\n[q] Quit\n\nv%s\n\n", grid, grid, VERSION); + refresh (); + switch (getch ()) { + case 'q': return; + case '1': play (); break; + case '2': ranking (); break; + case '3': settings (); break; + case '4': rules (); break; } } - /* return 0; */ } void play () { char user[USERNAME_LENGTH]; int direction; - int exit = 0; int end = 0; char *text = malloc (sizeof (text) * N); moves = 0; @@ -100,36 +91,35 @@ void play () { my_x = grid / 2; my_y = grid / 2; start (); - while (end == 0) { printw ("\nArrow to move, q to quit\n"); refresh(); - - direction = getch(); + direction = getch (); if (direction == 'q') { printw ("\nAre you sure? [y/n] "); - refresh(); - exit = getch(); - if (exit == 'y') { + refresh (); + if (getch () == 'y') { return; } else { - direction = '1'; - getchar (); + direction = 0; } } - - move_ptr (direction); - printm (); - end = win (); - if (end != 0) { - echo(); - printw ("Enter your name: "); - refresh(); - getnstr(user, USERNAME_LENGTH); // read at most + if (direction != 0) { + move_ptr (direction); + printm (); + end = win (); + if (end != 0) { + echo (); + printw ("Enter your name: "); + refresh (); + getnstr (user, USERNAME_LENGTH); // read at most + noecho (); + } + } else { + printm (); } } - sprintf (text, "%li %d %s %d\n", time(NULL), moves, user, grid); - refresh(); + sprintf (text, "%li %d %s %d\n", time (NULL), moves, user, grid); fputs (text, fp); free (text); return; @@ -143,98 +133,72 @@ void start () { } } nolow (); - printm(); + printm (); } +// move pointer void move_ptr (int direction) { int xinit = my_x, yinit = my_y; - int stop = 0, del = 0; - int i, j; - // move_ptr pointer - switch (direction) { - case KEY_LEFT: - if (my_x != 0) { - my_x--; - } else { - stop = 1; - } - break; - case KEY_RIGHT: - if (my_x < grid - 1) { - my_x++; - } else { - stop = 1; - } - break; - case KEY_UP: - if (my_y > 0) { - my_y--; - } else { - stop = 1; - } - break; - case KEY_DOWN: - if(my_y < grid - 1) { - my_y++; - } else { - stop = 1; - } - break; - default: - stop = 1; - break; - } - if (stop == 0) { - // change values - if (direction == KEY_RIGHT) { - for (j = my_x; j < grid; j++) { - if (matrix[my_y][j] != 0) { - matrix[my_y][j] = matrix[my_y][j] - matrix[yinit][xinit]; - if (matrix[my_y][j] == 0) - del = 1; - if (matrix[my_y][j] < 0 && matrix[yinit][xinit] != 0) - matrix[my_y][j] = -matrix[my_y][j]; - } - } - } - if (direction == KEY_LEFT) { - for (j = 0; j < xinit; j++) { - if (matrix[my_y][j] != 0) { - matrix[my_y][j] = matrix[my_y][j] - matrix[my_y][xinit]; - if (matrix[my_y][j] == 0) - del = 1; - if (matrix[my_y][j] < 0 && matrix[yinit][xinit] != 0) - matrix[my_y][j] = - matrix[my_y][j]; - } - } - } - if (direction == KEY_UP){ - for (i = my_y; i >= 0; i--) { - if (matrix[i][my_x] != 0) { - matrix[i][my_x] = matrix[i][my_x] - matrix[yinit][xinit]; - if (matrix[i][my_x] == 0) - del = 1; - if (matrix[i][my_x] < 0 && matrix[yinit][xinit] != 0) - matrix[i][my_x] = -matrix[i][my_x]; - } - } - } - if (direction == KEY_DOWN){ - for (i = my_y; i < grid; i++) { - if(matrix[i][my_x] != 0) { - matrix[i][my_x] = matrix[i][my_x] - matrix[yinit][xinit]; - if (matrix[i][my_x] == 0) - del = 1; - if (matrix[i][my_x] < 0 && matrix[yinit][xinit] != 0) - matrix[i][my_x] = -matrix[i][my_x]; - } - } - } - if (del == 1) - matrix[yinit][xinit] = 0; - nolow (); - moves++; + int i, j, del = 0; + switch (direction) { + case KEY_LEFT: + if (my_x != 0) { + my_x--; + for (j = 0; j < xinit; j++) { + if (matrix[my_y][j] != 0) { + matrix[my_y][j] = matrix[my_y][j] - matrix[my_y][xinit]; + if (matrix[my_y][j] == 0) + del = 1; + if (matrix[my_y][j] < 0 && matrix[yinit][xinit] != 0) + matrix[my_y][j] = - matrix[my_y][j]; + } + } + } break; + case KEY_RIGHT: + if (my_x < grid - 1) { + my_x++; + for (j = my_x; j < grid; j++) { + if (matrix[my_y][j] != 0) { + matrix[my_y][j] = matrix[my_y][j] - matrix[yinit][xinit]; + if (matrix[my_y][j] == 0) + del = 1; + if (matrix[my_y][j] < 0 && matrix[yinit][xinit] != 0) + matrix[my_y][j] = -matrix[my_y][j]; + } + } + } break; + case KEY_UP: + if (my_y > 0) { + my_y--; + for (i = my_y; i >= 0; i--) { + if (matrix[i][my_x] != 0) { + matrix[i][my_x] = matrix[i][my_x] - matrix[yinit][xinit]; + if (matrix[i][my_x] == 0) + del = 1; + if (matrix[i][my_x] < 0 && matrix[yinit][xinit] != 0) + matrix[i][my_x] = -matrix[i][my_x]; + } + } + } break; + case KEY_DOWN: + if (my_y < grid - 1) { + my_y++; + for (i = my_y; i < grid; i++) { + if(matrix[i][my_x] != 0) { + matrix[i][my_x] = matrix[i][my_x] - matrix[yinit][xinit]; + if (matrix[i][my_x] == 0) + del = 1; + if (matrix[i][my_x] < 0 && matrix[yinit][xinit] != 0) + matrix[i][my_x] = -matrix[i][my_x]; + } + } + } break; + default: return; } + if (del == 1) + matrix[yinit][xinit] = 0; + nolow (); + moves++; } // if 1 or 2 -> random number @@ -249,25 +213,22 @@ void nolow () { } void settings () { - int setting; int menu = 0; - clear(); - printw ("> Settings\n\n"); while (menu == 0) { - printw ("Menu [q]\nGrid size? [3-9]"); - refresh(); - setting = getch(); - switch (setting) { - case 'q': menu = 1; break; - case '3': grid = 3; gridset = 1; menu = 1; break; - case '4': grid = 4; gridset = 1; menu = 1; break; - case '5': grid = 5; gridset = 1; menu = 1; break; - case '6': grid = 6; gridset = 1; menu = 1; break; - case '7': grid = 7; gridset = 1; menu = 1; break; - case '8': grid = 8; gridset = 1; menu = 1; break; - case '9': grid = 9; gridset = 1; menu = 1; break; - default: printw("Retry\n"); break; - refresh(); + clear (); + printw ("> Settings\n\n"); + printw ("Menu [q]\nGrid size? [3-9] "); + refresh (); + switch (getch ()) { + case 'q': menu = 1; break; + case '3': grid = 3; gridset = 1; menu = 1; break; + case '4': grid = 4; gridset = 1; menu = 1; break; + case '5': grid = 5; gridset = 1; menu = 1; break; + case '6': grid = 6; gridset = 1; menu = 1; break; + case '7': grid = 7; gridset = 1; menu = 1; break; + case '8': grid = 8; gridset = 1; menu = 1; break; + case '9': grid = 9; gridset = 1; menu = 1; break; + default: break; } } } @@ -288,7 +249,7 @@ void ranking () { rewind (fp); do { fscanf (fp, "%li %d %s %d", &result[i].res_time, &result[i].moves, result[i].user, &result[i].grid); - i++; + i++; } while (result[i-1].moves > 0); for (i = 0; result[i].moves != 0; i++) { for (j = i + 1; result[j].moves != 0; j++) { @@ -300,96 +261,91 @@ void ranking () { } } do { - clear(); - if (grid_val >= 3 && grid_val <= 9) - { + clear (); + if (grid_val >= 3 && grid_val <= 9) { printw ("Best results (%dx%d matrix):\n\n", grid_val, grid_val); - refresh(); - } - else if (grid_val == 1) + refresh (); + } else if (grid_val == 1) printw ("Best results:\n\n"); printed = 0; for (i = 0; result[i].moves != 0; i++) { if ((result[i].grid == grid_val || grid_val == 1) && printed < 9) { - time_string[i] = ctime(&result[i].res_time); + time_string[i] = ctime (&result[i].res_time); printw ("# %d - %3d moves\t- (%dx%d matrix) - %s\t- %s", printed + 1, result[i].moves, result[i].grid, result[i].grid, result[i].user, time_string[i]); - refresh(); + refresh (); printed++; } } if (printed == 0) { printw ("Nothing to show...\n"); - refresh(); + refresh (); } printw ("\nMenu [q]; To filter by matrix size [3-9]; No filter [1] "); - refresh(); - + refresh (); do { - grid_val = getch() - '0'; - // exit with 'q' - '0' + grid_val = getch () - '0'; } while ((grid_val < 3 || grid_val > 9) && grid_val != 1 && grid_val != 'q'-'0'); } while (grid_val != ('q'-'0')); } void rules () { - clear(); + clear (); printw ("> Rules\n\n"); printw ("Delete numbers on the table by moving the pointer.\n"); printw ("That's all you need to know\n"); - refresh(); - getch(); + refresh (); + getch (); } // print matrix void printm () { int i, j; - clear(); + clear (); printw ("\n\n"); for (i = 0; i < grid; i++) { for (j = 0;j < grid; j++) { if (i == my_y && j == my_x) { - if (has_colors() == TRUE) { - attron(COLOR_PAIR(1)); + if (has_colors () == TRUE) { + attron (COLOR_PAIR (1)); } else { printw ("> "); } } if (matrix[i][j] != 0) - printw ("%d", matrix[i][j]); + printw ("%2d", matrix[i][j]); else { - if (has_colors() == FALSE) { + if (has_colors () == FALSE) { printw (" "); } else { - printw("."); + printw (" ."); } } - if (has_colors() == TRUE) { - attroff(COLOR_PAIR(1)); + if (has_colors () == TRUE) { + attroff (COLOR_PAIR (1)); } printw("\t"); } printw ("\n\n"); } - refresh(); + refresh (); } int win () { - int i, j, count=0; + int i, j, count = 0; for (i = 0; i < grid; i++) { for (j = 0; j < grid; j++) { if (matrix[i][j] == 0) count++; } } - if (count >= grid * (grid - 1)) { printw ("\nYou win! Moves: %d\n", moves); refresh (); getchar (); return 1; - }else{ + } else { printw ("\nYou still need to delete %d numbers. Moves: %d", grid * (grid - 1) - count, moves); - refresh(); + refresh (); return 0; } }