From 8ae071b99085e0d9738b5695b57f912439f97b80 Mon Sep 17 00:00:00 2001 From: Thorny Date: Sat, 13 Jun 2020 12:29:45 -0400 Subject: [PATCH] 1.16 - Changed [me] and [p0-5] to use player name instead of ID. Should fix follow issues. Changed name of memory mapped file to match version on it's own to prevent any collisions if user tries to load 2 different versions at once. --- release/plugins/MultiSend.dll | Bin 68608 -> 69120 bytes src/MultiSend/Main.cpp | 8 ++++++-- src/MultiSend/text_sanitizing.cpp | 14 +++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/release/plugins/MultiSend.dll b/release/plugins/MultiSend.dll index 561286c279786f8920629a47818ac641dabd4fb4..f60ef457a423b25e00b0128df0428642a339c0cc 100644 GIT binary patch delta 15833 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.PluginVersion); + //create a handle to the MMF, size matches the struct we're using for it HANDLE hMapFile = CreateFileMapping( INVALID_HANDLE_VALUE, @@ -45,7 +49,7 @@ bool MultiSend::Initialize(IAshitaCore* core, ILogManager* log, uint32_t id) PAGE_READWRITE, 0, // maximum object size (high-order DWORD) sizeof(MMF_Global), // maximum object size (low-order DWORD) - "FFXI_MultiSend_1_15"); + buffer); bool made = (GetLastError() == 0); @@ -119,7 +123,7 @@ __declspec(dllexport) void __stdcall CreatePluginInfo(plugininfo_t* lpBuffer) strcpy_s(g_PluginInfo->Author, sizeof(g_PluginInfo->Author), "Thorny"); g_PluginInfo->InterfaceVersion = ASHITA_INTERFACE_VERSION; - g_PluginInfo->PluginVersion = 1.15f; + g_PluginInfo->PluginVersion = 1.16f; g_PluginInfo->Priority = 0; } diff --git a/src/MultiSend/text_sanitizing.cpp b/src/MultiSend/text_sanitizing.cpp index c06af60..421f107 100644 --- a/src/MultiSend/text_sanitizing.cpp +++ b/src/MultiSend/text_sanitizing.cpp @@ -7,43 +7,43 @@ std::string MultiSend::SubValues(std::string Input) size_t find = Working.find("[me]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(0))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0))); } find = Working.find("[p0]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(0))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0))); } find = Working.find("[p1]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(1))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(1))); } find = Working.find("[p2]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(2))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(2))); } find = Working.find("[p3]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(3))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(3))); } find = Working.find("[p4]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(4))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4))); } find = Working.find("[p5]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(5))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(5))); } find = Working.find("[t]");