Merge pull request #11 from cesare-montresor/UOSEnginePlus

Uos engine plus bugfix
cesare-montresor · Jan 2, 2024 · d0c35a5 · d0c35a5
2 parents 11b509c + 39b4249
commit d0c35a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Razor/Properties/AssemblyInfo.cs b/Razor/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.8.2.104")]
+[assembly: AssemblyVersion("0.8.2.105")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the

diff --git a/Razor/RazorEnhanced/EnhancedScript.cs b/Razor/RazorEnhanced/EnhancedScript.cs
@@ -647,9 +647,9 @@ public void Suspend()
             ScriptEngine.Suspend();
         }
 
-        public void Reseume()
+        public void Resume()
         {
-            ScriptEngine.Reseume();
+            ScriptEngine.Resume();
         }
 
 
@@ -694,24 +694,24 @@ public bool Suspended
             get { return m_Suspended; }
             set { 
                 if (value) { Suspend();} 
-                else { Reseume(); }
+                else { Resume(); }
             } 
         }
         public void Suspend()
         {
-            if (m_Script.Language != ScriptLanguage.PYTHON) {
-                Misc.SendMessage("WARNING: Script Suspend is supported only by python scripts.");
+            if (m_Script.Language == ScriptLanguage.CSHARP) {
+                Misc.SendMessage("WARNING: Script Suspend is not supported by c# scripts.");
                 return;
             }
             m_Suspended = true;
             m_SuspendedMutex.Reset();
         }
 
-        public void Reseume()
+        public void Resume()
         {
-            if (m_Script.Language != ScriptLanguage.PYTHON)
+            if (m_Script.Language == ScriptLanguage.CSHARP)
             {
-                Misc.SendMessage("WARNING: Script Resume is supported only by python scripts.");
+                Misc.SendMessage("WARNING: Script Resume is not supported by c# scripts.");
                 return;
             }
             m_Suspended = false;
@@ -984,7 +984,7 @@ private bool RunUOSteam()
         {
             try
             {
-                uosEngine.OnTraceback(TracebackUOS);
+                uosEngine.SetTrace(TracebackUOS);
                 uosEngine.Execute();
             }
             catch (Exception ex)

diff --git a/Razor/RazorEnhanced/Misc.cs b/Razor/RazorEnhanced/Misc.cs
@@ -1127,7 +1127,7 @@ public static void ScriptResume(string scriptfile)
             EnhancedScript script = EnhancedScript.Service.Search(scriptfile);
             if (script != null)
             {
-                script.Reseume();
+                script.Resume();
             }
             else
             {

diff --git a/Razor/RazorEnhanced/UOSteamEngine.cs b/Razor/RazorEnhanced/UOSteamEngine.cs
@@ -32,7 +32,7 @@ public class UOSteamEngine
         private Interpreter m_Interpreter;
         private Script m_Script;
 
-        public void OnTraceback(UOSTracebackDelegate traceDelegate) {
+        public void SetTrace(UOSTracebackDelegate traceDelegate) {
             m_Script.OnTraceback += traceDelegate;
         }
 
@@ -138,7 +138,7 @@ public UOSteamEngine()
             UpdateNamespace();
         }
 
-
+                                          
         private void RegisterAlias()
         {
             m_Interpreter.RegisterAliasHandler("ground", AliasHandler);
@@ -5278,7 +5278,7 @@ public bool ExecuteNext()
 
             var node = _statement.FirstChild();
 
-            if (OnTraceback!=null && OnTraceback.Invoke(this, node, _scope)){
+            if (OnTraceback!=null && !OnTraceback.Invoke(this, node, _scope)){
                 return false;
             }