From 19a01caf559cbb7000e5166dd8ece97b9365f77f Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 10 Aug 2019 00:11:11 +0200
Subject: [PATCH] moved ctof to pattern2

---
 graph.cpp    | 16 ----------------
 pattern2.cpp | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/graph.cpp b/graph.cpp
index ebf18e10..da3f3ff3 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -205,22 +205,6 @@ void drawSpeed(const transmatrix& V) {
 #endif
   }
 
-EX int ctof(cell *c) {
-  #if CAP_IRR
-  if(IRREGULAR) return irr::ctof(c);
-  #endif
-  if(PURE) return 1;
-  // if(euclid) return 0;
-  if(!c) return 1;
-  if(binarytiling) return c->type == 7;
-  return ishept(c) ? 1 : 0;
-  // c->type == 6 ? 0 : 1;
-  }
-
-int ctof012(cell *c) {
-  return ishept(c)?1:ishex1(c)?0:2;
-  }
-
 void drawSafety(const transmatrix& V, int ct) {
 #if CAP_QUEUE
   ld ds = ptick(50);
diff --git a/pattern2.cpp b/pattern2.cpp
index db979425..57700140 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -4,6 +4,22 @@
 
 namespace hr {
 
+EX int ctof(cell *c) {
+  #if CAP_IRR
+  if(IRREGULAR) return irr::ctof(c);
+  #endif
+  if(PURE) return 1;
+  // if(euclid) return 0;
+  if(!c) return 1;
+  if(binarytiling) return c->type == 7;
+  return ishept(c) ? 1 : 0;
+  // c->type == 6 ? 0 : 1;
+  }
+
+EX int ctof012(cell *c) {
+  return ishept(c)?1:ishex1(c)?0:2;
+  }
+
 int gp_threecolor() {
   if(!GOLDBERG) return 0;
   #if CAP_GP