From edc79a7327a90d8c6d29c915d53a5632055a00be Mon Sep 17 00:00:00 2001 From: Raymond Date: Fri, 3 Sep 2021 06:13:42 -0400 Subject: [PATCH] formatting --- Dalamud/Game/Internal/DalamudAtkTweaks.cs | 6 ++---- Dalamud/Interface/UiBuilder.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Dalamud/Game/Internal/DalamudAtkTweaks.cs b/Dalamud/Game/Internal/DalamudAtkTweaks.cs index f917e4f57..404eeaf90 100644 --- a/Dalamud/Game/Internal/DalamudAtkTweaks.cs +++ b/Dalamud/Game/Internal/DalamudAtkTweaks.cs @@ -48,10 +48,8 @@ namespace Dalamud.Game.Internal var uiModuleRequestMainCommandAddress = sigScanner.ScanText("40 53 56 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 48 8B 01 8B DA 48 8B F1 FF 90 ?? ?? ?? ??"); this.hookUiModuleRequestMainCommand = new Hook(uiModuleRequestMainCommandAddress, this.UiModuleRequestMainCommandDetour); - var atkUnitBaseReceiveGlobalEventAddress = - sigScanner.ScanText("48 89 5C 24 ?? 48 89 7C 24 ?? 55 41 56 41 57 48 8B EC 48 83 EC 50 44 0F B7 F2 "); - this.hookAtkUnitBaseReceiveGlobalEvent = - new Hook(atkUnitBaseReceiveGlobalEventAddress, this.AtkUnitBaseReceiveGlobalEventDetour); + var atkUnitBaseReceiveGlobalEventAddress = sigScanner.ScanText("48 89 5C 24 ?? 48 89 7C 24 ?? 55 41 56 41 57 48 8B EC 48 83 EC 50 44 0F B7 F2 "); + this.hookAtkUnitBaseReceiveGlobalEvent = new Hook(atkUnitBaseReceiveGlobalEventAddress, this.AtkUnitBaseReceiveGlobalEventDetour); } private delegate void AgentHudOpenSystemMenuPrototype(void* thisPtr, AtkValue* atkValueArgs, uint menuSize); diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs index 4d7439025..ab0ad6f6e 100644 --- a/Dalamud/Interface/UiBuilder.cs +++ b/Dalamud/Interface/UiBuilder.cs @@ -173,16 +173,16 @@ namespace Dalamud.Interface /// /// The full filepath to the image. /// A object wrapping the created image. Use inside ImGui.Image(). - public TextureWrap LoadImage(string filePath) => - Service.Get().LoadImage(filePath); + public TextureWrap LoadImage(string filePath) + => Service.Get().LoadImage(filePath); /// /// Loads an image from a byte stream, such as a png downloaded into memory. /// /// A byte array containing the raw image data. /// A object wrapping the created image. Use inside ImGui.Image(). - public TextureWrap LoadImage(byte[] imageData) => - Service.Get().LoadImage(imageData); + public TextureWrap LoadImage(byte[] imageData) + => Service.Get().LoadImage(imageData); /// /// Loads an image from raw unformatted pixel data, with no type or header information. To load formatted data, use . @@ -192,8 +192,8 @@ namespace Dalamud.Interface /// The height of the image contained in . /// The number of channels (bytes per pixel) of the image contained in . This should usually be 4. /// A object wrapping the created image. Use inside ImGui.Image(). - public TextureWrap LoadImageRaw(byte[] imageData, int width, int height, int numChannels) => - Service.Get().LoadImageRaw(imageData, width, height, numChannels); + public TextureWrap LoadImageRaw(byte[] imageData, int width, int height, int numChannels) + => Service.Get().LoadImageRaw(imageData, width, height, numChannels); /// /// Call this to queue a rebuild of the font atlas.