better variable names

tomysshadow · tomysshadow · commit 9ff425c641b4 · 2024-06-04T16:55:31.000-06:00
diff --git a/FlashpointSecurePlayer/Shared.cs b/FlashpointSecurePlayer/Shared.cs
@@ -1649,18 +1649,18 @@ public string _ValueExpanded {
                                 // delimiter for a primary key (value names can contain them)
                                 public string Name {
                                     get {
-                                        string keyName = GetComparableName(KeyName);
+                                        string comparableKeyName = GetComparableName(KeyName);
 
-                                        if (!String.IsNullOrEmpty(keyName)) {
-                                            keyName = keyName.ToUpperInvariant();
+                                        if (!String.IsNullOrEmpty(comparableKeyName)) {
+                                            comparableKeyName = comparableKeyName.ToUpperInvariant();
                                         }
 
-                                        string valueName = GetComparableName(ValueName);
+                                        string comparableValueName = GetComparableName(ValueName);
 
-                                        if (!String.IsNullOrEmpty(valueName)) {
-                                            valueName = valueName.ToUpperInvariant();
+                                        if (!String.IsNullOrEmpty(comparableValueName)) {
+                                            comparableValueName = comparableValueName.ToUpperInvariant();
                                         }
-                                        return keyName + "\0" + valueName;
+                                        return comparableKeyName + "\0" + comparableValueName;
                                     }
                                 }
 

Original file line number	Diff line number	Diff line change
`@@ -1649,18 +1649,18 @@ public string _ValueExpanded {`
`1649`	`1649`	`// delimiter for a primary key (value names can contain them)`
`1650`	`1650`	`public string Name {`
`1651`	`1651`	`get {`
`1652`		`- string keyName = GetComparableName(KeyName);`
	`1652`	`+ string comparableKeyName = GetComparableName(KeyName);`
`1653`	`1653`
`1654`		`- if (!String.IsNullOrEmpty(keyName)) {`
`1655`		`- keyName = keyName.ToUpperInvariant();`
	`1654`	`+ if (!String.IsNullOrEmpty(comparableKeyName)) {`
	`1655`	`+ comparableKeyName = comparableKeyName.ToUpperInvariant();`
`1656`	`1656`	`}`
`1657`	`1657`
`1658`		`- string valueName = GetComparableName(ValueName);`
	`1658`	`+ string comparableValueName = GetComparableName(ValueName);`
`1659`	`1659`
`1660`		`- if (!String.IsNullOrEmpty(valueName)) {`
`1661`		`- valueName = valueName.ToUpperInvariant();`
	`1660`	`+ if (!String.IsNullOrEmpty(comparableValueName)) {`
	`1661`	`+ comparableValueName = comparableValueName.ToUpperInvariant();`
`1662`	`1662`	`}`
`1663`		`- return keyName + "\0" + valueName;`
	`1663`	`+ return comparableKeyName + "\0" + comparableValueName;`
`1664`	`1664`	`}`
`1665`	`1665`	`}`
`1666`	`1666`