From: Ian Jackson Date: Thu, 11 Mar 2021 11:14:14 +0000 (+0000) Subject: cmdlistener: Rename a variable `gpc` (was `pc`) X-Git-Tag: otter-0.4.0~190 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ac22d731a2c599befcb63fbb95e11d4ccc848280;p=otter.git cmdlistener: Rename a variable `gpc` (was `pc`) Signed-off-by: Ian Jackson --- diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index cf1a88d9..341aff51 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -612,7 +612,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( if p.nfaces() <= face.into() { throw!(SpecError::FaceNotFound); } - let pc = GPiece { + let gpc = GPiece { held: None, zlevel: ZLevel { z: z.increment()?, zg: gs.gen }, lastclient: default(), @@ -624,9 +624,9 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( pos, face, xdata: None, }; - pc.pos.clamped(gs.table_size).map_err(|_| SpecError::PosOffTable)?; - if pc.zlevel.z > gs.max_z { gs.max_z = pc.zlevel.z.clone() } - let piece = gs.pieces.as_mut(modperm).insert(pc); + gpc.pos.clamped(gs.table_size).map_err(|_| SpecError::PosOffTable)?; + if gpc.zlevel.z > gs.max_z { gs.max_z = gpc.zlevel.z.clone() } + let piece = gs.pieces.as_mut(modperm).insert(gpc); ig.ipieces.as_mut(modperm).insert(piece, IPiece { p }); updates.push((piece, PieceUpdateOp::Insert(()))); pos = (pos + posd)?;