From e494eb0020dfefb54262d11257a1aaaf3d2049c5 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 13 Apr 2018 13:19:45 +0200
Subject: [PATCH] Fractal landscapes fixed in Goldberg heptagonal geometries

---
 cell.cpp | 14 ++++++++------
 hyper.h  |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cell.cpp b/cell.cpp
index fcee86ac..4f74783e 100644
--- a/cell.cpp
+++ b/cell.cpp
@@ -1318,11 +1318,12 @@ cdata *getEuclidCdata(heptagon *h) {
 int getCdata(cell *c, int j) {
   if(euclid) return getEuclidCdata(c->master)->val[j];
   else if(geometry) return 0;
-  else if(c->type != 6) return getHeptagonCdata(c->master)->val[j]*3;
+  else if(ctof(c)) return getHeptagonCdata(c->master)->val[j]*3;
   else {
     int jj = 0;
-    for(int k=0; k<6; k++) if(c->mov[k] && c->mov[k]->type == 7)
-      jj += getHeptagonCdata(c->mov[k]->master)->val[j];
+    auto ar = gp::get_masters(c);
+    for(int k=0; k<3; k++)
+      jj += getHeptagonCdata(ar[k]->master)->val[j];
     return jj;
     }
   }
@@ -1332,9 +1333,10 @@ int getBits(cell *c) {
   else if(geometry) return 0;
   else if(c->type != 6) return getHeptagonCdata(c->master)->bits;
   else {
-    int b0 = getHeptagonCdata(createMov(c, 0)->master)->bits;
-    int b1 = getHeptagonCdata(createMov(c, 2)->master)->bits;
-    int b2 = getHeptagonCdata(createMov(c, 4)->master)->bits;
+    auto ar = gp::get_masters(c);
+    int b0 = getHeptagonCdata(ar[0]->master)->bits;
+    int b1 = getHeptagonCdata(ar[1]->master)->bits;
+    int b2 = getHeptagonCdata(ar[2]->master)->bits;
     return (b0 & b1) | (b1 & b2) | (b2 & b0);
     }
   }
diff --git a/hyper.h b/hyper.h
index a8346843..57741406 100644
--- a/hyper.h
+++ b/hyper.h
@@ -3026,6 +3026,8 @@ namespace gp {
   int dist_1(), dist_2(), dist_3();
 
   int solve_triangle(int dmain, int d0, int d1, loc at);
+
+  array<cell*, 3> get_masters(cell *c);
   }
 
 int get_sightrange();