diff --git a/floorshapes.cpp b/floorshapes.cpp
index 598d7d13..99a226b4 100644
--- a/floorshapes.cpp
+++ b/floorshapes.cpp
@@ -253,17 +253,17 @@ void bshape_regular(floorshape &fsh, int id, int sides, int shift, ld size) {
   
   bshape(fsh.b[id], fsh.prio);
   for(int t=0; t<=sides; t++)
-    hpcpush(ddi(t*S84 / sides + shift, size) * C0);
+    hpcpush(xspinpush0(t*2 * M_PI / sides + shift, size));
 
   bshape(fsh.shadow[id], fsh.prio);
   for(int t=0; t<=sides; t++)
-    hpcpush(ddi(t*S84 / sides + shift, size * SHADMUL) * C0);
+    hpcpush(xspinpush0(t*2 * M_PI / sides + shift, size * SHADMUL));
 
   for(int k=0; k<SIDEPARS; k++) {
     fsh.side[k].resize(2);
     bshape(fsh.side[k][id], PPR_LAKEWALL);
-    hpcpush(ddi(S42/sides, size) * C0);
-    hpcpush(ddi(-S42/sides, size) * C0);
+    hpcpush(xspinpush0(M_PI/sides, size));
+    hpcpush(xspinpush0(-M_PI/sides, size));
     chasmifyPoly(dlow_table[k], dhi_table[k], k);
     }
   }