Be more explicit in Makefiles about external libraries linking

[TD_C.git] / TP_13 / exo2 / lib / display.c

diff --git a/TP_13/exo2/lib/display.c b/TP_13/exo2/lib/display.c
index 22deb96a41a7e7a06ede4fb8462c2d98fecea892..72bd0f5f37e071b639d7da69ac025f0d21956eb4 100644 (file)
--- a/TP_13/exo2/lib/display.c
+++ b/TP_13/exo2/lib/display.c
@@ -18,10 +18,14 @@
 
 #include <ncurses.h>
 
+#include "display.h"
+
 /* 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, "----+----+----");
@@ -42,15 +46,59 @@ void print_board(int y, int x) {
  *            - base_y + 3, base_x + 11 
  *            - base_y + 6, base_x + 6 
  *            - base_y + 6, base_x + 11 
- * The added y value can be {0, 3, 6} 
- * The added x value can be {1, 6, 11} */
+ * The added (y, x) couple values can be {0, 3, 6}x{1, 6, 11}
+ */
+
+static void print_x(int y, int x) {
 
-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, "\\/");
 }
+
+/* y: 1 -> +0  x: 1 -> +1
+ *    2 -> +3     2 -> +6
+ *    3 -> +6     3 -> +11 */
+static int remap_y(int y) {
+
+    if (y == 1) {
+        return 0;
+    } else if (y > 1 && y <= 3) {
+        return (remap_y(y - 1) + 3);
+    }  else {
+        /* FIXME: return an error value like -1
+         * but for now there a bug somewhere */
+        return 6;
+    }
+}
+
+static int remap_x(int x) {
+
+    if (x == 1) {
+        return 1;
+    } else if (x > 1 && x <= 3) {
+        return (remap_x(x - 1) + 5);
+    } else {
+        /* FIXME: return an error value like -1
+         * but for now there a bug somewhere */
+        return 11;
+    }
+}
+
+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));
+        } else {
+            print_x(base_y + remap_y((coordinates_array + i)->y), base_x + remap_x((coordinates_array + i)->x));
+        }
+        i++;
+    }
+}