safely unwrap values

Eein · Oct 29, 2023 · 7f0c835 · 7f0c835
1 parent 2dea4b5
commit 7f0c835
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -33,15 +33,15 @@ async fn main() {
                 // TODO: Load some initial information from the process.
                 loop {
                     settings.update();
-                    let start = start_watcher
-                        .update(
-                            process
-                                .read_pointer_path64(
+                    let start_value = match process.read_pointer_path64(
                                     main_module_base,
                                     &vec![0x4A2DA88, 0x20, 0x1B8, 0x110, 0x28],
-                                )
-                                .ok(),
-                        )
+                                ) {
+                            Ok(val) => Some(val),
+                            Err(_e) => Some(0),
+                    };
+                    let start = start_watcher
+                        .update(start_value)
                         .unwrap();
 
                     let new_start_value = match process.read_pointer_path64(
@@ -64,18 +64,17 @@ async fn main() {
                     let near_future_scenario_progress = near_future_scenario_progress_watcher
                         .update(near_future_scenario_progress_value)
                         .unwrap();
+
                     // asr::print_message(&near_future_scenario_progress.current.to_string());
+                    let loading_value = match process.read_pointer_path64(
+                        main_module_base,
+                        &vec![0x5092A98, 0x8, 0x10, 0x50, 0x30, 0x3FA],
+                    ) {
+                            Ok(val) => Some(val),
+                            Err(_e) => Some(0),
+                        };
 
-                    let loading = loading_watcher
-                        .update(
-                            process
-                                .read_pointer_path64(
-                                    main_module_base,
-                                    &vec![0x5092A98, 0x8, 0x10, 0x50, 0x30, 0x3FA],
-                                )
-                                .ok(),
-                        )
-                        .unwrap();
+                    let loading = loading_watcher.update(loading_value).unwrap();
 
                     // Scenario Progress
 

diff --git a/src/settings.rs b/src/settings.rs
@@ -1,4 +1,6 @@
-#[derive(asr::settings::Gui)]
+use asr::settings::Gui;
+
+#[derive(Debug, Gui)]
 pub struct Settings {
     #[default = true]
     /// Load Removal