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
|
|
@ -6,7 +6,9 @@
|
|||
|
||||
class LuaScript;
|
||||
struct AsyncDiagnostic;
|
||||
struct CharacterConfigLoad;
|
||||
namespace Json {
|
||||
class Value;
|
||||
}
|
||||
struct CharacterConfigSave;
|
||||
class CAsyncWorkMgr;
|
||||
|
||||
|
|
@ -19,12 +21,11 @@ public:
|
|||
std::string LoadUrl() const;
|
||||
std::string SaveUrl() const;
|
||||
void CompleteSave();
|
||||
void CompleteLoad(
|
||||
AsyncDiagnostic diagnostic, std::uint32_t accountId, std::uint32_t characterId, std::string accountName, std::string response, CharacterConfigLoad& context
|
||||
);
|
||||
void Load(
|
||||
std::uint32_t accountId, std::uint32_t characterId, std::string accountName, const char* token16, CAsyncWorkMgr& workManager, CharacterConfigLoad& context
|
||||
);
|
||||
void CompleteLoad(AsyncDiagnostic diagnostic, std::uint32_t accountId, std::uint32_t characterId, std::string accountName, std::string response);
|
||||
void Load(std::uint32_t accountId, std::uint32_t characterId, std::string accountName);
|
||||
void LoadUseSkillLevels(Json::Value& data);
|
||||
void LoadHomunculusSkillLevels(Json::Value& data);
|
||||
void LoadNormalItemSlots(Json::Value& data);
|
||||
void Save(CharacterConfigSave& context, const char* token16, CAsyncWorkMgr& workManager);
|
||||
void RefreshUrls(LuaScript& script, const char* host, const char* port, const char* overrideKey);
|
||||
void Reset(LuaScript& script, const char* host, const char* port, const char* overrideKey);
|
||||
|
|
@ -41,6 +42,7 @@ protected:
|
|||
};
|
||||
|
||||
extern CCharacterLinkedUserDataMgr* g_characterLinkedUserDataMgr;
|
||||
extern bool g_sortPrivateTab;
|
||||
|
||||
#if defined(_WIN32) && !defined(_WIN64)
|
||||
static_assert(sizeof(CCharacterLinkedUserDataMgr) == 96);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue