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

Formatting, misc

Browse source
This commit is contained in:
Raymond 2021-08-16 09:00:16 -04:00
parent 072cee417b
commit 779179a0cf
4 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/Dalamud.cs
View file

@ -35,9 +35,7 @@ namespace Dalamud
#region Internals
private readonly ManualResetEvent unloadSignal;
private readonly ManualResetEvent finishUnloadSignal;
private bool hasDisposedPlugins = false;
#endregion
@ -237,6 +235,7 @@ namespace Dalamud
// Initialize FFXIVClientStructs function resolver
FFXIVClientStructs.Resolver.Initialize();
Log.Information("[T1] FFXIVClientStructs initialized!");
}
catch (Exception ex)

2
Dalamud/Game/Gui/FlyText/FlyTextGui.cs
View file

@ -133,7 +133,7 @@ namespace Dalamud.Game.Gui.FlyText
// Get the UI module and flytext addon pointers
var ui = (UIModule*)this.Dalamud.Framework.Gui.GetUIModule();
var flytext = this.Dalamud.Framework.Gui.GetUiObjectByName("_FlyText", 1);
var flytext = this.Dalamud.Framework.Gui.GetAddonByName("_FlyText", 1);
if (ui == null || flytext == IntPtr.Zero)
return;

1
Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;

7
Dalamud/Interface/Internal/Scratchpad/ScratchExecutionManager.cs
View file

@ -4,7 +4,6 @@ using System.Linq;
using Dalamud.Plugin;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;
using Microsoft.CodeAnalysis.CSharp.Scripting;
using Microsoft.CodeAnalysis.Scripting;
using Serilog;
@ -65,10 +64,10 @@ namespace Dalamud.Interface.Internal.Scratchpad
var options = ScriptOptions.Default
.AddReferences(typeof(ImGui).Assembly)
.AddReferences(typeof(Dalamud).Assembly)
.AddReferences(typeof(FFXIVClientStructs.Attributes.Addon).Assembly) // FFXIVClientStructs
.AddReferences(typeof(FFXIVClientStructs.Resolver).Assembly) // FFXIVClientStructs
.AddReferences(typeof(Lumina.GameData).Assembly) // Lumina
.AddReferences(typeof(TerritoryType).Assembly) // Lumina.Excel
// .WithReferences(MetadataReference.CreateFromFile(typeof(ScratchExecutionManager).Assembly.Location))
.AddReferences(typeof(Lumina.Excel.GeneratedSheets.TerritoryType).Assembly) // Lumina.Excel
// .WithReferences(MetadataReference.CreateFromFile(typeof(ScratchExecutionManager).Assembly.Location))
.AddImports("System")
.AddImports("System.IO")
.AddImports("System.Reflection")