Maintenance: [forced, user-approved] Family G22: remove StoreBackupData, ItemTagRetirement/ItemTagRemoval, SoundMgrContext, JobInheri
Batch #10242 by ragnarok-clanker: forced by an admin (7 lower score(s), 33 changed function(s)); checked with 260 compiled unit(s), including every includer of Source/Client/Session.h, Source/Contents/Jobs/JobInheritance.h, Source/Contents/Sound/SoundMgr.h, Source/Contents/Store/MCStoreInfoBackup.h, Source/UI/Edit/ItemTagRetirement.h, Source/UI/Edit/UIItemTagCtrl.h, Source/UI/Shortcuts/ShortcutPainting.h, Source/UI/Shortcuts/UIQuickSlotWnd.h, Source/Contents/Configuration/OptionWriter.h, Source/Contents/Store/StoreBackupData.h. Deletes: Source/Contents/Configuration/OptionWriter.h, Source/Contents/Store/StoreBackupData.h
This commit is contained in:
parent
b2e04b8f13
commit
8a04248e21
21 changed files with 172 additions and 242 deletions
|
|
@ -2,7 +2,6 @@
|
|||
#include "Contents/Async/AsyncWorkMgr.h"
|
||||
#include "Contents/Store/MCStoreInfoBackup.h"
|
||||
#include "Contents/MessageTable.h"
|
||||
#include "Contents/Store/StoreBackupData.h"
|
||||
#include "Client/Session.h"
|
||||
#include "UI/Window/UIWindowMgr.h"
|
||||
#include "Utility/Async/AsyncDiagnostic.h"
|
||||
|
|
@ -138,7 +137,7 @@ void CMCStoreInfoBackup::CompleteLoad(
|
|||
|
||||
if (type == 1) {
|
||||
Json::Value& data = root["data"];
|
||||
StoreBackupData{this->title, this->items}.Import(data);
|
||||
this->ImportData(data);
|
||||
|
||||
if (!data["Item"].isNull() || !this->title.empty()) {
|
||||
context.RefreshShop();
|
||||
|
|
@ -196,7 +195,7 @@ void CMCStoreInfoBackup::Save(int type) {
|
|||
this->type = type;
|
||||
Json::Value root;
|
||||
Json::Value data;
|
||||
StoreBackupData{this->title, this->items}.Export(data, g_session.unknown_1758);
|
||||
this->ExportData(data);
|
||||
|
||||
if (!data.isNull()) {
|
||||
root["data"] = data;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue