1 files changed, 7 insertions, 1 deletions

@@ -31,6 +31,7 @@ private:
     void ReadExtras(Puzzle& p);
     void ReadDecorations(Puzzle& p, int id);
     void ReadSequence(Puzzle& p, int id);
+    void ReadSymmetry(Puzzle& p, int id);
 
     void WriteIntersections(const Puzzle& p);
     void WriteDots(const Puzzle& p);
@@ -38,9 +39,11 @@ private:
     void WriteEndpoints(const Puzzle& p);
     void WriteDecorations(const Puzzle& p, int id);
     void WriteSequence(const Puzzle& p, int id);
+    void WriteSymmetry(const Puzzle& p, int id);
 
     std::tuple<int, int> loc_to_xy(const Puzzle& p, int location) const;
     int xy_to_loc(const Puzzle& p, int x, int y) const;
+    int extra_xy_to_loc(Pos pos) const;
     // Decoration location
     std::tuple<int, int> dloc_to_xy(const Puzzle& p, int location) const;
     int xy_to_dloc(const Puzzle& p, int x, int y) const;
@@ -49,14 +52,17 @@ private:
     Cell::Dot FlagsToDot(int flags) const;
     // Iterate connection lists for another location which is connected to us; return that other location.
     int FindConnection(int location) const;
+    void AddIntersection(int x, int y, float xPos, float yPos, int flags);
 
     std::shared_ptr<Memory> _memory;
 
     std::vector<float> _intersectionLocations;
+    int _numIntersections;
     std::vector<int> _intersectionFlags;
     std::vector<int> _connectionsA;
     std::vector<int> _connectionsB;
-    std::vector<std::tuple<int, int, int>> _endpointLocations;
+    // Locations of non-grid points, i.e. dots, gaps, and endpoints
+    std::vector<std::tuple<int, int, int>> _extraLocations;
 
     float MIN, MAX, WIDTH_INTERVAL, HEIGHT_INTERVAL, HORIZ_GAP_SIZE, VERTI_GAP_SIZE;
 };