From 8672720773ed6b4dec1dc052cc5a761c2f4ef3b2 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 27 Dec 2019 23:01:55 +0100
Subject: [PATCH] fixed the plain graphics for {4,oo}

---
 floorshapes.cpp | 6 ++++--
 geometry.cpp    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/floorshapes.cpp b/floorshapes.cpp
index 3b478973..678319af 100644
--- a/floorshapes.cpp
+++ b/floorshapes.cpp
@@ -251,7 +251,7 @@ template<class T> void sizeto(T& t, int n) {
   if(isize(t) <= n) t.resize(n+1);
   }
 
-void geometry_information::bshape_regular(floorshape &fsh, int id, int sides, int shift, ld size, cell *c) {
+void geometry_information::bshape_regular(floorshape &fsh, int id, int sides, ld shift, ld size, cell *c) {
   
   sizeto(fsh.b, id);
   sizeto(fsh.shadow, id);
@@ -332,8 +332,10 @@ void geometry_information::generate_floorshapes_for(int id, cell *c, int siid, i
       
       for(int k=0; k<SIDEPARS; k++) sizeto(fsh.side[k], id);
       
-      int td = (PURE && !(S7&1)) ? S42+S6 : 0;
+      ld td = (PURE && !(S7&1)) ? S42+S6 : 0;
       if(&fsh == &shBigHepta) td += S6;
+      
+      if(S3 >= OINF && !(S7 & 1)) td = S42 * 1. / S7;
     
       int b = 0;
       if(S3 == 4 && BITRUNCATED) b += S14;
diff --git a/geometry.cpp b/geometry.cpp
index c241047d..544aa8c8 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -339,7 +339,7 @@ hpcshape
   
   void init_floorshapes();
   void bshape2(hpcshape& sh, PPR prio, int shapeid, struct matrixlist& m);
-  void bshape_regular(floorshape &fsh, int id, int sides, int shift, ld size, cell *model);
+  void bshape_regular(floorshape &fsh, int id, int sides, ld shift, ld size, cell *model);
   void generate_floorshapes_for(int id, cell *c, int siid, int sidir);
   void generate_floorshapes();
   void make_floor_textures_here();