From 2015796b8014cdbdd472cb1140361e050ceaf758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 22 Apr 2021 23:36:39 +0200 Subject: [PATCH] ksys: Fix signature of KingEditorComponent::syncData The buffer needs to be mutable. ActorParamMgr modifies it for example --- data/uking_functions.csv | 4 ++-- src/KingSystem/ActorSystem/actActorParamMgr.h | 2 +- src/KingSystem/GameData/gdtManager.cpp | 2 +- src/KingSystem/GameData/gdtManager.h | 2 +- src/KingSystem/System/KingEditor.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 4673d227..ba3bfd54 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -76066,10 +76066,10 @@ 0x0000007100dd2f8c,GameDataMgr::resetBoolFlagForRadarMgr,208, 0x0000007100dd305c,allocRetryBuffer,176,_ZN4ksys3gdt7Manager16allocRetryBufferEPN4sead4HeapE 0x0000007100dd310c,GameDataMgr::destroyTriggerParamC08IfNeeded,52,_ZN4ksys3gdt7Manager18destroyRetryBufferEv -0x0000007100dd3140,GameDataMgr::syncData,368,_ZN4ksys3gdt7Manager8syncDataEPKc +0x0000007100dd3140,GameDataMgr::syncData,368,_ZN4ksys3gdt7Manager8syncDataEPc 0x0000007100dd32b0,GameDataMgr::syncStart,1084,_ZN4ksys3gdt7Manager9syncStartEv 0x0000007100dd36ec,GameDataMgr::syncDataX,8392,_ZN4ksys3gdt7Manager10syncUpdateEPKc! -0x0000007100dd57b4,sub_7100DD57B4,8,_ZThn8_N4ksys3gdt7Manager8syncDataEPKc +0x0000007100dd57b4,sub_7100DD57B4,8,_ZThn8_N4ksys3gdt7Manager8syncDataEPc 0x0000007100dd57bc,GameDataMgr::syncStartOnLoadEnd,136,_ZN4ksys3gdt7Manager18startSyncOnLoadEndEv 0x0000007100dd5844,sub_7100DD5844,752,_ZN4ksys3gdt7Manager11parseFloatsERKN4sead14SafeStringBaseIcEEPfj 0x0000007100dd5b34,GameDataMgr::doSyncDataBool,368,_ZN4ksys3gdt7Manager11doSyncArrayIbEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKc diff --git a/src/KingSystem/ActorSystem/actActorParamMgr.h b/src/KingSystem/ActorSystem/actActorParamMgr.h index 452c5855..c39c4709 100644 --- a/src/KingSystem/ActorSystem/actActorParamMgr.h +++ b/src/KingSystem/ActorSystem/actActorParamMgr.h @@ -30,7 +30,7 @@ class ActorParamMgr final : public sead::hostio::Node, public KingEditorComponen public: const char* getName() const override { return "AglXml"; } - void syncData(const char* data) override; + void syncData(char* data) override; DebugMessage& getDebugMessage() { return mDebugMessage; } sead::Heap* getDebugHeap() const { return mDebugHeap; } diff --git a/src/KingSystem/GameData/gdtManager.cpp b/src/KingSystem/GameData/gdtManager.cpp index 8258bd56..2e392908 100644 --- a/src/KingSystem/GameData/gdtManager.cpp +++ b/src/KingSystem/GameData/gdtManager.cpp @@ -664,7 +664,7 @@ void Manager::destroyRetryBuffer() { } } -void Manager::syncData(const char* data) { +void Manager::syncData(char* data) { const sead::SafeString cmd = data; if (cmd.compare("SyncStart") == 0) { if (util::getDebugHeap()) { diff --git a/src/KingSystem/GameData/gdtManager.h b/src/KingSystem/GameData/gdtManager.h index fa48a737..c480977e 100644 --- a/src/KingSystem/GameData/gdtManager.h +++ b/src/KingSystem/GameData/gdtManager.h @@ -218,7 +218,7 @@ class Manager : public IManager, public KingEditorComponent { Manager(); ~Manager() override; const char* getName() const override { return "GameData"; } - void syncData(const char* data) override; + void syncData(char* data) override; public: struct ResetEvent { diff --git a/src/KingSystem/System/KingEditor.h b/src/KingSystem/System/KingEditor.h index ec310f3c..25b40aa1 100644 --- a/src/KingSystem/System/KingEditor.h +++ b/src/KingSystem/System/KingEditor.h @@ -10,7 +10,7 @@ namespace ksys { class KingEditorComponent { public: virtual const char* getName() const = 0; - virtual void syncData(const char* data) = 0; + virtual void syncData(char* data) = 0; void log(const char* message, void* x = {}, int y = {}) const;