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

fix cs breaks

Browse source
This commit is contained in:
Kaz Wolfe 2024-11-11 08:54:57 -08:00
parent 167e76911e
commit 084f8b55e7
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/Addon/Events/PluginEventController.cs
View file

@ -165,7 +165,7 @@ internal unsafe class PluginEventController : IDisposable
{ {
var paramKeyMatches = currentEvent->Param == eventEntry.ParamKey; var paramKeyMatches = currentEvent->Param == eventEntry.ParamKey;
var eventListenerAddressMatches = (nint)currentEvent->Listener == this.EventListener.Address; var eventListenerAddressMatches = (nint)currentEvent->Listener == this.EventListener.Address;
var eventTypeMatches = currentEvent->Type == eventType; var eventTypeMatches = currentEvent->State.EventType == eventType;
if (paramKeyMatches && eventListenerAddressMatches && eventTypeMatches) if (paramKeyMatches && eventListenerAddressMatches && eventTypeMatches)
{ {

4
Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
View file

@ -16,7 +16,7 @@ public unsafe partial class AddonTree
{ {
private static readonly Dictionary<string, Type?> AddonTypeDict = []; private static readonly Dictionary<string, Type?> AddonTypeDict = [];
private static readonly Assembly? ClientStructsAssembly = typeof(Addon).Assembly; private static readonly Assembly? ClientStructsAssembly = typeof(AddonAttribute).Assembly;
/// <summary> /// <summary>
/// Gets or sets a collection of names for field offsets that have been documented in FFXIVClientStructs. /// Gets or sets a collection of names for field offsets that have been documented in FFXIVClientStructs.
@ -36,7 +36,7 @@ public unsafe partial class AddonTree
{ {
foreach (var t in from t in ClientStructsAssembly.GetTypes() foreach (var t in from t in ClientStructsAssembly.GetTypes()
where t.IsPublic where t.IsPublic
let xivAddonAttr = (Addon?)t.GetCustomAttribute(typeof(Addon), false) let xivAddonAttr = (AddonAttribute?)t.GetCustomAttribute(typeof(AddonAttribute), false)
where xivAddonAttr != null where xivAddonAttr != null
where xivAddonAttr.AddonIdentifiers.Contains(this.AddonName) where xivAddonAttr.AddonIdentifiers.Contains(this.AddonName)
select t) select t)

8
Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
View file

@ -36,7 +36,7 @@ public static class Events
ImGui.TableSetupColumn("Type", WidthFixed); ImGui.TableSetupColumn("Type", WidthFixed);
ImGui.TableSetupColumn("Param", WidthFixed); ImGui.TableSetupColumn("Param", WidthFixed);
ImGui.TableSetupColumn("Flags", WidthFixed); ImGui.TableSetupColumn("Flags", WidthFixed);
ImGui.TableSetupColumn("Unk29", WidthFixed); ImGui.TableSetupColumn("StateFlags1", WidthFixed);
ImGui.TableSetupColumn("Target", WidthFixed); ImGui.TableSetupColumn("Target", WidthFixed);
ImGui.TableSetupColumn("Listener", WidthFixed); ImGui.TableSetupColumn("Listener", WidthFixed);
@ -48,13 +48,13 @@ public static class Events
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextUnformatted($"{i++}"); ImGui.TextUnformatted($"{i++}");
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->Type}"); ImGui.TextUnformatted($"{evt->State.EventType}");
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->Param}"); ImGui.TextUnformatted($"{evt->Param}");
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->Flags}"); ImGui.TextUnformatted($"{evt->State.StateFlags}");
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->Unk29}"); ImGui.TextUnformatted($"{evt->State.UnkFlags1}");
ImGui.TableNextColumn(); ImGui.TableNextColumn();
Gui.ClickToCopyText($"{(nint)evt->Target:X}"); Gui.ClickToCopyText($"{(nint)evt->Target:X}");
ImGui.TableNextColumn(); ImGui.TableNextColumn();