- Fix incorrect function call for novice network

- Fix keybind handler being obsolete
This commit is contained in:
Infi
2025-09-11 01:30:07 +02:00
parent 8c4410e75c
commit efdf69f782
4 changed files with 13 additions and 14 deletions
+1 -3
View File
@@ -10,9 +10,7 @@ internal sealed unsafe class Context
internal static void InviteToNoviceNetwork(string name, ushort world)
{
// can specify content id if we have it, but there's no need
fixed (byte* namePtr = name.ToTerminatedBytes()) {
InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, world, namePtr);
}
InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
}
internal static void TryOn(uint itemId, byte stainId)
+9 -8
View File
@@ -467,19 +467,20 @@ internal unsafe class KeybindManager : IDisposable {
private static Keybind GetKeybind(string id)
{
var outData = new UIInputData.Keybind();
var outData = new FFXIVClientStructs.FFXIV.Client.System.Input.Keybind();
var idString = Utf8String.FromString(id);
UIInputData.Instance()->GetKeybind(idString, &outData);
UIInputData.Instance()->GetKeybindByName(idString, &outData);
idString->Dtor(true);
var key1 = RemapInvalidVirtualKey((VirtualKey) outData.Key);
var key2 = RemapInvalidVirtualKey((VirtualKey) outData.AltKey);
var key1 = outData.KeySettings[0];
var key2 = outData.KeySettings[1];
return new Keybind
{
Key1 = key1,
Modifier1 = (ModifierFlag) outData.Modifier,
Key2 = key2,
Modifier2 = (ModifierFlag) outData.AltModifier,
Key1 = RemapInvalidVirtualKey((VirtualKey) key1.Key),
Modifier1 = (ModifierFlag) key1.KeyModifier,
Key2 = RemapInvalidVirtualKey((VirtualKey) key2.Key),
Modifier2 = (ModifierFlag) key2.KeyModifier,
};
}