anna
/
PeepingTom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: don't try to target invalid addresses

This commit is contained in:
Anna 2020-07-28 22:28:51 -04:00
parent c17e7d30ed
commit 88681aa33a
4 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Peeping Tom/GlobalSuppressions.cs
View File

@ -5,4 +5,4 @@
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "Will add later and don't need warnings clogging up", Scope = "member", Target = "~M:PeepingTom.PeepingTomPlugin.Initialize(Dalamud.Plugin.DalamudPluginInterface)")]
[assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "Will add later and don't need warnings clogging up", Scope = "module")]

7
Peeping Tom/Peeping Tom.csproj
View File

@ -40,13 +40,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Dalamud">
<HintPath>..\..\..\..\AppData\Roaming\XIVLauncher\addon\Hooks\Dalamud.dll</HintPath>
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\Dalamud.dll</HintPath>
</Reference>
<Reference Include="ImGui.NET">
<HintPath>..\..\..\..\AppData\Roaming\XIVLauncher\addon\Hooks\ImGui.NET.dll</HintPath>
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\ImGui.NET.dll</HintPath>
</Reference>
<Reference Include="ImGuiScene">
<HintPath>..\..\..\..\AppData\Roaming\XIVLauncher\addon\Hooks\ImGuiScene.dll</HintPath>
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\ImGuiScene.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1" />
<Reference Include="System" />
@ -64,6 +64,7 @@
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Plugin.cs" />
<Compile Include="PluginUI.cs" />
<Compile Include="Targeting.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>

48
Peeping Tom/PluginUI.cs
View File

@ -20,7 +20,7 @@ namespace PeepingTom {
private readonly Configuration config;
private readonly DalamudPluginInterface pi;
private readonly List<PlayerCharacter> previousTargeters = new List<PlayerCharacter>();
private readonly List<Targeter> previousTargeters = new List<Targeter>();
private IntPtr? previousFocus = null;
private long soundLastPlayed = 0;
private int lastTargetAmount = 0;
@ -285,16 +285,19 @@ namespace PeepingTom {
if (this.previousTargeters.Any(old => old.ActorId == targeter.ActorId)) {
this.previousTargeters.RemoveAll(old => old.ActorId == targeter.ActorId);
}
this.previousTargeters.Insert(0, targeter);
while (this.previousTargeters.Where(old => !targeting.Contains(old)).Count() > this.config.NumHistory) {
this.previousTargeters.Insert(0, new Targeter(targeter));
while (this.previousTargeters.Where(old => targeting.All(actor => actor.ActorId != old.ActorId)).Count() > this.config.NumHistory) {
this.previousTargeters.RemoveAt(this.previousTargeters.Count - 1);
}
}
this.AddEntry(targeter);
this.AddEntry(new Targeter(targeter), targeter.Address);
}
Targeter[] previous = this.previousTargeters
.Where(old => targeting.All(actor => actor.ActorId != old.ActorId))
.ToArray();
if (this.config.KeepHistory) {
foreach (PlayerCharacter oldTargeter in this.previousTargeters.Where(old => !targeting.Contains(old))) {
this.AddEntry(oldTargeter, ImGuiSelectableFlags.Disabled);
foreach (Targeter oldTargeter in previous) {
this.AddEntry(oldTargeter, null, ImGuiSelectableFlags.Disabled);
}
}
ImGui.ListBoxFooter();
@ -302,9 +305,9 @@ namespace PeepingTom {
if (this.config.FocusTargetOnHover && !ImGui.IsAnyItemHovered() && this.previousFocus != null) {
// old focus target still here
if (this.pi.ClientState.Actors.Any(actor => actor.Address == this.previousFocus)) {
this.FocusTargetRaw((IntPtr)this.previousFocus);
this.FocusTarget((IntPtr)this.previousFocus);
} else {
this.FocusTargetRaw(IntPtr.Zero);
this.FocusTarget(IntPtr.Zero);
}
this.previousFocus = null;
}
@ -330,18 +333,25 @@ namespace PeepingTom {
}
}
private void AddEntry(PlayerCharacter targeter, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None) {
private void AddEntry(Targeter targeter, IntPtr? address, ImGuiSelectableFlags flags = ImGuiSelectableFlags.None) {
ImGui.Selectable(targeter.Name, false, flags);
bool hover = ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled);
bool left = hover && ImGui.IsMouseClicked(0);
bool right = hover && ImGui.IsMouseClicked(1);
bool present = this.pi.ClientState.Actors.Any(actor => actor.ActorId == targeter.ActorId);
if (address == null) {
address = this.pi.ClientState.Actors
.Where(actor => actor.ActorId == targeter.ActorId)
.FirstOrDefault()
?.Address;
}
if (this.config.FocusTargetOnHover && hover && present) {
if (this.config.FocusTargetOnHover && hover && address != null) {
if (this.previousFocus == null) {
this.previousFocus = this.GetRawFocusTarget();
}
this.FocusTarget(targeter);
this.FocusTarget(address.Value);
}
if (left) {
@ -350,8 +360,8 @@ namespace PeepingTom {
this.pi.Framework.Gui.Chat.PrintChat(new XivChatEntry {
MessageBytes = new SeString(payloads).Encode()
});
} else if (right && present) {
this.Target(targeter);
} else if (right && address != null) {
this.Target(address.Value);
}
}
@ -402,16 +412,12 @@ namespace PeepingTom {
.FirstOrDefault();
}
private void Target(Actor actor) {
private void Target(IntPtr actor) {
IntPtr targetPtr = this.pi.TargetModuleScanner.ResolveRelativeAddress(this.pi.TargetModuleScanner.Module.BaseAddress, 0x1c64150);
Marshal.WriteIntPtr(targetPtr, actor.Address);
Marshal.WriteIntPtr(targetPtr, actor);
}
private void FocusTarget(Actor actor) {
FocusTargetRaw(actor.Address);
}
private void FocusTargetRaw(IntPtr ptr) {
private void FocusTarget(IntPtr ptr) {
IntPtr targetPtr = this.pi.TargetModuleScanner.ResolveRelativeAddress(this.pi.TargetModuleScanner.Module.BaseAddress, 0x1c641c8);
Marshal.WriteIntPtr(targetPtr, ptr);
}

29
Peeping Tom/Targeting.cs Normal file
View File

@ -0,0 +1,29 @@
using Dalamud.Game.ClientState.Actors.Resolvers;
using Dalamud.Game.ClientState.Actors.Types;
using Dalamud.Plugin;
using System;
using System.Linq;
namespace PeepingTom {
public class Targeter {
public string Name { get; }
public World HomeWorld { get; }
public int ActorId { get; }
public Targeter(PlayerCharacter character) {
if (character == null) {
throw new ArgumentNullException(nameof(character), "PlayerCharacter cannot be null");
}
this.Name = character.Name;
this.HomeWorld = character.HomeWorld;
this.ActorId = character.ActorId;
}
public PlayerCharacter GetPlayerCharacter(DalamudPluginInterface pi) {
if (pi == null) {
throw new ArgumentNullException(nameof(pi), "DalamudPluginInterface cannot be null");
}
return pi.ClientState.Actors.FirstOrDefault(actor => actor.ActorId == this.ActorId && actor is PlayerCharacter) as PlayerCharacter;
}
}
}