Some fixes

user-grinch · Mar 5, 2022 · f42a8f7 · f42a8f7
1 parent 5291e10
commit f42a8f7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/resource/MapEditor/fonts/text.ttf b/resource/MapEditor/fonts/text.ttf
diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -6,7 +6,19 @@ void EditorThread(void* param)
 {
     ObjManager::Init();
     Updater::CheckUpdate();
-    Sleep(3000);
+     /* 
+        Wait for game init
+        Doing it like this doesn't prevent you to attach debugger
+    */ 
+    static bool gameStarted = false;
+    Events::processScriptsEvent +=[]{
+        gameStarted = true;
+    };
+
+    while (!gameStarted)
+    {
+        Sleep(500);
+    }
     // -------------------------------------------------------------
 
     gLog << "Starting...\nVersion: "  EDITOR_VERSION  "\nAuthor: Grinch_\nDiscord: " DISCORD_INVITE "\nMore Info: "

diff --git a/src/filemgr.cpp b/src/filemgr.cpp
@@ -32,7 +32,7 @@ void FileMgr::ImportIPL(std::string fileName, bool logImports)
             {
                 gLog << "Pasing line: " << line << std::endl;
             }
-            
+
             int hObj; 
             Command<Commands::REQUEST_MODEL>(model);
             Command<Commands::LOAD_ALL_MODELS_NOW>();