diff --git a/XivCommon/Functions/BattleTalk.cs b/XivCommon/Functions/BattleTalk.cs index c712f1a..5443f04 100755 --- a/XivCommon/Functions/BattleTalk.cs +++ b/XivCommon/Functions/BattleTalk.cs @@ -43,7 +43,7 @@ namespace XivCommon.Functions { this.SeStringManager = seStringManager; this.HookEnabled = hook; - if (scanner.ScanTextSafe(Signatures.AddBattleTalk, out var addBattleTalkPtr, "battle talk")) { + if (scanner.TryScanText(Signatures.AddBattleTalk, out var addBattleTalkPtr, "battle talk")) { this.AddBattleTalk = Marshal.GetDelegateForFunctionPointer(addBattleTalkPtr); if (this.HookEnabled) { diff --git a/XivCommon/Functions/Chat.cs b/XivCommon/Functions/Chat.cs index 4a0e6c4..9e4196b 100755 --- a/XivCommon/Functions/Chat.cs +++ b/XivCommon/Functions/Chat.cs @@ -22,7 +22,7 @@ namespace XivCommon.Functions { internal Chat(GameFunctions functions, SigScanner scanner) { this.Functions = functions; - if (scanner.ScanTextSafe(Signatures.SendChat, out var processChatBoxPtr, "chat sending")) { + if (scanner.TryScanText(Signatures.SendChat, out var processChatBoxPtr, "chat sending")) { this.ProcessChatBox = Marshal.GetDelegateForFunctionPointer(processChatBoxPtr); } } diff --git a/XivCommon/Functions/ChatBubbles.cs b/XivCommon/Functions/ChatBubbles.cs index fa6d96f..4424eed 100755 --- a/XivCommon/Functions/ChatBubbles.cs +++ b/XivCommon/Functions/ChatBubbles.cs @@ -65,12 +65,12 @@ namespace XivCommon.Functions { return; } - if (scanner.ScanTextSafe(Signatures.ChatBubbleOpen, out var openPtr, "chat bubbles open")) { + if (scanner.TryScanText(Signatures.ChatBubbleOpen, out var openPtr, "chat bubbles open")) { this.OpenChatBubbleHook = new Hook(openPtr, new OpenChatBubbleDelegate(this.OpenChatBubbleDetour)); this.OpenChatBubbleHook.Enable(); } - if (scanner.ScanTextSafe(Signatures.ChatBubbleUpdate, out var updatePtr, "chat bubbles update")) { + if (scanner.TryScanText(Signatures.ChatBubbleUpdate, out var updatePtr, "chat bubbles update")) { unsafe { this.UpdateChatBubbleHook = new Hook(updatePtr + 9, new UpdateChatBubbleDelegate(this.UpdateChatBubbleDetour)); } diff --git a/XivCommon/Functions/Examine.cs b/XivCommon/Functions/Examine.cs index 139cc3c..c460db0 100755 --- a/XivCommon/Functions/Examine.cs +++ b/XivCommon/Functions/Examine.cs @@ -25,7 +25,7 @@ namespace XivCommon.Functions { this.Functions = functions; // got this by checking what accesses rciData below - if (scanner.ScanTextSafe(Signatures.RequestCharacterInfo, out var rciPtr, "Examine")) { + if (scanner.TryScanText(Signatures.RequestCharacterInfo, out var rciPtr, "Examine")) { this.RequestCharacterInfo = Marshal.GetDelegateForFunctionPointer(rciPtr); } } diff --git a/XivCommon/Functions/PartyFinder.cs b/XivCommon/Functions/PartyFinder.cs index 549f653..e11cb9e 100755 --- a/XivCommon/Functions/PartyFinder.cs +++ b/XivCommon/Functions/PartyFinder.cs @@ -53,7 +53,7 @@ namespace XivCommon.Functions { this.ListingsEnabled = hooks.HasFlag(Hooks.PartyFinderListings); this.JoinsEnabled = hooks.HasFlag(Hooks.PartyFinderJoins); - if (scanner.ScanTextSafe(Signatures.RequestListings, out var requestPfPtr, "Party Finder listings")) { + if (scanner.TryScanText(Signatures.RequestListings, out var requestPfPtr, "Party Finder listings")) { this.RequestPartyFinderListings = Marshal.GetDelegateForFunctionPointer(requestPfPtr); if (this.ListingsEnabled) { @@ -63,7 +63,7 @@ namespace XivCommon.Functions { } if (this.JoinsEnabled) { - if (scanner.ScanTextSafe(Signatures.JoinCrossParty, out var joinPtr, "Party Finder joins")) { + if (scanner.TryScanText(Signatures.JoinCrossParty, out var joinPtr, "Party Finder joins")) { this.JoinPfHook = new Hook(joinPtr, new JoinPfDelegate(this.JoinPfDetour)); this.JoinPfHook.Enable(); diff --git a/XivCommon/Functions/Talk.cs b/XivCommon/Functions/Talk.cs index d6af404..54ce912 100755 --- a/XivCommon/Functions/Talk.cs +++ b/XivCommon/Functions/Talk.cs @@ -48,7 +48,7 @@ namespace XivCommon.Functions { internal Talk(SigScanner scanner, SeStringManager manager, bool hooksEnabled) { this.SeStringManager = manager; - if (scanner.ScanTextSafe(Signatures.SetAtkValue, out var setAtkPtr, "Talk - set atk value")) { + if (scanner.TryScanText(Signatures.SetAtkValue, out var setAtkPtr, "Talk - set atk value")) { this.SetAtkValueString = Marshal.GetDelegateForFunctionPointer(setAtkPtr); } else { return; @@ -58,7 +58,7 @@ namespace XivCommon.Functions { return; } - if (scanner.ScanTextSafe(Signatures.ShowMessageBox, out var showMessageBoxPtr, "Talk")) { + if (scanner.TryScanText(Signatures.ShowMessageBox, out var showMessageBoxPtr, "Talk")) { this.AddonTalkV45Hook = new Hook(showMessageBoxPtr, new AddonTalkV45Delegate(this.AddonTalkV45Detour)); this.AddonTalkV45Hook.Enable(); } diff --git a/XivCommon/SigScannerExt.cs b/XivCommon/SigScannerExt.cs index e8e24e5..2205420 100755 --- a/XivCommon/SigScannerExt.cs +++ b/XivCommon/SigScannerExt.cs @@ -13,7 +13,7 @@ namespace XivCommon { /// pointer where signature was found or if not found /// name of this signature - if specified, a warning will be printed if the signature could not be found /// true if signature was found - internal static bool ScanTextSafe(this SigScanner scanner, string sig, out IntPtr result, string? name = null) { + internal static bool TryScanText(this SigScanner scanner, string sig, out IntPtr result, string? name = null) { result = IntPtr.Zero; try { result = scanner.ScanText(sig);