fix(terminal): maintain idx when shuffling code_lines

closes #14
Lioness100 · Aug 16, 2022 · da6b56b · da6b56b
1 parent d2982b4
commit da6b56b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "guess-that-lang"
-version = "1.0.17"
+version = "1.0.18"
 rust-version = "1.63"
 authors = ["Lioness100 <[email protected]>"]
 edition = "2021"

diff --git a/src/game.rs b/src/game.rs
@@ -165,7 +165,7 @@ impl Game {
         thread::scope(|s| {
             let display = s.spawn(|| {
                 self.terminal
-                    .start_showing_code(code, &available_points, receiver)
+                    .start_showing_code(&code, &available_points, receiver)
             });
 
             let input = s.spawn(|| {

diff --git a/src/terminal.rs b/src/terminal.rs
@@ -310,10 +310,12 @@ impl Terminal {
     /// `available_points` every 1.5 seconds.
     pub fn start_showing_code(
         &self,
-        mut code_lines: Vec<(String, String)>,
+        code_lines: &[(String, String)],
         available_points: &Mutex<f32>,
         receiver: Receiver<()>,
     ) -> Result<()> {
+        let mut code_lines: Vec<_> = code_lines.iter().enumerate().collect();
+
         if ARGS.shuffle {
             code_lines.shuffle(&mut thread_rng());
         };
@@ -325,7 +327,7 @@ impl Terminal {
         // Consume receiver.
         let receiver = receiver;
 
-        for (idx, (raw, line)) in code_lines.iter().enumerate() {
+        for (idx, (raw, line)) in code_lines {
             if raw == "\n" {
                 continue;
             }