9aea62bd9b
Batch #1675 by ragnarok-clanker: 2 byte-identical, 45 confirmed by peer review. - fn_10839 UIButton::Slot25: logic confirmed by peer review - fn_10852 UIButton::Slot31: logic confirmed by peer review - fn_10868 UIButton::Slot27: logic confirmed by peer review - fn_10930 UIStaticBitmap::SetBitmap: logic confirmed by peer review - fn_10931 UIBitmapButton::SetBitmap: logic confirmed by peer review - fn_11320 UIComboBoxEx2::Slot15: logic confirmed by peer review - fn_11326 UIListBox::Slot15: logic confirmed by peer review - fn_11327 UIListBoxEx::Slot15: logic confirmed by peer review - fn_11381 UIScrollBar::Paint: logic confirmed by peer review - fn_11383 UIScrollBar_Navi::Paint: logic confirmed by peer review - fn_11425 UIScrollBar::Slot25: logic confirmed by peer review - fn_11440 UIScrollBar::Slot31: logic confirmed by peer review - fn_11445 UITextButton::Slot31: logic confirmed by peer review - fn_11468 UIScrollBar::Slot27: logic confirmed by peer review - fn_11471 UITextButton::Slot27: logic confirmed by peer review - fn_11494 UITextButton::Slot33: logic confirmed by peer review - fn_11779 UIFrameWnd::Slot25: logic confirmed by peer review - fn_11781 UIFrameWnd::Slot31: logic confirmed by peer review - fn_11786 UIFrameWnd::Slot27: logic confirmed by peer review - fn_12610 CSession::GetOption: logic confirmed by peer review - fn_12689 ActivateShortcut: logic confirmed by peer review - fn_12711 ShortcutTooltip::Hover: logic confirmed by peer review - fn_12724 ShortcutDetails::Open: logic confirmed by peer review (already on main) - fn_12760 UIShortCutWnd::SendMsg: logic confirmed by peer review - fn_17144 UIWindowMgr::RemoveOrder: logic confirmed by peer review - fn_17158 UIWindowMgr::Capture: byte-identical - fn_17180 UIWindowMgr::BringToFront: logic confirmed by peer review - fn_17192 UIWindowMgr::IsOrderFixed: logic confirmed by peer review - fn_17232 UIWindowMgr::ReleaseCapture: byte-identical - fn_17255 UIWindowMgr::SetCapture: logic confirmed by peer review - fn_20382 CConnection::CConnection: logic confirmed by peer review - fn_20383 CRagConnection::CRagConnection: logic confirmed by peer review - fn_20384 CConnection::~CConnection: logic confirmed by peer review (already on main) - fn_20389 CConnection::Connect: logic confirmed by peer review - fn_20390 CConnection::Close: logic confirmed by peer review - fn_20409 GetRagConnection: logic confirmed by peer review - fn_21406 AutomaticSkills::Complete: logic confirmed by peer review - fn_03927 CCharacterLinkedUserDataMgr::CompleteLoad: logic confirmed by peer review - fn_03933 CCharacterLinkedUserDataMgr::Save: logic confirmed by peer review - fn_03937 CSession::SetOption: logic confirmed by peer review - fn_11073 UIScrollBar::UIScrollBar: logic confirmed by peer review - fn_11102 UIComboBoxEx2::~UIComboBoxEx2: logic confirmed by peer review (already on main) - fn_09150 AutomaticSkills::DisableAll: logic confirmed by peer review - fn_09153 AutomaticSkills::Use: logic confirmed by peer review - fn_10689 UIBitmapButton::~UIBitmapButton: logic confirmed by peer review (already on main) - fn_10795 UIBitmapButton::Paint: logic confirmed by peer review - fn_10817 UIStaticBitmap::Paint: logic confirmed by peer review Reviewed-by: ragnarok-clanker
70 lines
2.2 KiB
C++
70 lines
2.2 KiB
C++
#include "Client/Session.h"
|
|
#include "Contents/Async/AsyncWorkMgr.h"
|
|
#include "Contents/UserData/CharacterConfigLoad.h"
|
|
#include "Contents/UserData/CharacterLinkedUserDataMgr.h"
|
|
#include "Contents/Configuration/ServiceOptions.h"
|
|
#include "Contents/Skills/SkillLevelConfig.h"
|
|
#include "Contents/Skills/SkillLevelRegistry.h"
|
|
#include "UI/Shortcuts/NormalItemSlotLoad.h"
|
|
#include "Utility/Async/AsyncDiagnostic.h"
|
|
|
|
#include <json/reader.h>
|
|
#include <json/value.h>
|
|
|
|
// OFFSET: 0x005E6090
|
|
// FUNCTION: fn_03927
|
|
void CCharacterLinkedUserDataMgr::CompleteLoad(
|
|
AsyncDiagnostic diagnostic, std::uint32_t accountId, std::uint32_t characterId, std::string accountName, std::string response, CharacterConfigLoad& context
|
|
) {
|
|
if (!diagnostic.success) {
|
|
return;
|
|
}
|
|
|
|
Json::Value root;
|
|
Json::Reader reader;
|
|
const std::string document(response.c_str());
|
|
|
|
if (!reader.parse(document, root, true)) {
|
|
return;
|
|
}
|
|
|
|
const int type = root["Type"].asInt();
|
|
|
|
if (type == 4) {
|
|
context.registry.Load();
|
|
g_session.SetOption(7, 1, 0);
|
|
g_session.SetOption(8, 1, 0);
|
|
this->m_loaded = true;
|
|
} else if (type == 1) {
|
|
Json::Value& data = root["data"];
|
|
LoadUseSkillLevels(data, context.useLevels);
|
|
LoadHomunculusSkillLevels(data, context.homunculusLevels);
|
|
|
|
const Json::Value comparison = data["ItemComparison"];
|
|
context.serviceOptions.Set(264, comparison.isNull() ? true : comparison.asBool());
|
|
|
|
const Json::Value sorting = data["SortPrivateTab"];
|
|
context.sortPrivate = sorting.isNull() ? false : sorting.asBool();
|
|
|
|
LoadNormalItemSlots(data, context.items, context.saved, context.itemSlotActive, context.windows, context.visibility);
|
|
this->m_loaded = true;
|
|
}
|
|
|
|
this->m_accountId = accountId;
|
|
this->m_characterId = characterId;
|
|
this->m_accountName = accountName;
|
|
}
|
|
|
|
// OFFSET: 0x005E6E20
|
|
// FUNCTION: fn_03932
|
|
void CCharacterLinkedUserDataMgr::Load(
|
|
std::uint32_t accountId, std::uint32_t characterId, std::string accountName, const char* token16, CAsyncWorkMgr& workManager, CharacterConfigLoad& context
|
|
) {
|
|
if (accountId == 0 || characterId == 0) {
|
|
return;
|
|
}
|
|
|
|
const std::string token(token16, 16);
|
|
const std::string url = this->LoadUrl();
|
|
workManager.LoadCharacter(accountId, characterId, accountName, url, token, context);
|
|
}
|