support debug scripts

maybegreat48 · Oct 4, 2024 · 34bd80e · 34bd80e
1 parent f4139cc
commit 34bd80e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/GTA V Script Decompiler/Function.cs b/GTA V Script Decompiler/Function.cs
@@ -522,7 +522,7 @@ private void HandleSwitch(Ast.StatementTree.Tree tree)
 		/// </summary>
 		public void BuildInstructions()
 		{
-			Offset = CodeBlock[4];
+			Offset = 0;
 			Instructions = new List<Instruction>();
 			InstructionMap = new Dictionary<int, int>();
 			int curoff;

diff --git a/GTA V Script Decompiler/ScriptFile.cs b/GTA V Script Decompiler/ScriptFile.cs
@@ -169,9 +169,14 @@ private void AddFunction(int start1, int start2)
             {
                 for (var i = 0; i < namelen; i++)
                 {
-                    name += (char)CodeTable[start1 + 5 + i];
+                    var chr = (char)CodeTable[start1 + 5 + i];
+                    if (chr != '\0')
+                        name += chr;
                 }
 
+                if (name.StartsWith("__", StringComparison.Ordinal))
+                    name = name.TrimStart('_');
+
                 foreach (var fun in Functions)
                     if (fun.Name == name)
                         name += "_0";