From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 May 2022 13:39:09 +0000 (+0100)
Subject: held_change_hook: Pass some more arguments
X-Git-Tag: otter-1.1.0~367
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ae6f124e4bc74a148a60a2d358778606942a06ad;p=otter.git

held_change_hook: Pass some more arguments

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

diff --git a/daemon/api.rs b/daemon/api.rs
index c8a79d0d..088844d6 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -190,6 +190,9 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
     if let Some(ipc) = &g.ipieces.get(piece);
     let thunk = ipc.direct_trait_access().held_change_hook(
       &iad.gref,
+      &g.gs.players,
+      &g.ipieces,
+      &g.gs.occults,
       &mut g.gs.pieces,
       piece,
       was_held,
diff --git a/src/clock.rs b/src/clock.rs
index 0e11b946..f679be15 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -714,6 +714,9 @@ impl PieceTrait for Clock {
   #[throws(IE)]
   fn held_change_hook(&self,
                       ig: &InstanceRef,
+                      _gplayers: &GPlayers,
+                      _ipieces: &IPieces,
+                      _goccults: &GOccults,
                       gpieces: &mut GPieces,
                       piece: PieceId,
                       was_held: Option<PlayerId>)
diff --git a/src/dice.rs b/src/dice.rs
index 9807947a..8fc587b0 100644
--- a/src/dice.rs
+++ b/src/dice.rs
@@ -408,6 +408,9 @@ impl PieceTrait for Die {
   #[throws(IE)]
   fn held_change_hook(&self,
                       _: &InstanceRef,
+                      _gplayers: &GPlayers,
+                      _ipieces: &IPieces,
+                      _goccults: &GOccults,
                       gpieces: &mut GPieces,
                       piece: PieceId,
                       _was_held: Option<PlayerId>)
diff --git a/src/gamestate.rs b/src/gamestate.rs
index 0599e994..83ed3799 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -226,8 +226,11 @@ pub trait PieceTrait: PieceBaseTrait + Downcast + Send + Debug + 'static {
   /// may be occulted!
   fn held_change_hook(&self,
                       _ig: &InstanceRef,
+                      _gplayers: &GPlayers,
+                      _ipieces: &IPieces,
+                      _goccults: &GOccults,
                       _gpieces: &mut GPieces,
-                      _piece: PieceId,
+                      _tpiece: PieceId,
                       _was_held: Option<PlayerId>)
                       -> Result<OpHookThunk,IE> { Ok(default()) }