From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 20 May 2022 18:13:43 +0000 (+0100)
Subject: currency: Occult multigrab taken log properly
X-Git-Tag: otter-1.1.0~43
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aa50f22cb0f64530f9383e4e967e207156669927;p=otter.git

currency: Occult multigrab taken log properly

Also rename two variables to be more accurate.

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

diff --git a/src/currency.rs b/src/currency.rs
index e42e7825..31c41934 100644
--- a/src/currency.rs
+++ b/src/currency.rs
@@ -143,18 +143,21 @@ impl PieceTrait for Banknote {
   }
 
   #[throws(ApiPieceOpError)]
-  fn op_multigrab(&self, _: ApiPieceOpArgs, show: ShowUnocculted,
+  fn op_multigrab(&self, _: ApiPieceOpArgs, show_to_player: ShowUnocculted,
                   take: MultigrabQty, new_z: ShouldSetZLevel) -> OpOutcomeThunk {
     let currency = self.currency.clone();
     OpOutcomeThunk::Reborrow(Box::new(
       move |ig: &mut InstanceGuard, (player, tpiece)|
   {
-    ig.fastsplit_split(player, tpiece, show, new_z,
+    ig.fastsplit_split(player, tpiece, show_to_player, new_z,
       move |_: &IOccults, _: &GOccults, gpl: &GPlayer,
             tgpc: &mut GPiece, tipc: &IPiece,
             ngpc: &mut GPiece|
   {
-    let self_: &Banknote = tipc.p.show(show).downcast_piece_fastsplit()?;
+    // A player who can see it can split it
+    let self_unocc: &Banknote = tipc.p.show(show_to_player)
+      .downcast_piece_fastsplit()?;
+    let show_to_all = tgpc.fully_visible_to_everyone();
 
     let tgpc_value: &mut Value = tgpc.xdata.get_mut_exp()?;
     let remaining = tgpc_value.qty.checked_sub(take)
@@ -171,7 +174,7 @@ impl PieceTrait for Banknote {
     let logents = vec![ LogEntry { html: hformat!(
       "{} took {}, leaving {}{}",
       gpl.nick.to_html(),
-      self_.describe(tgpc.face, &tgpc_value.html(Some(show)))?,
+      self_unocc.describe(tgpc.face, &tgpc_value.html(show_to_all))?,
       remaining, &currency,
     )}];