From 97e99d5165fb3c81cbb757eaecb81e168229f69e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 12 Feb 2021 01:16:25 +0000 Subject: [PATCH] api.rs: Provide ipieces as part of ApiOpArgs Signed-off-by: Ian Jackson --- daemon/api.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/daemon/api.rs b/daemon/api.rs index 642bf151..4c948c2f 100644 --- a/daemon/api.rs +++ b/daemon/api.rs @@ -38,6 +38,7 @@ struct ApiPieceOpArgs<'a> { player: PlayerId, piece: PieceId, p: &'a dyn Piece, + ipieces: &'a PiecesLoaded, } trait ApiPieceOp: Debug { @@ -135,7 +136,7 @@ fn api_piece_op(form: Json>) form.op.check_held(pc,player)?; let update = form.op.op(ApiPieceOpArgs { - gs, player, piece, + gs, player, piece, ipieces, p: p.as_ref(), })?; Ok::<_,ApiPieceOpError>(update) @@ -281,7 +282,7 @@ api_route!{ } #[throws(ApiPieceOpError)] fn op(&self, a: ApiPieceOpArgs) -> PieceUpdate { - let ApiPieceOpArgs { gs,player,piece,p, .. } = a; + let ApiPieceOpArgs { gs,player,piece,p,ipieces, .. } = a; let gpl = gs.players.byid_mut(player).unwrap(); let pc = gs.pieces.byid_mut(piece).unwrap(); @@ -294,6 +295,8 @@ api_route!{ "released" ); + let _ = ipieces; + (WhatResponseToClientOp::Predictable, update, logents).into() } -- 2.30.2