mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-07-14 23:54:32 +00:00
nameTag Fix Ver2
This commit is contained in:
parent
5a29c4deaf
commit
c5c020c614
1 changed files with 13 additions and 7 deletions
|
|
@ -180,14 +180,20 @@ function GameBaseData::onAdd(%data, %obj)
|
||||||
if(%data.targetTypeTag !$= "")
|
if(%data.targetTypeTag !$= "")
|
||||||
{
|
{
|
||||||
// use the name given to the object in the mission file
|
// use the name given to the object in the mission file
|
||||||
//if(%obj.nameTag !$= "")
|
if(%obj.nameTag !$= "" && strpos(%obj.nameTag,"\x01") == -1)
|
||||||
//{
|
{
|
||||||
//%obj.nameTag = addTaggedString(%obj.nameTag);
|
%obj.nameTag = addTaggedString(%obj.nameTag);
|
||||||
//%nameTag = %obj.nameTag;
|
%nameTag = %obj.nameTag;
|
||||||
//}
|
}
|
||||||
//else
|
else if(%data.targetNameTag !$= "")
|
||||||
%nameTag = %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);
|
%obj.target = createTarget(%obj, %nameTag, "", "", %data.targetTypeTag, 0, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue