chore: Fixup errors after rebase

fishfolk · Nov 3, 2024 · f88be6c · f88be6c
1 parent 2a35abc
commit f88be6c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/framework_crates/bones_ecs/Cargo.toml b/framework_crates/bones_ecs/Cargo.toml
@@ -36,6 +36,7 @@ serde            = { version = "1", features = ["derive"], optional = true }
 
 anyhow      = "1.0"
 branches    = { workspace = true }
+fxhash      = { workspace = true }
 atomicell   = "0.2"
 bitset-core = "0.1"
 once_map    = "0.4.12"

diff --git a/framework_crates/bones_framework/Cargo.toml b/framework_crates/bones_framework/Cargo.toml
@@ -98,6 +98,7 @@ bevy_tasks    = "0.11"
 bytemuck      = "1.12"
 either        = "1.8"
 futures-lite  = { workspace = true }
+fxhash        = { workspace = true }
 glam          = "0.24"
 hex           = "0.4"
 instant       = { version = "0.1", features = ["wasm-bindgen"] }

diff --git a/framework_crates/bones_framework/src/networking.rs b/framework_crates/bones_framework/src/networking.rs
@@ -65,7 +65,8 @@ impl From<ggrs::InputStatus> for NetworkInputStatus {
 /// Module prelude.
 pub mod prelude {
     pub use super::{
-        desync::DetectDesyncs, input, lan, online, proto, random, DisconnectedPlayers, RngGenerator, SyncingInfo, RUNTIME,
+        desync::DetectDesyncs, input, lan, online, proto, random, DisconnectedPlayers,
+        RngGenerator, SyncingInfo, RUNTIME,
     };
 
     #[cfg(feature = "net-debug")]
@@ -553,9 +554,9 @@ pub struct GgrsSessionRunner<'a, InputTypes: NetworkInputConfig<'a>> {
 
     /// The random seed used for this session
     pub random_seed: u64,
-    
+
     /// When provided, desync detection is enabled. Contains settings for desync detection.
-    detect_desyncs: Option<DetectDesyncs>,    
+    detect_desyncs: Option<DetectDesyncs>,
 
     /// History buffer for desync debug data to fetch it upon detected desyncs.
     /// [`DefaultDesyncTree`] will be generated and saved here if feature `desync-debug` is enabled.
@@ -582,13 +583,12 @@ pub struct GgrsSessionRunnerInfo {
     ///
     /// `None` will use Bone's default.
     pub local_input_delay: Option<usize>,
-    
+
     /// The random seed used for this session
     pub random_seed: u64,
-    
+
     /// When provided, desync detection is enabled. Contains settings for desync detection.
     pub detect_desyncs: Option<DetectDesyncs>,
-
 }
 
 impl GgrsSessionRunnerInfo {
@@ -625,6 +625,7 @@ where
         target_fps: Option<f32>,
         max_prediction_window: Option<usize>,
         local_input_delay: Option<usize>,
+        detect_desyncs: Option<DetectDesyncs>,
         matchmaker_resp_game_starting: OnlineMatchmakerResponse,
     ) -> Option<Self> {
         if let OnlineMatchmakerResponse::GameStarting {
@@ -641,6 +642,7 @@ where
                     max_prediction_window,
                     local_input_delay,
                     random_seed,
+                    detect_desyncs,
                 ),
             ))
         } else {

diff --git a/framework_crates/bones_utils/Cargo.toml b/framework_crates/bones_utils/Cargo.toml
@@ -21,6 +21,7 @@ bones_utils_macros = { version = "0.4", path = "./macros" }
 fxhash             = { workspace = true }
 hashbrown          = { workspace = true }
 tree_iterators_rs  = { version = "1.2.1" }
+ustr               = { workspace = true }
 
 # Optional
 instant   = { version = "0.1", features = ["wasm-bindgen"], optional = true }