From 5e1eb80bc1ba469f839a7b6bac87ce35899be0f6 Mon Sep 17 00:00:00 2001
From: JeffR <areloch@gmail.com>
Date: Sun, 30 Jan 2022 19:14:36 -0600
Subject: [PATCH] Fixed handling issue where it would misparse lines that would
 contain new/singleton/datablock keywords fixed incorrect getSubStr function
 invoke

---
 .../importers/pre40/pre40ImporterGuis.tscript               | 2 +-
 .../tools/projectImporter/scripts/projectImporter.tscript   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Templates/BaseGame/game/tools/projectImporter/importers/pre40/pre40ImporterGuis.tscript b/Templates/BaseGame/game/tools/projectImporter/importers/pre40/pre40ImporterGuis.tscript
index 816b5cf80..10b7fb96a 100644
--- a/Templates/BaseGame/game/tools/projectImporter/importers/pre40/pre40ImporterGuis.tscript
+++ b/Templates/BaseGame/game/tools/projectImporter/importers/pre40/pre40ImporterGuis.tscript
@@ -37,7 +37,7 @@ function Pre40ImporterPage0::openPage(%this)
          %sanitizedFilename = sanitizeString(%fileBase);
          if(startsWith(%sanitizedFilename, "_"))
          {
-            %sanitizedFilename = substr(%sanitizedFilename, 1, -1);
+            %sanitizedFilename = getSubstr(%sanitizedFilename, 1, -1);
          }
          if(%sanitizedFilename !$= %fileBase)
          {
diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
index e4156ff23..af600e8c3 100644
--- a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
+++ b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
@@ -476,7 +476,7 @@ function preprocessImportingFiles()
          {
             %line = $ProjectImporter::fileObject.readLine();
             
-            if(strIsMatchExpr("*new*(*)*", %line) && !strIsMatchExpr("*\"*new*(*)*\"*", %line))
+            if(strIsMatchExpr("* new*(*)*", %line))
             {
                %start = strpos(%line, "new ");
                %end = strpos(%line, "(", %start);
@@ -530,7 +530,7 @@ function preprocessImportingFiles()
                      %insideObjectBlock = true;
                }
             }
-            else if(strIsMatchExpr("*datablock*(*)*", %line))
+            else if(strIsMatchExpr("* datablock*(*)*", %line))
             {
                %start = strpos(%line, "datablock ");
                %end = strpos(%line, "(", %start);
@@ -584,7 +584,7 @@ function preprocessImportingFiles()
                      %insideObjectBlock = true;
                }
             }
-            else if(strIsMatchExpr("*singleton*(*)*", %line))
+            else if(strIsMatchExpr("* singleton*(*)*", %line))
             {
                %start = strpos(%line, "singleton ");
                %end = strpos(%line, "(", %start);