ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-19 14:27:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #375 from daemitus/FixActorName

Browse source 
The ultimate fix (for actor names)
This commit is contained in:
goaaats 2021-06-16 14:50:36 +02:00 • committed by GitHub
commit 249e490c1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Game/ClientState/Actors/Types/Actor.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Text;
using Dalamud.Game.ClientState.Structs; using Dalamud.Game.ClientState.Structs;
using Serilog;
namespace Dalamud.Game.ClientState.Actors.Types namespace Dalamud.Game.ClientState.Actors.Types
{ {
@ -12,6 +13,8 @@ namespace Dalamud.Game.ClientState.Actors.Types
private readonly Structs.Actor actorStruct; private readonly Structs.Actor actorStruct;
private readonly Dalamud dalamud; private readonly Dalamud dalamud;
private string name;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="Actor"/> class. /// Initializes a new instance of the <see cref="Actor"/> class.
/// This represents a basic FFXIV actor. /// This represents a basic FFXIV actor.
@ -40,7 +43,7 @@ namespace Dalamud.Game.ClientState.Actors.Types
/// <summary> /// <summary>
/// Gets the displayname of this <see cref="Actor" />. /// Gets the displayname of this <see cref="Actor" />.
/// </summary> /// </summary>
public string Name => this.ActorStruct.Name; public string Name => this.name ??= Util.GetUTF8String(this.actorStruct.Name);
/// <summary> /// <summary>
/// Gets the actor ID of this <see cref="Actor" />. /// Gets the actor ID of this <see cref="Actor" />.

4
Dalamud/Game/ClientState/Structs/Actor.cs
View file

@ -14,8 +14,8 @@ namespace Dalamud.Game.ClientState.Structs
/// The actor name. /// The actor name.
/// </summary> /// </summary>
[FieldOffset(ActorOffsets.Name)] [FieldOffset(ActorOffsets.Name)]
[MarshalAs(UnmanagedType.LPUTF8Str, SizeConst = 30)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 30)]
public string Name; public byte[] Name;
/// <summary> /// <summary>
/// The actor's internal id. /// The actor's internal id.

31
Dalamud/Util.cs
View file

@ -165,5 +165,36 @@ namespace Dalamud
NativeFunctions.MessageBox(Process.GetCurrentProcess().MainWindowHandle, message, caption, flags); NativeFunctions.MessageBox(Process.GetCurrentProcess().MainWindowHandle, message, caption, flags);
Environment.Exit(-1); Environment.Exit(-1);
} }
/// <summary>
/// Retrieve a UTF8 string from a null terminated byte array.
/// </summary>
/// <param name="array">A null terminated UTF8 byte array.</param>
/// <returns>A UTF8 encoded string.</returns>
public static string GetUTF8String(byte[] array)
{
var count = 0;
for (; count < array.Length; count++)
{
if (array[count] == 0)
break;
}
string text;
if (count == array.Length)
{
text = Encoding.UTF8.GetString(array);
Log.Warning($"Warning: text exceeds underlying array length ({text})");
}
else
{
text = Encoding.UTF8.GetString(array, 0, count);
}
return text;
}
// TODO: Someone implement GetUTF8String with some IntPtr overloads.
// while(Marshal.ReadByte(0, sz) != 0) { sz++; }
} }
} }