Remove goto

This commit is contained in:
Infi
2024-05-16 17:12:56 +02:00
parent d4c4b9059a
commit 2ab56db678
2 changed files with 5 additions and 9 deletions
+2 -8
View File
@@ -300,19 +300,13 @@ internal unsafe class GameFunctions : IDisposable
private nint ResolveTextCommandPlaceholderDetour(nint a1, byte* placeholderText, byte a3, byte a4)
{
if (ReplacementName == null)
goto Original;
var placeholder = MemoryHelper.ReadStringNullTerminated((nint) placeholderText);
if (placeholder != Placeholder)
goto Original;
if (ReplacementName == null || placeholder != Placeholder)
return ResolveTextCommandPlaceholderHook!.Original(a1, placeholderText, a3, a4);
MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
ReplacementName = null;
return PlaceholderNamePtr;
Original:
return ResolveTextCommandPlaceholderHook!.Original(a1, placeholderText, a3, a4);
}
}
+3 -1
View File
@@ -5,6 +5,7 @@ using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Windowing;
using ImGuiNET;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace ChatTwo.Ui;
@@ -64,7 +65,7 @@ public class SeStringDebugger : Window
ImGui.TextUnformatted("Nothing to show");
}
private static void ProcessPayloads(List<Payload> payloads)
private void ProcessPayloads(List<Payload> payloads)
{
foreach (var payload in payloads)
{
@@ -152,6 +153,7 @@ public class SeStringDebugger : Window
RenderMetadataDictionary("Link AutoTranslatePayload", new Dictionary<string, string?>
{
{ "Text", at.Text },
{ "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) },
});
break;
}