From a99be216538310deedaf35229d60e6bb7eabcf27 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 25 Apr 2021 11:10:09 +0200
Subject: [PATCH] clearing in gBinaryTiling

---
 complex.cpp  | 35 +++++++++++++----------------------
 landlock.cpp |  2 +-
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/complex.cpp b/complex.cpp
index 01a9f44b..1fd4448d 100644
--- a/complex.cpp
+++ b/complex.cpp
@@ -835,35 +835,29 @@ EX namespace clearing {
     }
   
   int plantdir(cell *c) {
-    if(!quotient) {
-      currentmap->generateAlts(c->master);
-      for(int i=0; i<S7; i++)
-        currentmap->generateAlts(c->master->move(i));
-      }
+    if(have_alt(c))
+      gen_alt_around(c);
     int d = celldistAlt(c);
     
     if(PURE) {
-      for(int i=0; i<S7; i++) {
-        cell *c2 = createMov(c, i);
+      forCellIdCM(c2, i, c) {
         if(!pseudohept(c2) && celldistAlt(c2) == d-1)
           return i;
         }
-      for(int i=0; i<S7; i++) {
-        cell *c2 = createMov(c, i);
+      forCellIdCM(c2, i, c) {
         if(celldistAlt(c2) == d-1)
-          return (i+1) % S7;
+          return geometry == gBinary4 ? i : (i+1) % c->type;
         }
       }
 
-    for(int i=1; i<S6; i+=2) {
-      cell *c2 = createMov(c, i);
-      if(celldistAlt(c2) == d-1)
+    forCellIdCM(c2, i, c) {
+      if(!pseudohept(c2) && celldistAlt(c2) == d-1)
         return i;
       }
 
     int quseful = 0, tuseful = 0, tuseful2 = 0;
-    for(int i=1; i<S6; i+=2) {
-      cell *c2 = c->move(i);
+
+    forCellIdCM(c2, i, c) if(!pseudohept(c2)) {
       if(celldistAlt(c2) == d) {
         bool useful = false;
         for(int j=1; j<S6; j++) {
@@ -882,7 +876,7 @@ EX namespace clearing {
       if(tuseful == (1<<1)+(1<<3)) i = 1;
       if(tuseful == (1<<5)+(1<<7)) i = 5;
       if(tuseful == (1<<7)+(1<<1)) i = 7;
-      if((d & 7) < 4) i = (i+2) % S6;
+      if((d & 7) < 4) i = (i+2) % c->type;
       return i;
       }
     printf("error in plantdir\n");
@@ -894,10 +888,6 @@ EX namespace clearing {
   vector<cell*> rpath;
     
   EX void generate(cell *c) {
-    if(sphere) return;    
-    if(NONSTDVAR) return;
-    if(quotient) return;
-    
     if(euclid) {
       if(quotient) return; // fix cylinder
       if(pseudohept(c)) return;
@@ -917,10 +907,11 @@ EX namespace clearing {
       return;
       }
     
+    if(!eubinary && !horo_ok()) return;
     // cell *oc = c;
-    if(!euclid) currentmap->generateAlts(c->master);
+    gen_alt(c);
     if(pseudohept(c)) return;
-    heptagon *a = euclid ? NULL : c->master->alt->alt;
+    heptagon *a = eubinary ? NULL : c->master->alt->alt;
     clearingdata& bd(bpdata[a]);
     if(!bd.root) { bd.root = c; bd.dist = 8; bd.buggy = false; }
     if(bd.buggy) return;
diff --git a/landlock.cpp b/landlock.cpp
index 151a0a13..c0616ab3 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -965,7 +965,7 @@ EX land_validity_t& land_validity(eLand l) {
     return not_in_chaos;
   
   if(l == laClearing)
-    if(!(stdeucx || a38 || (a45 && BITRUNCATED) || (a47 && BITRUNCATED)) || NONSTDVAR)
+    if(!(stdeucx || geometry == gBinaryTiling || a38 || (a45 && BITRUNCATED) || (a47 && BITRUNCATED)) || NONSTDVAR)
     if(!bounded)
       return not_implemented;