fix some blanks

Astavie · May 12, 2024 · fcf4cf6 · fcf4cf6
1 parent feadb5c
commit fcf4cf6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/cah/mod.rs b/src/cah/mod.rs
@@ -149,7 +149,7 @@ impl<const C: CardType> Card<C> {
             // trim spaces around blank
             let before = prompt[..pos].trim_end();
 
-            let underscore = prompt.chars().nth(pos).unwrap() == '_';
+            let underscore = prompt.as_bytes()[pos] == b'_';
             let size = if underscore { 1 } else { 2 };
             let after = prompt[pos + size..].trim_start();
 

diff --git a/src/cah/write.rs b/src/cah/write.rs
@@ -43,7 +43,7 @@ impl Ingame {
 
                 msg.fields.push(Field::new(
                     "Prompt",
-                    escape_string(self.prompt.text(&self.packs)),
+                    self.prompt.fill(&self.packs, &mut std::iter::empty()),
                 ));
 
                 msg.append_action(Action::ShowHand, ButtonStyle::Primary, "Show Hand".into());
@@ -82,7 +82,13 @@ impl Ingame {
                         .iter()
                         .copied()
                         .enumerate()
-                        .map(|(i, c)| format!("{}. ``{}``", i + 1, c.text(&self.packs)))
+                        .map(|(i, c)| {
+                            format!(
+                                "{}. ``{}``",
+                                i + 1,
+                                c.fill(&self.packs, &mut std::iter::empty())
+                            )
+                        })
                         .collect::<Vec<_>>()
                         .join("\n"),
                 ));