Maintenance: [forced, user-approved] Family G27 (resubmit of 10254 rebased on e235d90a; only conflict was the AsyncWorkMgr.h forward
Batch #10259 by ragnarok-clanker: forced by an admin (1 lower score(s), 11 changed function(s)); checked with 508 compiled unit(s), including every includer of Source/Contents/Async/AsyncWorkMgr.h, Source/Contents/Skills/SkillLevelRegistry.h, Source/Contents/UserData/CharacterLinkedUserDataLoadAsyncWork.h, Source/Contents/UserData/CharacterLinkedUserDataMgr.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWindowMgr.inl, Source/Contents/Skills/SkillLevelConfig.h, Source/Contents/UserData/CharacterConfigLoad.h, Source/UI/Shortcuts/NormalItemSlotLoad.h. Deletes: Source/Contents/Skills/SkillLevelConfig.h, Source/Contents/UserData/CharacterConfigLoad.h, Source/UI/Shortcuts/NormalItemSlotLoad.h
This commit is contained in:
parent
15ee30e2aa
commit
bd0ade90cd
16 changed files with 63 additions and 124 deletions
|
|
@ -112,12 +112,12 @@ void CAsyncWorkMgr::ChangePartyMaster(
|
|||
// OFFSET: 0x00574190
|
||||
// FUNCTION: fn_02502
|
||||
void CAsyncWorkMgr::LoadCharacter(
|
||||
std::uint32_t accountId, std::uint32_t characterId, std::string world, std::string url, std::string token, CharacterConfigLoad& context
|
||||
std::uint32_t accountId, std::uint32_t characterId, std::string world, std::string url, std::string token
|
||||
) {
|
||||
NAsyncWorkPtr work(this->m_pools, "CharacterLinkedUserData_Load");
|
||||
|
||||
if (work.Get()) {
|
||||
static_cast<CCharacterLinkedUserDataLoadAsyncWork*>(work.Get())->Bind(accountId, characterId, world, url, token, context);
|
||||
static_cast<CCharacterLinkedUserDataLoadAsyncWork*>(work.Get())->Bind(accountId, characterId, world, url, token);
|
||||
this->Submit(work);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ class CConnection;
|
|||
class CEmblemDataMgr;
|
||||
#include "UI/Window/WindowManagerWindows.h"
|
||||
struct AccountConfigLoad;
|
||||
struct CharacterConfigLoad;
|
||||
|
||||
class CAsyncWorkMgr : public NAsyncWorkMgr {
|
||||
public:
|
||||
|
|
@ -25,7 +24,7 @@ public:
|
|||
std::uint32_t accountId, std::uint32_t characterId, std::string characterName, std::uint32_t targetAccountId, std::uint32_t targetCharacterId,
|
||||
std::string targetName, std::string world, std::string url, std::string token, WindowManagerWindows& windows
|
||||
);
|
||||
void LoadCharacter(std::uint32_t accountId, std::uint32_t characterId, std::string world, std::string url, std::string token, CharacterConfigLoad& context);
|
||||
void LoadCharacter(std::uint32_t accountId, std::uint32_t characterId, std::string world, std::string url, std::string token);
|
||||
void SaveCharacter(std::uint32_t accountId, std::uint32_t characterId, std::string world, std::string url, std::string token, std::string data);
|
||||
void DownloadEmblem(
|
||||
std::string url, std::uint32_t accountId, std::string token, std::string world, std::uint32_t guildId, std::uint32_t version, CConnection& connection
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue