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

Merge pull request #688 from goatcorp/endwalker

Browse source
This commit is contained in:
goaaats 2021-12-03 17:50:04 +01:00 • committed by GitHub
commit 4a69b5a6c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
View file

@ -16,7 +16,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Build"> <PropertyGroup Label="Build">
<OutputPath>$(AppData)\XIVLauncher\devPlugins\Dalamud.CorePlugin</OutputPath> <OutputPath>bin\$(Configuration)</OutputPath>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>

2
Dalamud/Game/ClientState/Fates/Fate.cs
View file

@ -131,6 +131,6 @@ namespace Dalamud.Game.ClientState.Fates
/// <summary> /// <summary>
/// Gets the territory this <see cref="Fate"/> is located in. /// Gets the territory this <see cref="Fate"/> is located in.
/// </summary> /// </summary>
public ExcelResolver<Lumina.Excel.GeneratedSheets.TerritoryType> TerritoryType => new(this.Struct->TerritoryID); public ExcelResolver<Lumina.Excel.GeneratedSheets.TerritoryType> TerritoryType => new(this.Struct->TerritoryId);
} }
} }

12
Dalamud/Game/ClientState/Fates/FateTable.cs
View file

@ -45,16 +45,13 @@ namespace Dalamud.Game.ClientState.Fates
return 0; return 0;
// Sonar used this to check if the table was safe to read // Sonar used this to check if the table was safe to read
var check = Struct->Unk80.ToInt64(); if (Struct->FateDirector == null)
if (check == 0)
return 0; return 0;
var start = Struct->FirstFatePtr.ToInt64(); if (Struct->Fates.First == null || Struct->Fates.Last == null)
var end = Struct->LastFatePtr.ToInt64();
if (start == 0 || end == 0)
return 0; return 0;
return (int)((end - start) / 8); return (int)Struct->Fates.Capacity();
} }
} }
@ -102,8 +99,7 @@ namespace Dalamud.Game.ClientState.Fates
if (fateTable == IntPtr.Zero) if (fateTable == IntPtr.Zero)
return IntPtr.Zero; return IntPtr.Zero;
var firstFate = this.Struct->FirstFatePtr; return *(IntPtr*)this.Struct->Fates.Get((ulong)index).Value;
return *(IntPtr*)(firstFate + (8 * index));
} }
/// <summary> /// <summary>

30
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -387,16 +387,16 @@ namespace Dalamud.Interface.Internal.Windows
{ {
ImGui.Text(Locs.FeedbackModal_Text(this.feedbackPlugin.Name)); ImGui.Text(Locs.FeedbackModal_Text(this.feedbackPlugin.Name));
if (this.feedbackPlugin?.FeedbackMessage != null) if (this.feedbackPlugin?.FeedbackMessage != null)
{ {
ImGui.TextWrapped(this.feedbackPlugin.FeedbackMessage); ImGui.TextWrapped(this.feedbackPlugin.FeedbackMessage);
} }
if (this.pluginListUpdatable.Any( if (this.pluginListUpdatable.Any(
up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName)) up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName))
{ {
ImGui.TextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_HasUpdate); ImGui.TextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_HasUpdate);
} }
ImGui.Spacing(); ImGui.Spacing();
@ -1231,10 +1231,10 @@ namespace Dalamud.Interface.Internal.Windows
this.DrawVisitRepoUrlButton(manifest.RepoUrl); this.DrawVisitRepoUrlButton(manifest.RepoUrl);
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback) if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{ {
this.DrawSendFeedbackButton(manifest); this.DrawSendFeedbackButton(manifest);
} }
ImGuiHelpers.ScaledDummy(5); ImGuiHelpers.ScaledDummy(5);
@ -1405,8 +1405,8 @@ namespace Dalamud.Interface.Internal.Windows
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadText); ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadText);
var isThirdParty = manifest.IsThirdParty; var isThirdParty = manifest.IsThirdParty;
var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback; var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback;
// Installed from // Installed from
if (plugin.IsDev) if (plugin.IsDev)