chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd7e0ed)
Fix some more variable names
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 28 Feb 2021 16:07:11 +0000 (16:07 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 28 Feb 2021 16:07:11 +0000 (16:07 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/updates.rs patch | blob | history

diff --git a/src/updates.rs b/src/updates.rs
index f3ef36d6450e2d46f1d34a3a727c41ee673b56bc..250dce332415c35eb0731967ea4b5bc3d41a3bbd 100644 (file)
--- 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<LogEntry>, Option<Html>) {
   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<LogEntry> {
-  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 ----------
Unnamed repository; edit this file 'description' to name the repository.