From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 12 Feb 2021 01:16:25 +0000 (+0000)
Subject: api.rs: Provide ipieces as part of ApiOpArgs
X-Git-Tag: otter-0.4.0~541
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=97e99d5165fb3c81cbb757eaecb81e168229f69e;p=otter.git

api.rs: Provide ipieces as part of ApiOpArgs

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

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<O: ApiPieceOp>(form: Json<ApiPiece<O>>)
     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()
   }