From ac7f6618477e58783887ccc1779f0b86930f1773 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 4 Sep 2022 20:16:07 -0400 Subject: Introduce `Deal` for shuffled decks --- webapp/src/main.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'webapp/src/main.rs') diff --git a/webapp/src/main.rs b/webapp/src/main.rs index 7f22b0f..4e61344 100644 --- a/webapp/src/main.rs +++ b/webapp/src/main.rs @@ -19,12 +19,12 @@ fn main() { #[function_component(App)] pub fn app() -> Html { let mut rng = rand::thread_rng(); - let (n, w, s, e) = card::shuffle_deck(&mut rng); + let deal = card::deal(&mut rng); - let north = use_state(|| HandProps::from_iter(n.into_iter())); - let west = use_state(|| HandProps::from_iter(w.into_iter())); - let south = use_state(|| HandProps::from_iter(s.into_iter())); - let east = use_state(|| HandProps::from_iter(e.into_iter())); + let north = use_state(|| HandProps::from_iter(deal.north.into_iter())); + let west = use_state(|| HandProps::from_iter(deal.west.into_iter())); + let south = use_state(|| HandProps::from_iter(deal.south.into_iter())); + let east = use_state(|| HandProps::from_iter(deal.east.into_iter())); let shuffle = { let north = north.clone(); @@ -34,11 +34,11 @@ pub fn app() -> Html { Callback::from(move |_| { let mut rng = rand::thread_rng(); - let (n, w, s, e) = card::shuffle_deck(&mut rng); - north.set(n.into_iter().collect()); - west.set(w.into_iter().collect()); - south.set(s.into_iter().collect()); - east.set(e.into_iter().collect()); + let deal = card::deal(&mut rng); + north.set(deal.north.into_iter().collect()); + west.set(deal.west.into_iter().collect()); + south.set(deal.south.into_iter().collect()); + east.set(deal.east.into_iter().collect()); }) }; -- cgit v1.2.3