From e3c3ad96e380a9f2ed3b9c6bb4306c01f78a088a Mon Sep 17 00:00:00 2001 From: GarandPLG Date: Tue, 19 May 2026 13:24:33 +0200 Subject: [PATCH] Add delete flag to end_marking_cells Pass true when handling the Delete action and false for normal cleanup, updating all call sites to use the new boolean parameter. --- src/app/keybindings/skirmish.rs | 2 +- src/app/states/skirmish_states/board.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/keybindings/skirmish.rs b/src/app/keybindings/skirmish.rs index a21058b..e929202 100644 --- a/src/app/keybindings/skirmish.rs +++ b/src/app/keybindings/skirmish.rs @@ -86,7 +86,7 @@ pub fn skirmish_keybindings(app: &mut App, key_event: &KeyEvent) { Action::Backspace => board.pop_marked_cell(), Action::Delete => { board.marked_cells.marking_cells = false; - board.end_marking_cells() + board.end_marking_cells(true) } Action::Tab => { states.skirmish.side_panel = !states.skirmish.side_panel; diff --git a/src/app/states/skirmish_states/board.rs b/src/app/states/skirmish_states/board.rs index 9d235dd..9d4f5a0 100644 --- a/src/app/states/skirmish_states/board.rs +++ b/src/app/states/skirmish_states/board.rs @@ -155,7 +155,7 @@ impl BoardState { if self.marked_cells.marking_cells { self.start_marking_cells(); } else { - self.end_marking_cells(); + self.end_marking_cells(false); } } @@ -210,14 +210,14 @@ impl BoardState { self.marked_cells.marked_cells.push_back((row, col)); } - pub fn end_marking_cells(&mut self) { + pub fn end_marking_cells(&mut self, del: bool) { for (row, col) in self.marked_cells.marked_cells.clone() { self.get_mut_cell(row, col).set_marked(false); } let (row, col) = self.marked_cells.selected_unit.get_coords(); - if self.marked_cells.marked_cells.len() > 1 { + if self.marked_cells.marked_cells.len() > 1 && !del { let task: Tasks = Tasks::Digging(DiggingTask::new(self.marked_cells.marked_cells.clone()));