js: Centralise piece_set_zlevel_from

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/templates/script.ts b/templates/script.ts
index 4c5c1638fe5a428b8f8f2a1e8f5b4007e070e0ac..81779308c1f1ec000eea4a8e968b247fa3326e12 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -1299,10 +1299,7 @@ function piece_modify_core(piece: PieceId, p: PieceInfo,
   p.pinned = info.pinned;
   p.moveable = info.moveable;
   p.angle = info.angle;
-  piece_set_zlevel(piece,p, (oldtop_piece)=>{
-    p.z  = info.z;
-    p.zg = info.zg;
-  });
+  piece_set_zlevel_from(piece,p,info);
   let occregions_changed = occregion_update(piece, p, info);
   piece_checkconflict_nrda(piece,p,conflict_expected);
   redisplay_ancillaries(piece,p);
@@ -1414,8 +1411,12 @@ pieceops.Move = <PieceHandler>function
 pieceops.SetZLevel = <PieceHandler>function
 (piece,p, info: { z: ZCoord, zg: Generation }) {
   piece_note_moved(piece,p);
+  piece_set_zlevel_from(piece,p,info);
+}
+
+function piece_set_zlevel_from(piece: PieceId, p: PieceInfo,
+                              info: { z: ZCoord, zg: Generation }) {
   piece_set_zlevel(piece,p, (oldtop_piece)=>{
-    let oldtop_p = pieces[oldtop_piece]!;
     p.z  = info.z;
     p.zg = info.zg;
   });