X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/7c95608a9a2aa26532f12f8ca41bf2aa1402b4e1..75a52b16f40911f1181c46357379ad9026e9cbc7:/grid.h

diff --git a/grid.h b/grid.h
index 0116074..9adf3a9 100644
--- a/grid.h
+++ b/grid.h
@@ -10,9 +10,7 @@
 #define PUZZLES_GRID_H
 
 /* Useful macros */
-#ifndef SQ
-#  define SQ(x) ( (x) * (x) )
-#endif
+#define SQ(x) ( (x) * (x) )
 
 /* ----------------------------------------------------------------------
  * Grid structures:
@@ -59,11 +57,6 @@ typedef struct grid {
   int num_edges; grid_edge *edges;
   int num_dots;  grid_dot *dots;
 
-  /* Should be a face roughly near the middle of the grid.
-   * Used to seed path-generation, and also for nearest-edge
-   * detection. */
-  grid_face *middle_face;
-
   /* Cache the bounding-box of the grid, so the drawing-code can quickly
    * figure out the proper scaling to draw onto a given area. */
   int lowest_x, lowest_y, highest_x, highest_y;
@@ -88,6 +81,9 @@ grid *grid_new_cairo(int width, int height);
 grid *grid_new_greathexagonal(int width, int height);
 grid *grid_new_octagonal(int width, int height);
 grid *grid_new_kites(int width, int height);
+grid *grid_new_floret(int width, int height);
+grid *grid_new_dodecagonal(int width, int height);
+grid *grid_new_greatdodecagonal(int width, int height);
 
 void grid_free(grid *g);