diff options
| -rw-r--r-- | data/uking_functions.csv | 8 | ||||
| -rw-r--r-- | src/Game/AI/Action/actionOff.cpp | 3 | ||||
| -rw-r--r-- | src/Game/AI/Action/actionOn.cpp | 3 | ||||
| -rw-r--r-- | src/Game/AI/Action/actionPlayerStoleOpenBase.cpp | 3 | ||||
| -rw-r--r-- | src/KingSystem/Resource/resResourceMgrTask.cpp | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 6c3a1dbb..d20ed760 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -4267,7 +4267,7 @@ Address,Quality,Size,Name 0x00000071000c6300,M,000060,_ZN5uking6action19PlayerStoleOpenBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000c633c,O,000128,_ZN5uking6action19PlayerStoleOpenBase11loadParams_Ev 0x00000071000c63bc,W,000340,_ZN5uking6action19PlayerStoleOpenBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000c6510,W,000060,_ZN5uking6action19PlayerStoleOpenBase5calc_Ev +0x00000071000c6510,O,000060,_ZN5uking6action19PlayerStoleOpenBase5calc_Ev 0x00000071000c654c,W,000016,_ZN5uking6action19PlayerStoleOpenBase6leave_Ev 0x00000071000c655c,O,000008,_ZNK5uking6action19PlayerStoleOpenBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000c6564,O,000092,_ZNK5uking6action19PlayerStoleOpenBase18getRuntimeTypeInfoEv @@ -13999,7 +13999,7 @@ Address,Quality,Size,Name 0x000000710020fd58,O,000052,_ZN5uking6action3OffD0Ev 0x000000710020fd8c,O,000008,_ZN5uking6action3Off5init_EPN4sead4HeapE 0x000000710020fd94,W,000224,_ZN5uking6action3Off6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710020fe74,W,000064,_ZN5uking6action3Off5calc_Ev +0x000000710020fe74,O,000064,_ZN5uking6action3Off5calc_Ev 0x000000710020feb4,O,000004,_ZN5uking6action3Off6leave_Ev 0x000000710020feb8,O,000212,_ZN5uking6action3Off11loadParams_Ev 0x000000710020ff8c,O,000008,_ZNK5uking6action3Off27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE @@ -14021,7 +14021,7 @@ Address,Quality,Size,Name 0x00000071002103d0,O,000052,_ZN5uking6action2OnD0Ev 0x0000007100210404,O,000008,_ZN5uking6action2On5init_EPN4sead4HeapE 0x000000710021040c,W,000208,_ZN5uking6action2On6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002104dc,W,000064,_ZN5uking6action2On5calc_Ev +0x00000071002104dc,O,000064,_ZN5uking6action2On5calc_Ev 0x000000710021051c,O,000004,_ZN5uking6action2On6leave_Ev 0x0000007100210520,O,000212,_ZN5uking6action2On11loadParams_Ev 0x00000071002105f4,O,000008,_ZNK5uking6action2On27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE @@ -93349,7 +93349,7 @@ Address,Quality,Size,Name 0x000000710120b4a4,O,000008,_ZN4ksys3res15ResourceMgrTask23unlockSzsDecompressorCSEv 0x000000710120b4ac,O,000248,_ZNK4ksys3res15ResourceMgrTask19getUncompressedSizeEPjRKN4sead14SafeStringBaseIcEEPNS3_10FileDeviceE 0x000000710120b5a4,U,000004,nullsub_4701 -0x000000710120b5a8,m,000104,_ZN4ksys3res15ResourceMgrTask20setCompactionStoppedEb +0x000000710120b5a8,O,000104,_ZN4ksys3res15ResourceMgrTask20setCompactionStoppedEb 0x000000710120b610,U,000028,res::ResourceMgrTask::x 0x000000710120b62c,U,000028,res::ResourceMgrTask::x_1 0x000000710120b648,O,000060,_ZN4ksys3res15ResourceMgrTask22initTempResourceLoaderEPNS0_18TempResourceLoaderERNS2_7InitArgE diff --git a/src/Game/AI/Action/actionOff.cpp b/src/Game/AI/Action/actionOff.cpp index e66a781e..b17d5f60 100644 --- a/src/Game/AI/Action/actionOff.cpp +++ b/src/Game/AI/Action/actionOff.cpp @@ -28,7 +28,8 @@ void Off::loadParams_() { } void Off::calc_() { - ActionEx::calc_(); + if (isFinishedAS(*mTargetIdx_s, *mSeqBankIdx_s)) + setFinished(); } } // namespace uking::action diff --git a/src/Game/AI/Action/actionOn.cpp b/src/Game/AI/Action/actionOn.cpp index 80855216..a9f7fb77 100644 --- a/src/Game/AI/Action/actionOn.cpp +++ b/src/Game/AI/Action/actionOn.cpp @@ -28,7 +28,8 @@ void On::loadParams_() { } void On::calc_() { - ActionEx::calc_(); + if (isFinishedAS(*mTargetIdx_s, *mSeqBankIdx_s)) + setFinished(); } } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp b/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp index f6a26eee..ea728d26 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp +++ b/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp @@ -21,7 +21,8 @@ void PlayerStoleOpenBase::loadParams_() { } void PlayerStoleOpenBase::calc_() { - ActionEx::calc_(); + if (isFinishedAS(0, 0)) + setFinished(); } } // namespace uking::action diff --git a/src/KingSystem/Resource/resResourceMgrTask.cpp b/src/KingSystem/Resource/resResourceMgrTask.cpp index dc66c94c..74e845a1 100644 --- a/src/KingSystem/Resource/resResourceMgrTask.cpp +++ b/src/KingSystem/Resource/resResourceMgrTask.cpp @@ -681,7 +681,9 @@ void ResourceMgrTask::setCompactionStopped(bool stopped) { old_counter = mCompactionCounter.increment(); stubbedLogFunction(); - if (mCompactionCounter == 0 || old_counter == 0) + if (mCompactionCounter == 0) + stubbedLogFunction(); + else if (old_counter == 0) stubbedLogFunction(); } |