From 9a7cf9bb4f401c87715b4fb8fc2993d55fa674b4 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Tue, 6 May 2025 13:01:32 +0200
Subject: [PATCH] more fix to floorshapes

---
 floorshapes.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/floorshapes.cpp b/floorshapes.cpp
index db1cbed1..89f1a035 100644
--- a/floorshapes.cpp
+++ b/floorshapes.cpp
@@ -413,7 +413,7 @@ void geometry_information::generate_floorshapes_for(int id, cell *c) {
     }
 
   else if(GOLDBERG_INV) {
-    siid = cgi.gpdata->id_to_params[id][0];
+    siid = cgi.gpdata->id_to_params[id][0] == 1;
     sidir = cgi.gpdata->id_to_params[id][1];
     }
 
@@ -836,11 +836,12 @@ EX namespace gp {
       current_li = get_local_info(c);
       }
     int siid, sidir;
+    // note: this siid can equal 2! it should be treated as 0 by floorshapes
     cell *c1 = c;
     auto f = [&] {
       if(geosupport_threecolor() == 2) {
         auto si = patterns::getpatterninfo(c1, patterns::PAT_COLORING, patterns::SPF_NO_SUBCODES);
-        siid = !(si.id>>2);
+        siid = si.id>>2; siid++; if(siid == 3) siid = 0;
         if((si.id>>2) == 1) si.dir++;
         sidir = c1->c.fix(si.dir);
         }