From 0196282a78c90fe3b9889ac18f5c7bde1e0de506 Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Wed, 23 Jul 2025 17:20:12 -0500
Subject: [PATCH] fix: reset code borrows

---
 src/game.rs | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 6114e0d..8876358 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -208,29 +208,31 @@ impl Game<'_> {
         // Reset the score
         self.score = 0;
 
-        // Get valid positions from the cached flood fill
-        let mut map = self.map.borrow_mut();
-        let valid_positions = map.get_valid_playable_positions();
-        let mut rng = rand::rng();
+        // Get valid positions from the cached flood fill and randomize positions in a single block
+        {
+            let mut map = self.map.borrow_mut();
+            let valid_positions = map.get_valid_playable_positions();
+            let mut rng = rand::rng();
 
-        // Randomize Pac-Man position
-        if let Some(pos) = valid_positions.iter().choose(&mut rng) {
-            let mut pacman = self.pacman.borrow_mut();
-            pacman.base.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
-            pacman.base.base.cell_position = (pos.x, pos.y);
-            pacman.base.in_tunnel = false;
-            pacman.base.direction = Direction::Right;
-            pacman.next_direction = None;
-            pacman.stopped = false;
-        }
+            // Randomize Pac-Man position
+            if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+                let mut pacman = self.pacman.borrow_mut();
+                pacman.base.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
+                pacman.base.base.cell_position = (pos.x, pos.y);
+                pacman.base.in_tunnel = false;
+                pacman.base.direction = Direction::Right;
+                pacman.next_direction = None;
+                pacman.stopped = false;
+            }
 
-        // Randomize ghost position
-        if let Some(pos) = valid_positions.iter().choose(&mut rng) {
-            self.blinky.base.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
-            self.blinky.base.base.cell_position = (pos.x, pos.y);
-            self.blinky.base.in_tunnel = false;
-            self.blinky.base.direction = Direction::Left;
-            self.blinky.mode = crate::ghost::GhostMode::Chase;
+            // Randomize ghost position
+            if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+                self.blinky.base.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
+                self.blinky.base.base.cell_position = (pos.x, pos.y);
+                self.blinky.base.in_tunnel = false;
+                self.blinky.base.direction = Direction::Left;
+                self.blinky.mode = crate::ghost::GhostMode::Chase;
+            }
         }
 
         self.edibles = reconstruct_edibles(
@@ -289,8 +291,7 @@ impl Game<'_> {
             .copy(&self.map_texture, None, None)
             .expect("Could not render texture on canvas");
 
-        // Remove old pellet rendering
-        // Instead, render all edibles
+        // Render all edibles
         for edible in &self.edibles {
             edible.render(self.canvas);
         }