From: Ian Jackson Date: Sun, 28 Feb 2021 16:07:11 +0000 (+0000) Subject: Fix some more variable names X-Git-Tag: otter-0.4.0~273 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=de9026128f8e2ba89940f539f58f1c68bc895653;p=otter.git Fix some more variable names Signed-off-by: Ian Jackson --- diff --git a/src/updates.rs b/src/updates.rs index f3ef36d6..250dce33 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -204,18 +204,18 @@ pub fn log_did_to_piece_whoby( occults: &GameOccults, player: PlayerId, gpl: &mut GPlayer, - piece: PieceId, pc: &GPiece, p: &dyn PieceTrait, + piece: PieceId, gpc: &GPiece, pto: &dyn PieceTrait, did: &str, ) -> (Vec, Option) { let who_by = Html(htmlescape::encode_minimal(&gpl.nick)); - let pri = piece_pri(occults, player, gpl, piece, pc) + let pri = piece_pri(occults, player, gpl, piece, gpc) .ok_or(OE::PieceGone)?; let log = vec![ LogEntry { html: Html(format!( "{} {} {}", &who_by.0, did, - pri.describe(pc, &p).0, + pri.describe(gpc, &pto).0, ))}]; (log, Some(who_by)) } @@ -225,10 +225,10 @@ pub fn log_did_to_piece( occults: &GameOccults, player: PlayerId, gpl: &mut GPlayer, - piece: PieceId, pc: &GPiece, p: &dyn PieceTrait, + piece: PieceId, gpc: &GPiece, pto: &dyn PieceTrait, did: &str, ) -> Vec { - log_did_to_piece_whoby(occults,player,gpl,piece,pc,p,did)?.0 + log_did_to_piece_whoby(occults,player,gpl,piece,gpc,pto,did)?.0 } // ---------- prepared updates, queued in memory ----------