diff options
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 57 |
1 files changed, 29 insertions, 28 deletions
@@ -70,11 +70,11 @@ string *fillBoard(Grid grid) { tmp = (*(grid.getPieces()))[ix]; name = tmp.getName(); - row = tmp.getRow(); - col = tmp.getCol(); - w = tmp.getW(); - h = tmp.getH(); - dir = tmp.getDir(); + row = tmp.getRow(); + col = tmp.getCol(); + w = tmp.getW(); + h = tmp.getH(); + dir = tmp.getDir(); int j; offset = (grid_w * (row-1)) + col; @@ -122,11 +122,11 @@ void printGrid(Grid grid) { tmp = (*(grid.getPieces()))[ix]; name = tmp.getName(); - row = tmp.getRow(); - col = tmp.getCol(); - w = tmp.getW(); - h = tmp.getH(); - dir = tmp.getDir(); + row = tmp.getRow(); + col = tmp.getCol(); + w = tmp.getW(); + h = tmp.getH(); + dir = tmp.getDir(); int j; offset = (grid_w * (row-1)) + col; @@ -159,32 +159,32 @@ void printGrid(Grid grid) /* load grid from a file */ Grid loadGrid(char **argv) { - FILE *fname = fopen(argv[1], "r"); + FILE *fname = fopen(argv[1], "r"); if (fname == NULL) { perror("fopen"); exit(EXIT_FAILURE); } - Grid grid; - Piece piece_tmp(""); + Grid grid; + Piece piece_tmp(""); /* used for line reading */ size_t line_sz = 0; char *line = NULL; int matched_inputs = 0; - if (getline(&line, &line_sz, fname) != -1) + if (getline(&line, &line_sz, fname) != -1) sscanf(line, "%d %d\n", grid.getRows(), grid.getCols()); - if (*grid.getRows() < 1 || *grid.getCols() < 1) - { - cout << "invalid grid dimensions, read in: " << *grid.getRows() << "h, " - << *grid.getCols() << "w" << endl; - exit(EXIT_FAILURE); - } + if (*grid.getRows() < 1 || *grid.getCols() < 1) + { + cout << "invalid grid dimensions, read in: " << *grid.getRows() << "h, " + << *grid.getCols() << "w" << endl; + exit(EXIT_FAILURE); + } - /* parse grid's dimensions */ + /* parse grid's dimensions */ int piece_row = -1; int piece_col = -1; int piece_w = -1; @@ -198,7 +198,7 @@ Grid loadGrid(char **argv) for (i = 0; getline(&line, &line_sz, fname) != -1; i++) { - matched_inputs = sscanf(line, "%d %d %d %d %c\n", &piece_row, + matched_inputs = sscanf(line, "%d %d %d %d %c\n", &piece_row, &piece_col, &piece_w, &piece_h, &piece_dir); if (matched_inputs != 5) @@ -564,11 +564,11 @@ int main(int argc, char *argv[]) /* seed rand() */ srand((unsigned int ) time(NULL)); - if (argc != 2) - { - cout << "usage: " << argv[0] << " <file>" << endl; - return -1; - } + if (argc != 2) + { + cout << "usage: " << argv[0] << " <file>" << endl; + return -1; + } Grid grid = loadGrid(argv); printGrid(grid); @@ -609,6 +609,7 @@ int main(int argc, char *argv[]) cout << "else" << endl; #endif - cout << "\n\tBye!" << endl; + cout << "\n\tBye!" << endl; return 0; } + |