Drop error to main menu if an hard script exception was encountered w…

…hile executing running scripts
openmoh · Oct 24, 2023 · cac883c · cac883c
1 parent 5a4fb90
commit cac883c
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
@@ -708,11 +708,15 @@ void ScriptMaster::ExecuteRunning(void)
         cmdCount  = 0;
         startTime = level.svsTime;
 
-        while ((m_CurrentThread = (ScriptThread *)timerList.GetNextElement(i))) {
-            level.setTime(level.svsStartTime + i);
+        try {
+            while ((m_CurrentThread = (ScriptThread *)timerList.GetNextElement(i))) {
+                level.setTime(level.svsStartTime + i);
 
-            m_CurrentThread->m_ScriptVM->m_ThreadState = THREAD_RUNNING;
-            m_CurrentThread->m_ScriptVM->Execute();
+                m_CurrentThread->m_ScriptVM->m_ThreadState = THREAD_RUNNING;
+                m_CurrentThread->m_ScriptVM->Execute();
+            }
+        } catch (const ScriptException& e) {
+            gi.Error(ERR_DROP, "%s", e.string.c_str());
         }
 
         level.setTime(startTime);
@@ -1152,9 +1156,9 @@ void ScriptMaster::PrintThread(int iThreadNum)
     if (!vm->m_Thread->m_WaitForList) {
         status += "(none)\n";
     } else {
-        con_set_enum<const_str, ConList> en = *vm->m_Thread->m_WaitForList;
+        con_set_enum<const_str, ConList>    en = *vm->m_Thread->m_WaitForList;
         con_set<const_str, ConList>::Entry *entry;
-        int                              i = 0;
+        int                                 i = 0;
 
         for (entry = en.NextElement(); entry != NULL; entry = en.NextElement()) {
             str& name = Director.GetString(entry->key);