From: Ian Jackson Date: Tue, 30 Mar 2021 19:49:04 +0000 (+0100) Subject: hand generalisation: wip use Sort X-Git-Tag: otter-0.5.0~369 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8068dec44d6b8a981d40a38ecdd149c6bc22bb85;p=otter.git hand generalisation: wip use Sort Signed-off-by: Ian Jackson --- diff --git a/src/hand.rs b/src/hand.rs index 6498a9b8..ee23f65a 100644 --- a/src/hand.rs +++ b/src/hand.rs @@ -44,6 +44,9 @@ impl Sort { fn claim_desc(self) -> HtmlLit { use Sort::*; Html::lit(match self { Hand => "Claim this as your hand", }) } + fn owned_desc(self, nick: &HtmlStr) -> Html { use Sort::*; match self { + Hand => hformat!("{}'s hand", nick), + } } } impl HandState { @@ -208,7 +211,7 @@ impl PieceTrait for Hand { { ("claim", false) => { dbgc!("claiming"); - let new_desc = hformat!("{}'s hand", &nick); + let new_desc = self.sort.owned_desc(&nick); let new_owner = Some(MagicOwner { player, dasharray,