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

refactor: add internal JoinType enum

Browse Source
This commit is contained in:
Anna 2021-04-24 12:11:34 -04:00
parent dcbe9aa38d
commit a47324c388
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
XivCommon/Functions/PartyFinder.cs
View File

@ -57,18 +57,18 @@ namespace XivCommon.Functions {
this.RequestPfListingsHook = new Hook<RequestPartyFinderListingsDelegate>(requestPfPtr, new RequestPartyFinderListingsDelegate(this.OnRequestPartyFinderListings));
this.RequestPfListingsHook.Enable();
this.PartyFinderGui.ReceiveListing += this.ReceiveListing;
var joinPtr = scanner.ScanText("E8 ?? ?? ?? ?? 0F B7 47 28");
this.JoinPfHook = new Hook<JoinPfDelegate>(joinPtr, new JoinPfDelegate(this.JoinPfDetour));
this.JoinPfHook.Enable();
this.PartyFinderGui.ReceiveListing += this.ReceiveListing;
}
/// <inheritdoc />
public void Dispose() {
this.PartyFinderGui.ReceiveListing -= this.ReceiveListing;
this.RequestPfListingsHook?.Dispose();
this.JoinPfHook?.Dispose();
this.RequestPfListingsHook?.Dispose();
}
private void ReceiveListing(PartyFinderListing listing, PartyFinderListingEventArgs args) {
@ -92,12 +92,7 @@ namespace XivCommon.Functions {
var ret = this.JoinPfHook!.Original(manager, a2, type, packetData, a5);
PluginLog.Log($"Join type: {type}");
// 0 = join cross-world party via invite or convert normal party to cross-world
// 1 = join normal pf
// 3 = leave duty while in cross-world party
if (this.JoinParty == null || type != 1) {
if (this.JoinParty == null || (JoinType) type != JoinType.PartyFinder) {
return ret;
}
@ -140,4 +135,25 @@ namespace XivCommon.Functions {
this.RequestPartyFinderListings(this.PartyFinderAgent, categoryIdx);
}
}
internal enum JoinType : byte {
/// <summary>
/// Join via invite or party conversion.
/// </summary>
Normal = 0,
/// <summary>
/// Join via Party Finder.
/// </summary>
PartyFinder = 1,
Unknown2 = 2,
/// <summary>
/// Remain in cross-world party after leaving a duty.
/// </summary>
LeaveDuty = 3,
Unknown4 = 4,
}
}