Moved save file loading to its own file

Author: Thepuppetqueen57

src/game/load_save.rs

@@ -0,0 +1,44 @@
+use crate::types::MainLevel;
+
+pub fn load_save_file(save_file: String, main_levels: &mut Vec<MainLevel>, online_levels_beaten: &mut Vec<u32>, username: &mut String, password: &mut String, stars: &mut u32) {
+    // Totally not copied from the old client at all
+    let values_levels: Vec<&str> = save_file.split(";;;").collect();
+    let save_pairs: Vec<&str> = values_levels[0].split(";").collect();
+    let levels_completed: Vec<&str> = values_levels[1].split(";").collect();
+    let online_levels_completed: Vec<&str> = values_levels[2].split(";").collect();
+    for pair in save_pairs {
+        let key_value: Vec<&str> = pair.split(":").collect();
+
+        if key_value[0] == "stars" {
+            *stars = key_value[1].parse::<u32>().unwrap();
+        }
+
+        if key_value[0] == "user" {
+            if key_value[1] != "0" {
+                *username = key_value[1].to_string();
+            }
+        }
+
+        if key_value[0] == "pass" {
+            if key_value[1] != "0" {
+                *password = key_value[1].to_string();
+            }
+        }
+    }
+
+    // This is for checking what main levels you have completed
+    let mut level_index: u8 = 0;
+    for level in levels_completed {
+        let key_value: Vec<&str> = level.split(":").collect();
+        if key_value[1] == "1" {
+            main_levels[level_index as usize].completed = true
+        }
+
+        level_index += 1;
+    }
+
+    // This is for checking what online levels you have completed
+    for level in online_levels_completed {
+        online_levels_beaten.push(level.parse().unwrap());
+    }
+}

src/game/mod.rs

@@ -4,4 +4,5 @@ pub mod object_types;
 pub mod saving;
 pub mod loading;
 pub mod parsing;
-pub mod main_levels;
+pub mod main_levels;
+pub mod load_save;

src/game/playing/hitboxes.rs

@@ -34,10 +34,10 @@ pub fn hitbox_collision(
     level_mode: u8,
     current_level: u8,
     current_mode: String,
-    online_levels_beaten: &mut Vec<u16>,
+    online_levels_beaten: &mut Vec<u32>,
     online_level_diff: u8,
     online_level_rated: bool,
-    level_id: u16
+    level_id: u32
 ) {
     for object in obj_grid {
         let obj_y = ((screen_height() / 1.15 - 25.0) + (object.y as f32 - 500.0)) + 6.0;

src/main.rs

@@ -229,7 +229,7 @@ async fn main() {
     let mut current_difficulty: u8 = 0;
     let mut bg_offset: f32 = 0.0;
     let mut current_mode: String = "1".to_string();
-    let mut online_levels_beaten: Vec<u16> = vec![];
+    let mut online_levels_beaten: Vec<u32> = vec![];
     let mut chats: String = "".to_string();
     let mut chat_timer: Timer = Timer::new(5.0);
     let (sender, receiver) = crossbeam::channel::bounded::<String>(1);
@@ -312,46 +312,14 @@ async fn main() {
         .expect("Failed to load save file");
 
     println!("Loading save data...");
-    // Totally not copied from the old client at all
-    let values_levels: Vec<&str> = save_file.split(";;;").collect();
-    let save_pairs: Vec<&str> = values_levels[0].split(";").collect();
-    let levels_completed: Vec<&str> = values_levels[1].split(";").collect();
-    let online_levels_completed: Vec<&str> = values_levels[2].split(";").collect();
-    for pair in save_pairs {
-        let key_value: Vec<&str> = pair.split(":").collect();
-
-        if key_value[0] == "stars" {
-            stars = key_value[1].parse::<u32>().unwrap();
-        }
-
-        if key_value[0] == "user" {
-            if key_value[1] != "0" {
-                username = key_value[1].to_string();
-            }
-        }
-
-        if key_value[0] == "pass" {
-            if key_value[1] != "0" {
-                password = key_value[1].to_string();
-            }
-        }
-    }
-
-    // This is for checking what main levels you have completed
-    let mut level_index: u8 = 0;
-    for level in levels_completed {
-        let key_value: Vec<&str> = level.split(":").collect();
-        if key_value[1] == "1" {
-            main_levels[level_index as usize].completed = true
-        }
-
-        level_index += 1;
-    }
-
-    // This is for checking what online levels you have completed
-    for level in online_levels_completed {
-        online_levels_beaten.push(level.parse().unwrap());
-    }
+    load_save::load_save_file(
+        save_file,
+        &mut main_levels,
+        &mut online_levels_beaten,
+        &mut username,
+        &mut password,
+        &mut stars
+    );
 
     // This is for auto login
     // Auto login only runs if you have already logged in using the login page