diff --git a/floorshapes.cpp b/floorshapes.cpp
index d99b2815..359ed96e 100644
--- a/floorshapes.cpp
+++ b/floorshapes.cpp
@@ -35,7 +35,7 @@ void geometry_information::init_floorshapes() {
   
   for(auto s: all_plain_floorshapes) s->is_plain = true;
   
-  auto init_escher = [this] (escher_floorshape& sh, int s0, int s1, int noft=0, int s2=0) {
+  auto init_escher = [this] (escher_floorshape& sh, int s0, int s1, int noft, int s2) {
     sh.shapeid0 = s0;
     sh.shapeid1 = s1;
     sh.noftype = noft;
@@ -45,22 +45,22 @@ void geometry_information::init_floorshapes() {
     all_escher_floorshapes.push_back(&sh);
     };
   
-  init_escher(shStarFloor, 1,2);
-  init_escher(shCloudFloor, 3, 4);
+  init_escher(shStarFloor, 1, 2, 0, 0);
+  init_escher(shCloudFloor, 3, 4, 0, 0);
   init_escher(shCrossFloor, 5, 6, 2, 54);
   init_escher(shChargedFloor, 7, 385, 1, 10);
-  init_escher(shSStarFloor, 11, 12);
+  init_escher(shSStarFloor, 11, 12, 0, 0);
   init_escher(shOverFloor, 13, 15, 1, 14);
   init_escher(shTriFloor, 17, 18, 0, 385);
   init_escher(shFeatherFloor, 19, 21, 1, 20);
   init_escher(shBarrowFloor, 23, 24, 1, 25);
   init_escher(shNewFloor, 26, 27, 2, 54);
-  init_escher(shTrollFloor, 28, 29); 
+  init_escher(shTrollFloor, 28, 29, 0, 0);
   init_escher(shButterflyFloor, 325, 326, 1, 178);
   init_escher(shLavaFloor, 359, 360, 1, 178);
   init_escher(shLavaSeabed, 386, 387, 1, 178);
-  init_escher(shSeabed, 334, 335);
-  init_escher(shCloudSeabed, 336, 337);
+  init_escher(shSeabed, 334, 335, 0, 0);
+  init_escher(shCloudSeabed, 336, 337, 0, 0);
   init_escher(shCaveSeabed, 338, 339, 2, 54);
   init_escher(shPalaceFloor, 45, 46, 0, 385);
   init_escher(shDemonFloor, 51, 50, 1, 178);
@@ -71,7 +71,7 @@ void geometry_information::init_floorshapes() {
   init_escher(shSwitchFloor, 377, 378, 1, 379);
   init_escher(shTurtleFloor, 176, 177, 1, 178);
   for(int i: {0,1,2})
-    init_escher(shRedRockFloor[i], 55, 56);
+    init_escher(shRedRockFloor[i], 55, 56, 0, 0);
   init_escher(shDragonFloor, 181, 182, 2, 183); /* dragon */
   
   int ids = 0;
diff --git a/graph.cpp b/graph.cpp
index dfa33545..5a7884c7 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -750,7 +750,7 @@ EX bool drawItemType(eItem it, cell *c, const transmatrix& V, color_t icol, int
 #else
   char xch = iinf[it].glyph;
   auto sinptick = [c, pticks] (int period) { return c ? sintick(period) : sin(animation_factor * pticks / period);};
-  auto spinptick = [c, pticks] (int period, ld phase=0) { return c ? spintick(period, phase) : spin((animation_factor * pticks + phase) / period); };
+  auto spinptick = [c, pticks] (int period, ld phase) { return c ? spintick(period, phase) : spin((animation_factor * pticks + phase) / period); };
   int ct6 = c ? ctof(c) : 1;
   hpcshape *xsh = 
     (it == itPirate || it == itKraken) ? &cgi.shPirateX :
@@ -805,17 +805,17 @@ EX bool drawItemType(eItem it, cell *c, const transmatrix& V, color_t icol, int
     }
   
   else if(it == itStrongWind) {
-    queuepoly(Vit * spinptick(750), cgi.shFan, darkena(icol, 0, 255));
+    queuepoly(Vit * spinptick(750, 0), cgi.shFan, darkena(icol, 0, 255));
     }
 
   else if(it == itWarning) {
-    queuepoly(Vit * spinptick(750), cgi.shTriangle, darkena(icol, 0, 255));
+    queuepoly(Vit * spinptick(750, 0), cgi.shTriangle, darkena(icol, 0, 255));
     }
     
   else if(it == itBabyTortoise) {
     int bits = c ? tortoise::babymap[c] : tortoise::last;
     int over = c && c->monst == moTortoise;
-    tortoise::draw(Vit * spinptick(5000) * ypush(cgi.crossf*.15), bits, over ? 4 : 2, 0);
+    tortoise::draw(Vit * spinptick(5000, 0) * ypush(cgi.crossf*.15), bits, over ? 4 : 2, 0);
     // queuepoly(Vit, cgi.shHeptaMarker, darkena(tortoise::getMatchColor(bits), 0, 0xC0));
     }
   
@@ -903,12 +903,12 @@ EX bool drawItemType(eItem it, cell *c, const transmatrix& V, color_t icol, int
   
   else if(it == itRose) {
     for(int u=0; u<4; u++)
-      queuepoly(Vit * spinptick(1500) * spin(2*M_PI / 3 / 4 * u), cgi.shRoseItem, darkena(icol, 0, hidden ? 0x30 : 0xA0));
+      queuepoly(Vit * spinptick(1500, 0) * spin(2*M_PI / 3 / 4 * u), cgi.shRoseItem, darkena(icol, 0, hidden ? 0x30 : 0xA0));
     }
 
   else if(it == itBarrow && c) {
     for(int i = 0; i<c->landparam; i++)
-      queuepolyat(Vit * spin(2 * M_PI * i / c->landparam) * xpush(.15) * spinptick(1500), *xsh, darkena(icol, 0, hidden ? 0x40 : 
+      queuepolyat(Vit * spin(2 * M_PI * i / c->landparam) * xpush(.15) * spinptick(1500, 0), *xsh, darkena(icol, 0, hidden ? 0x40 : 
         (highwall(c) && wmspatial) ? 0x60 : 0xFF),
         PPR::HIDDEN);
 
@@ -923,7 +923,7 @@ EX bool drawItemType(eItem it, cell *c, const transmatrix& V, color_t icol, int
     if(it == itLotus) icol = 0x101010;
     if(it == itSwitch) icol = minf[active_switch()].color;
     
-    transmatrix V2 = Vit * spinptick(1500);
+    transmatrix V2 = Vit * spinptick(1500, 0);
   
     if(xsh == &cgi.shBookCover && mmitem) {
       if(GDIM == 3)
@@ -957,11 +957,11 @@ EX bool drawItemType(eItem it, cell *c, const transmatrix& V, color_t icol, int
     color_t col = darkena(icol, 0, int(0x80 + 0x70 * sinptick(300)));
     
     if(it == itOrbFish)
-      queuepolyat(Vit * spinptick(1500), cgi.shFishTail, col, PPR::ITEM_BELOW);
+      queuepolyat(Vit * spinptick(1500, 0), cgi.shFishTail, col, PPR::ITEM_BELOW);
 
     queuepolyat(Vit, cgi.shDisk, darkena(icol1, 0, inice ? 0x80 : hidden ? 0x20 : 0xC0), prio);
 
-    queuepolyat(Vit * spinptick(1500), orbshape(iinf[it].orbshape), col, prio);
+    queuepolyat(Vit * spinptick(1500, 0), orbshape(iinf[it].orbshape), col, prio);
     }
 
   else if(it) return true;