Fix Tracy

PieKing1215 · Feb 1, 2023 · c214c01 · c214c01
1 parent 76f625e
commit c214c01
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,5 @@ steamworks_sdk_151/*
 Cargo.lock
 
 # tools
-/Tracy-0.7.8
-/Tracy-0.8.7
+/Tracy-0.9.7
+mods.svg
diff --git a/fs_common/src/game/common/world/chunk.rs b/fs_common/src/game/common/world/chunk.rs
@@ -225,15 +225,15 @@ impl<C: Chunk> ChunkHandlerGeneric for ChunkHandler<C> {
                                     chunk_index_inv(key).1,
                                     e
                                 );
-                            };
+                            }
                             if let Err(e) = self.unload_chunk(key, physics) {
                                 log::error!(
                                     "Chunk @ {}, {} failed to unload: {:?}",
                                     chunk_index_inv(key).0,
                                     chunk_index_inv(key).1,
                                     e
                                 );
-                            };
+                            }
                             keep_map[i] = false;
                         } else if active_zone.iter().any(|z| rect.intersects(z)) {
                             let chunk_x = self.loaded_chunks.get(&key).unwrap().get_chunk_x();

diff --git a/fs_main/src/main.rs b/fs_main/src/main.rs
@@ -20,8 +20,12 @@ use tui::{
     Terminal,
 };
 
-#[profiling::function]
 pub fn main() -> Result<(), String> {
+    #[cfg(feature = "profile")]
+    profiling::tracy_client::Client::start();
+
+    profiling::scope!("main");
+
     let build_data = BuildData {
         datetime: option_env!("BUILD_DATETIME"),
         git_hash: option_env!("GIT_HASH"),