From c5c020c614bd71d92ab06f6791fbf3aa94835f1f Mon Sep 17 00:00:00 2001
From: ChocoTaco1 <boldfilter@zoho.com>
Date: Mon, 14 Sep 2020 13:28:15 -0400
Subject: [PATCH] nameTag Fix Ver2

---
 Classic/scripts/autoexec/TacoOverrides.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs
index 7ae13ba..e85a4a8 100644
--- a/Classic/scripts/autoexec/TacoOverrides.cs
+++ b/Classic/scripts/autoexec/TacoOverrides.cs
@@ -180,14 +180,20 @@ function GameBaseData::onAdd(%data, %obj)
    if(%data.targetTypeTag !$= "")
    {
       // use the name given to the object in the mission file
-      //if(%obj.nameTag !$= "")
-      //{
-         //%obj.nameTag = addTaggedString(%obj.nameTag);
-         //%nameTag = %obj.nameTag;
-      //}
-      //else
+      if(%obj.nameTag !$= "" && strpos(%obj.nameTag,"\x01") == -1)
+      {
+         %obj.nameTag = addTaggedString(%obj.nameTag);
+         %nameTag = %obj.nameTag;
+      }
+      else if(%data.targetNameTag !$= "")
          %nameTag = %data.targetNameTag;
-
+      else
+      {
+         if(%obj.name !$= "")
+            %nameTag = %obj.nameTag = addTaggedString(%obj.name);
+         else 
+            %nameTag = %obj.nameTag = addTaggedString("Base"); // fail safe so it shows up on cc
+      }
        %obj.target = createTarget(%obj, %nameTag, "", "", %data.targetTypeTag, 0, 0);
    }
    else