From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 3 Apr 2021 17:17:14 +0000 (+0100)
Subject: js: Centralise piece_set_zlevel_from
X-Git-Tag: otter-0.5.0~233
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2c1d0f01c7b318164f8b526e8af92b8a8c5bbcf3;p=otter.git

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 4c5c1638..81779308 100644
--- 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;
   });