X-Git-Url: https://git.piment-noir.org/?p=TD_C.git;a=blobdiff_plain;f=TP_13%2Fexo2%2Flib%2Fdisplay.c;h=c04b51b1feb5e4ae0dfebbd2d258503e362d3891;hp=1e5def8f66dc154056b67e1e4defcc6661ee732a;hb=8f8629b25f848dcf37e4786e4c3d5af60e3de37f;hpb=093e45f1ff41d6a43353cf77cb522a0e9e12c811 diff --git a/TP_13/exo2/lib/display.c b/TP_13/exo2/lib/display.c index 1e5def8..c04b51b 100644 --- a/TP_13/exo2/lib/display.c +++ b/TP_13/exo2/lib/display.c @@ -23,7 +23,9 @@ /* in all print routine, y and x are the coordinates of the first character of the shape * which can be a space ' ' */ +/* FIXME: one can split this shape in building blocks and build it using them */ void print_board(int y, int x) { + mvprintw(y, x, " | |"); mvprintw(y+1, x, " | |"); mvprintw(y+2, x, "----+----+----"); @@ -47,12 +49,14 @@ void print_board(int y, int x) { * The added (y, x) couple values can be {0, 3, 6}x{1, 6, 11} */ -void print_x(int y, int x) { +static void print_x(int y, int x) { + mvprintw(y, x, "\\/"); mvprintw(y+1, x,"/\\"); } -void print_o(int y, int x) { +static void print_o(int y, int x) { + mvprintw(y, x, "/\\"); mvprintw(y+1, x, "\\/"); } @@ -61,6 +65,7 @@ void print_o(int y, int x) { * 2 -> +3 2 -> +6 * 3 -> +6 3 -> +11 */ static int remap_y(int y) { + if (y == 1) { return 0; } else if (y == 2) { @@ -71,6 +76,7 @@ static int remap_y(int y) { } static int remap_x(int x) { + if (x == 1) { return 1; } else if (x == 2) { @@ -82,6 +88,7 @@ static int remap_x(int x) { void print_coordinates(coordinates_t coordinates_array[], int base_y, int base_x) { unsigned i = 0; + while ((coordinates_array + i)->y != 0 && (coordinates_array + i)->x != 0) { if ((coordinates_array + i)->type == 0) { print_o(base_y + remap_y((coordinates_array + i)->y), base_x + remap_x((coordinates_array + i)->x));