Merge pull request #215 from leoetlino/stack/02-small-fixes

Minor fixes for issues found during AI-assisted naming passes

5 files changed, 14 insertions, 14 deletions

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(&current, 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(&current, 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;
diff --git a/src/KingSystem/GameData/gdtSpecialFlagNames.cpp b/src/KingSystem/GameData/gdtSpecialFlagNames.cpp
index 7ff7cdac..3c08f75f 100644
--- a/src/KingSystem/GameData/gdtSpecialFlagNames.cpp
+++ b/src/KingSystem/GameData/gdtSpecialFlagNames.cpp
@@ -7,7 +7,7 @@ namespace ksys::gdt::flagname {
         return #name;                                                                              \
     }
 
-GDT_DEFINE_SPECIAL_FLAG_NAME(Aoc_HardMode_Enabled)
+GDT_DEFINE_SPECIAL_FLAG_NAME(AoC_HardMode_Enabled)
 GDT_DEFINE_SPECIAL_FLAG_NAME(BowPorchStockNum)
 GDT_DEFINE_SPECIAL_FLAG_NAME(CaptionPictSize)
 GDT_DEFINE_SPECIAL_FLAG_NAME(CurrentHart)
diff --git a/src/KingSystem/GameData/gdtSpecialFlagNames.h b/src/KingSystem/GameData/gdtSpecialFlagNames.h
index 6494c33e..729b55b8 100644
--- a/src/KingSystem/GameData/gdtSpecialFlagNames.h
+++ b/src/KingSystem/GameData/gdtSpecialFlagNames.h
@@ -2,7 +2,7 @@
 
 namespace ksys::gdt::flagname {
 
-const char* Aoc_HardMode_Enabled();
+const char* AoC_HardMode_Enabled();
 const char* BowPorchStockNum();
 const char* CaptionPictSize();
 const char* CurrentHart();
diff --git a/src/KingSystem/System/OverlayArenaSystemS2.h b/src/KingSystem/System/OverlayArenaSystemS2.h
index 2a43c72a..f40f735c 100644
--- a/src/KingSystem/System/OverlayArenaSystemS2.h
+++ b/src/KingSystem/System/OverlayArenaSystemS2.h
@@ -23,7 +23,7 @@ public:
 
 private:
     u32 _0 = 0;
-    sead::Delegate1<OverlayArenaSystemS2, void*> mDelegate;
+    sead::Delegate1R<OverlayArenaSystemS2, void*, bool> mDelegate;
     u32 _28 = 1;
     void* _30 = nullptr;
     void* _38 = nullptr;