gplayer => held nfc

diff --git a/src/bin/server.rs b/src/bin/server.rs
index f11026311fea918d5e00ac742513bfa9bd355e5c..95459c55913e1ed66fff0a76f5ee40cda512cc78 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -69,7 +69,7 @@ struct SessionPieceContext {
 
 #[derive(Serialize,Debug)]
 struct SessionPieceLoadJson<'r> {
-  gplayer : &'r Option<PlayerId>,
+  held : &'r Option<PlayerId>,
   z : ZCoord,
   zg : Generation,
 }
@@ -112,7 +112,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
       alldefs.push((pri.id, defs));
 
       let for_info = SessionPieceLoadJson {
-        gplayer : &pr.held,
+        held : &pr.held,
         z  : pr.zlevel.z,
         zg : pr.zlevel.zg,
       };

diff --git a/templates/script.ts b/templates/script.ts
index 80e196ebcc7219853c59e8fd62f277ac37775767..42ffbc77df35eab84c0da109c019302676d306f2 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -42,7 +42,7 @@ type ClientSeq = number;
 type Generation = number;
 
 type PieceInfo = {
-  gplayer : PlayerId | null,
+  held : PlayerId | null,
   cseq : number | null,
   z : number,
   zg : Generation,
@@ -189,15 +189,15 @@ function drag_mousedown(e : MouseEvent) {
   drag_cancel();
   let p = pieces[piece]!;
   drag_piece = piece;
-  var gplayer = p.gplayer;
-  if (gplayer != null && gplayer != us) { return; }
+  var held = p.held;
+  if (held != null && held != us) { return; }
 
   dcx = e.clientX;
   dcy = e.clientY;
   dox = parseFloat(p.uelem.getAttributeNS(null,"x")!);
   doy = parseFloat(p.uelem.getAttributeNS(null,"y")!);
 
-  if (gplayer == us) {
+  if (held == us) {
     dragging = DRAGGING.MAYBE_UNGRAB;
   } else {
     dragging = DRAGGING.MAYBE_GRAB;
@@ -211,14 +211,14 @@ function drag_mousedown(e : MouseEvent) {
 
 function set_grab(piece: PieceId, p: PieceInfo, owner: PlayerId) {
   var nelem = document.createElementNS(svg_ns,'use');
-  p.gplayer = owner;
+  p.held = owner;
   piece_cleanup_grab(piece, p);
   nelem.setAttributeNS(null,'href','#select'+piece);
   nelem.setAttributeNS(null,'stroke-dasharray',"3 1  1 1  1 1");
   p.pelem.appendChild(nelem);
 }
 function set_ungrab(piece: PieceId, p: PieceInfo) {
-  p.gplayer = null;
+  p.held = null;
   piece_cleanup_grab(piece,p);
 }
 function piece_cleanup_grab(piece: PieceId, p: PieceInfo) {