ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify some misc. `Substring` usage

This commit is contained in:
YoshiRulz 2025-03-29 04:54:16 +10:00
parent f25b992a4e
commit bdf22bb1b8
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.Common/DisplayManager/Filters/Retro.cs
View File

@ -161,13 +161,7 @@ namespace BizHawk.Client.Common.Filters
else
{
// remove comments from end of value. exclusive from above condition, since comments after quoted strings would be snipped by the quoted string extraction
var hash = value.IndexOf('#');
if (hash != -1)
{
value = value.Substring(0, hash);
}
value = value.Trim();
value = value.SubstringBefore('#').Trim();
}
dict[key.ToLowerInvariant()] = value;
}

6
src/BizHawk.Client.Common/lua/LuaFileList.cs
View File

@ -84,7 +84,7 @@ namespace BizHawk.Client.Common
}
else
{
var scriptPath = line.Substring(2, line.Length - 2);
var scriptPath = line.Substring(startIndex: 2);
if (!Path.IsPathRooted(scriptPath))
{
var directory = Path.GetDirectoryName(path);
@ -93,9 +93,7 @@ namespace BizHawk.Client.Common
Add(new LuaFile(scriptPath)
{
State = !disableOnLoad && line.Substring(0, 1) == "1"
? LuaFile.RunState.Running
: LuaFile.RunState.Disabled
State = !disableOnLoad && line.StartsWith('1') ? LuaFile.RunState.Running : LuaFile.RunState.Disabled,
});
}
}

29
src/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
View File

@ -5,6 +5,7 @@ using System.IO;
using System.Linq;
using System.Text;
using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
@ -399,15 +400,9 @@ namespace BizHawk.Client.Common
continue;
}
if (line.Length >= 6 && line.Substring(0, 6) == "Domain")
{
isBizHawkWatch = true;
}
if (line.Length >= 8 && line.Substring(0, 8) == "SystemID")
{
continue;
}
if (line.StartsWithOrdinal("Domain")) isBizHawkWatch = true;
// is there a step missing here? --yoshi
if (line.StartsWithOrdinal("SystemID")) continue;
var numColumns = line.Count(c => c == '\t');
int startIndex;
@ -421,7 +416,7 @@ namespace BizHawk.Client.Common
else
{
startIndex = line.IndexOf('\t') + 1;
line = line.Substring(startIndex, line.Length - startIndex); // 5 digit value representing the watch position number
line = line.Substring(startIndex: startIndex); // 5 digit value representing the watch position number
}
}
else
@ -433,7 +428,7 @@ namespace BizHawk.Client.Common
int addr;
var memDomain = _memoryDomains.MainMemory;
var temp = line.Substring(0, line.IndexOf('\t'));
var temp = line.SubstringBefore('\t');
try
{
addr = int.Parse(temp, NumberStyles.HexNumber);
@ -444,15 +439,15 @@ namespace BizHawk.Client.Common
}
startIndex = line.IndexOf('\t') + 1;
line = line.Substring(startIndex, line.Length - startIndex); // Type
line = line.Substring(startIndex: startIndex); // Type
var size = Watch.SizeFromChar(line[0]);
startIndex = line.IndexOf('\t') + 1;
line = line.Substring(startIndex, line.Length - startIndex); // Signed
line = line.Substring(startIndex: startIndex); // Signed
var type = Watch.DisplayTypeFromChar(line[0]);
startIndex = line.IndexOf('\t') + 1;
line = line.Substring(startIndex, line.Length - startIndex); // Endian
line = line.Substring(startIndex: startIndex); // Endian
try
{
startIndex = short.Parse(line[0].ToString());
@ -467,13 +462,13 @@ namespace BizHawk.Client.Common
if (isBizHawkWatch)
{
startIndex = line.IndexOf('\t') + 1;
line = line.Substring(startIndex, line.Length - startIndex); // Domain
temp = line.Substring(0, line.IndexOf('\t'));
line = line.Substring(startIndex: startIndex); // Domain
temp = line.SubstringBefore('\t');
memDomain = size == WatchSize.Separator ? null : _memoryDomains[temp] ?? _memoryDomains.MainMemory;
}
startIndex = line.IndexOf('\t') + 1;
var notes = line.Substring(startIndex, line.Length - startIndex);
var notes = line.Substring(startIndex: startIndex);
_watchList.Add(
Watch.GenerateWatch(