From 554567e0cf94a4c2917f04a5c9cb9ff348d9edb4 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 2 Aug 2020 13:01:55 +0200
Subject: [PATCH] fixed some potential issues with arb

---
 bigstuff.cpp | 2 +-
 cell.cpp     | 4 ++--
 pattern2.cpp | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bigstuff.cpp b/bigstuff.cpp
index 01c45c7f..989e1561 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -1376,7 +1376,7 @@ EX int wallchance(cell *c, bool deepOcean) {
 /** should we generate the horocycles in the current geometry? */
 EX bool horo_ok() {  
   if(INVERSE) return false;
-  return hyperbolic && !bt::in() && !arcm::in() && !kite::in() && !experimental && !hybri;
+  return hyperbolic && !bt::in() && !arcm::in() && !kite::in() && !experimental && !hybri && !arb::in();
   }
 
 EX bool gp_wall_test() {
diff --git a/cell.cpp b/cell.cpp
index 07fdc140..d407713f 100644
--- a/cell.cpp
+++ b/cell.cpp
@@ -477,7 +477,7 @@ EX int celldist(cell *c) {
   #if CAP_IRR
   if(IRREGULAR) return irr::celldist(c, false);
   #endif
-  if(arcm::in() || ctof(c)) return c->master->distance;
+  if(arcm::in() || ctof(c) || arb::in()) return c->master->distance;
   #if CAP_GP
   if(INVERSE) {
     cell *c1 = gp::get_mapped(c);
@@ -1116,7 +1116,7 @@ EX int celldistance(cell *c1, cell *c2) {
     return euc::cyldist(euc2_coordinates(c1), euc2_coordinates(c2));
     }
 
-  if(arcm::in() || quotient || sn::in() || (kite::in() && euclid) || experimental || sl2 || nil) 
+  if(arcm::in() || quotient || sn::in() || (kite::in() && euclid) || experimental || sl2 || nil || arb::in()) 
     return clueless_celldistance(c1, c2);
    
    if(S3 >= OINF) return inforder::celldistance(c1, c2);
diff --git a/pattern2.cpp b/pattern2.cpp
index 1e6d3a94..427cf21d 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -383,6 +383,7 @@ EX pair<int, bool> fieldval(cell *c) {
 EX int fieldval_uniq(cell *c) {
   if(fake::in()) return FPIU(fieldval_uniq(c));
   if(experimental) return 0;
+  else if(arb::in()) return arb::id_of(c->master);
   else if(hybri) { 
     auto c1 = hybrid::get_where(c).first; 
     return PIU ( fieldval_uniq(c1) );