diff --git a/src/Game/AI/AI/aiAirOctaFlyUp.cpp b/src/Game/AI/AI/aiAirOctaFlyUp.cpp index 332c4fe5..32eec845 100644 --- a/src/Game/AI/AI/aiAirOctaFlyUp.cpp +++ b/src/Game/AI/AI/aiAirOctaFlyUp.cpp @@ -1,7 +1,7 @@ #include "Game/AI/AI/aiAirOctaFlyUp.h" #include "Game/DLC/aocHardModeManager.h" #include "KingSystem/Utils/Thread/Message.h" - +#include "Game/AirOctaDataMgrTemp.h" namespace uking::ai { @@ -36,24 +36,21 @@ bool AirOctaFlyUp::handleMessage_( const ksys::Message& message) { void AirOctaFlyUp::enter_(ksys::act::ai::InlineParamPack* params) { if (auto* data_mgr = sead::DynamicCast((AirOctaDataMgr*)*mAirOctaDataMgr_a)){ data_mgr->unk_114 = 0; - data_mgr->sub_71002FB17C(); + data_mgr->sub_71002fb17c(); } auto &mtx = getActor()->getMtx(); AirOctaY = mtx(1, 3); ksys::act::ai::Ai::changeChild("開始"); - } void AirOctaFlyUp::leave_() { if (auto* data_mgr = sead::DynamicCast((AirOctaDataMgr*)*mAirOctaDataMgr_a)){ data_mgr->unk_118 = *mTargetDistance_d + data_mgr->unk_118; data_mgr->unk_114 = 0; - data_mgr->sub_71002FB17C(); + data_mgr->sub_71002fb17c(); } } -float sub_71002FB17C(); - void AirOctaFlyUp::loadParams_() { getStaticParam(&mFlyUpDuration_s, "FlyUpDuration"); getDynamicParam(&mTargetDistance_d, "TargetDistance"); diff --git a/src/Game/AI/AI/aiAirOctaFlyUp.h b/src/Game/AI/AI/aiAirOctaFlyUp.h index 99fbe6c5..f849a0d7 100644 --- a/src/Game/AI/AI/aiAirOctaFlyUp.h +++ b/src/Game/AI/AI/aiAirOctaFlyUp.h @@ -3,23 +3,13 @@ #include "KingSystem/ActorSystem/actAiAi.h" #include "KingSystem/ActorSystem/actBaseProcLink.h" #include "KingSystem/ActorSystem/actActor.h" +#include "Game/AirOctaDataMgrTemp.h" namespace uking::ai { -class AirOctaDataMgr { - SEAD_RTTI_BASE(AirOctaDataMgr) -public: - ksys::act::BaseProcLink& getProc() { return mBaseProcLink; } - void sub_71002FB17C(); - /* 0x08 */ char unk_00[0x10]; - /* 0x18 */ ksys::act::BaseProcLink mBaseProcLink; - char placeFiller[0xEC]; - /*0x114 */ u32 unk_114; - /*0x118 */ float unk_118; -}; - -class AirOctaFlyUp : public ksys::act::ai::Ai { +class AirOctaFlyUp : + public ksys::act::ai::Ai { SEAD_RTTI_OVERRIDE(AirOctaFlyUp, ksys::act::ai::Ai) - friend uking::ai::AirOctaDataMgr; + friend uking::AirOctaDataMgr; public: explicit AirOctaFlyUp(const InitArg& arg); ~AirOctaFlyUp() override; @@ -29,7 +19,7 @@ public: void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; - float sub_71002FB17C(); + protected: // static_param at offset 0x38 const float* mFlyUpDuration_s{};