ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix/simplify range handling

Browse source
This commit is contained in:
Haselnussbomber 2025-09-23 13:16:39 +02:00
parent dceeccb242
commit 1633e68b76
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs
View file

@ -1643,13 +1643,15 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (entryEnd == -1)
entryEnd = ranges.Length;
var entry = ranges.AsSpan(0, entryEnd);
if (ranges.StartsWith("noun", StringComparison.Ordinal))
{
isNoun = true;
}
else if (ranges.StartsWith("col", StringComparison.Ordinal) && colIndex < cols.Length)
{
cols[colIndex++] = int.Parse(ranges.AsSpan(4, entryEnd - 4));
cols[colIndex++] = int.Parse(entry[4..]);
}
else if (ranges.StartsWith("tail", StringComparison.Ordinal))
{
@ -1659,18 +1661,18 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
}
else
{
var dash = ranges.IndexOf('-');
var dash = entry.IndexOf('-');
hasRanges |= true;
if (dash == -1)
{
isInRange |= int.Parse(ranges.AsSpan(0, entryEnd)) == rowId;
isInRange |= int.Parse(entry) == rowId;
}
else
{
isInRange |= rowId >= int.Parse(ranges.AsSpan(0, dash))
&& rowId <= int.Parse(ranges.AsSpan(dash + 1, entryEnd - dash - 1));
isInRange |= rowId >= int.Parse(entry[..dash])
&& rowId <= int.Parse(entry[(dash + 1)..]);
}
}