Skip to content

Fixed @<name> resolution in entity connections #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M3Henry wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed @<name> resolution in entity connections #30

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43dc3c1
Fixed @<name> resolution
M3Henry Jun 8, 2016
064a2c9
Fixed Connections not getting name fixups when a replacement was made
M3Henry Jun 8, 2016
9f4602a
Added back in !targets
M3Henry Jun 21, 2016
e1b543d
missing bracket added back
M3Henry Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions VMFInstanceInserter/VMFStructure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,14 @@ private static TransformType ParseTransformType(String str)

private static String FixupName(String name, TargetNameFixupStyle fixupStyle, String targetName)
{
if (fixupStyle == TargetNameFixupStyle.None || targetName == null || name.StartsWith("@") || name.StartsWith("!"))
return name;

switch (fixupStyle) {
if (targetName == null || name.StartsWith("!")) return name;
else if (name.StartsWith("@")) return name.Substring(1);
switch (fixupStyle)
{
case TargetNameFixupStyle.Postfix:
return name + targetName;
return name + '-' + targetName;
case TargetNameFixupStyle.Prefix:
return targetName + name;
return targetName + '-' + name;
default:
return name;
}
Expand Down Expand Up @@ -368,7 +368,7 @@ private VMFStructure(VMFStructure clone, int idOffset, int nodeOffset, TargetNam
}

if (Type == VMFStructureType.Connections) {
if (fixup && fixupStyle != TargetNameFixupStyle.None && targetName != null) {
if (fixupStyle != TargetNameFixupStyle.None && targetName != null) {
String[] split = kvClone.Value.String.Split(',');
split[0] = FixupName(split[0], fixupStyle, targetName);
if (stInputsDict.ContainsKey(split[1])) {
Expand Down