diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 9c9301e8..913929c7 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -76506,7 +76506,7 @@ Address,Quality,Size,Name 0x0000007100dcf088,O,000280,_ZN4sead9SafeArrayIN4ksys3res6HandleELi32EED2Ev 0x0000007100dcf1a0,O,000036,_ZN4ksys3gdt7ManagerD0Ev 0x0000007100dcf1c4,m,001264,_ZN4ksys3gdt7Manager4initEPN4sead4HeapEPNS2_9FrameworkE -0x0000007100dcf6b4,O,000704,_ZN4ksys3gdt7Manager14IncreaseLoggerC2Ev +0x0000007100dcf6b4,O,000704,_ZN4ksys3gdt7Manager18DeferredFlagWriterC2Ev 0x0000007100dcf974,O,000068,_ZN4ksys3res12EntryFactoryINS0_8GameDataEED2Ev 0x0000007100dcf9b8,U,001692,GameDataMgr::loadGameDataFromArc 0x0000007100dd0054,O,000600,_ZN4ksys3gdt7Manager20loadShopGameDataInfoERKN4sead14SafeStringBaseIcEE @@ -77263,7 +77263,7 @@ Address,Quality,Size,Name 0x0000007100e02ba8,O,000068,_ZNK4ksys3gdt8FlagBase10isBoolean_Ev 0x0000007100e02bec,O,000088,_ZNK4ksys3gdt8FlagBase19setCategoryForBool_EPvj 0x0000007100e02c44,O,000080,_ZNK4ksys3gdt8FlagBase19getCategoryForBool_EPKv -0x0000007100e02c94,O,000248,_ZN4ksys3gdt7Manager14IncreaseLogger9addRecordEiRKN4sead14SafeStringBaseIcEEib +0x0000007100e02c94,O,000248,_ZN4ksys3gdt7Manager18DeferredFlagWriter9addRecordEiRKN4sead14SafeStringBaseIcEEib 0x0000007100e02d8c,U,000952,gdt::HorribleMess::x_2 0x0000007100e03144,U,000100,SaveMgr::Disposer::dtor 0x0000007100e031a8,U,000108,SaveMgr::Disposer::dtorDelete diff --git a/src/KingSystem/GameData/gdtManager.cpp b/src/KingSystem/GameData/gdtManager.cpp index 2e68921f..c067801d 100644 --- a/src/KingSystem/GameData/gdtManager.cpp +++ b/src/KingSystem/GameData/gdtManager.cpp @@ -83,7 +83,7 @@ void Manager::init(sead::Heap* heap, sead::Framework* framework) { mGameDataHeap = util::DualHeap::create(0xf00000, "GameDataHeap", heap, nullptr, sizeof(void*), sead::Heap::cHeapDirection_Forward, true); - mIncreaseLogger = new (mGameDataHeap) IncreaseLogger; + mDeferredFlagWriter = new (mGameDataHeap) DeferredFlagWriter; SaveMgr::createInstance(mGameDataHeap); SaveMgr::InitArg arg; @@ -556,8 +556,8 @@ void Manager::incrementS32NoCheck(s32 value, const sead::SafeString& name) { s32 current = 0; if (getParamBypassPerm().get().getS32(¤t, name)) setS32NoCheck(current + value, name); - } else if (mIncreaseLogger) { - mIncreaseLogger->addRecord(value, name, -1, true); + } else if (mDeferredFlagWriter) { + mDeferredFlagWriter->addRecord(value, name, -1, true); } } @@ -569,13 +569,13 @@ void Manager::incrementS32(s32 value, const sead::SafeString& name) { s32 current = 0; if (getParam().get().getS32(¤t, name)) setS32(current + value, name); - } else if (mIncreaseLogger) { - mIncreaseLogger->addRecord(value, name, -1, false); + } else if (mDeferredFlagWriter) { + mDeferredFlagWriter->addRecord(value, name, -1, false); } } -void Manager::IncreaseLogger::addRecord(s32 value, const sead::SafeString& name, s32 sub_idx, - bool debug) { +void Manager::DeferredFlagWriter::addRecord(s32 value, const sead::SafeString& name, s32 sub_idx, + bool debug) { const u32 name_hash = sead::HashCRC32::calcStringHash(name); const auto core = sead::CoreInfo::getCurrentCoreId(); const u32 platform_core_id = sead::CoreInfo::getPlatformCoreId(core); diff --git a/src/KingSystem/GameData/gdtManager.h b/src/KingSystem/GameData/gdtManager.h index 923cea2d..add2ba02 100644 --- a/src/KingSystem/GameData/gdtManager.h +++ b/src/KingSystem/GameData/gdtManager.h @@ -481,10 +481,10 @@ public: void incrementS32(s32 value, const sead::SafeString& name); void increaseS32CommonFlag(s32 value, const sead::SafeString& name, s32 sub_idx, bool debug) { - if (!mIncreaseLogger) + if (!mDeferredFlagWriter) return; - mIncreaseLogger->addRecord(value, name, sub_idx, debug); + mDeferredFlagWriter->addRecord(value, name, sub_idx, debug); if (debug) onChangedByDebug(); } @@ -554,7 +554,7 @@ private: sead::MethodTreeMgr* method_tree_mgr = nullptr; }; - struct IncreaseLogger { + struct DeferredFlagWriter { struct Record { bool debug = false; u32 name_hash = 0; @@ -646,7 +646,7 @@ private: TriggerParamRef mParamBypassPerm{&mFlagBuffer1, &mFlagBuffer, false, false, false}; TriggerParamRef mParam{&mFlagBuffer1, &mFlagBuffer, true, false, false}; - IncreaseLogger* mIncreaseLogger = nullptr; + DeferredFlagWriter* mDeferredFlagWriter = nullptr; TriggerParam* mFlagBuffer1; TriggerParam* mFlagBuffer;