From acdac858a33fb9b5670154a79ce484631efdcb27 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 18 Feb 2023 18:43:30 +0100
Subject: [PATCH] embedded:: shFloor is now changed to shFullFloor by default;
 also whichShape has other options

---
 celldrawer.cpp | 15 +++++++++++++++
 pattern2.cpp   |  6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/celldrawer.cpp b/celldrawer.cpp
index 2a75e49f..dee49d55 100644
--- a/celldrawer.cpp
+++ b/celldrawer.cpp
@@ -2184,6 +2184,21 @@ void celldrawer::draw_wall_full() {
     else if(among(patterns::whichShape, '9', '^'))
       set_floor(cgi.shFullFloor);
 
+    else if(patterns::whichShape == '5')
+      set_floor(cgi.shFloor);
+
+    else if(patterns::whichShape == '4')
+      set_floor(cgi.shMFloor);
+
+    else if(patterns::whichShape == '3')
+      set_floor(cgi.shMFloor2);
+
+    else if(patterns::whichShape == '2')
+      set_floor(cgi.shMFloor3);
+
+    else if(embedded_plane && qfi.fshape == &cgi.shFloor)
+      set_floor(cgi.shFullFloor);
+
 #if CAP_TEXTURE
     else if(GDIM == 2 && texture::config.apply(c, Vf, darkena(fcol, fd, 0xFF))) ;
 #endif
diff --git a/pattern2.cpp b/pattern2.cpp
index 1f87bea9..d864d666 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -2069,7 +2069,7 @@ EX namespace patterns {
 
     dialog::addBreak(100);
 
-    dialog::addBoolItem_action(XLAT("display the inner walls"), innerwalls, '5');
+    dialog::addBoolItem_action(XLAT("display the inner walls"), innerwalls, '1');
     
     if(geosupport_threecolor() == 2) {    
       dialog::addBoolItem(XLAT("display only hexagons"), (whichShape == '6'), '6');
@@ -2083,6 +2083,8 @@ EX namespace patterns {
       }
 
     dialog::addBoolItem(XLAT("display full floors"), (whichShape == '9'), '9');
+    dialog::addBoolItem(XLAT("display small floors"), (whichShape == '5'), '5');
+
     add_edit(global_boundary_ratio);
     dialog::addSelItem(XLAT("floor type"), XLATN(winf[canvas_default_wall].name), 'i');
 
@@ -2130,7 +2132,7 @@ EX namespace patterns {
           }
         }
       
-      else if(uni == '6' || uni == '7' || uni == '8' || uni == '9') {
+      else if((uni >= '2' && uni <= '9')) {
         if(whichShape == uni) whichShape = 0;
         else whichShape = uni;
         }