falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding these so i can get the function on the latest commit

This commit is contained in:
bomba1749 2023-07-01 18:28:45 -04:00 committed by GitHub
parent 0943ffa6eb
commit a748269673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Game/AI/AI/aiAirOctaFlyUp.cpp
View File

@ -4,7 +4,7 @@
#include "Game/AirOctaDataMgrTemp.h" #include "Game/AirOctaDataMgrTemp.h"
#include "KingSystem/System/VFRValue.h" #include "KingSystem/System/VFRValue.h"
#include "KingSystem/System/VFR.h" #include "KingSystem/System/VFR.h"
#include "KingSystem/ActorSystem/AS/ASList.h"
namespace uking::ai { namespace uking::ai {
AirOctaFlyUp::AirOctaFlyUp(const InitArg& arg) : ksys::act::ai::Ai(arg) {} AirOctaFlyUp::AirOctaFlyUp(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
@ -14,7 +14,7 @@ AirOctaFlyUp::~AirOctaFlyUp() = default;
bool AirOctaFlyUp::init_(sead::Heap* heap) { bool AirOctaFlyUp::init_(sead::Heap* heap) {
return ksys::act::ai::Ai::init_(heap); return ksys::act::ai::Ai::init_(heap);
} }
void sub_710115b070(ksys::as::ASList *this_, f32 a2, f32 a3, const sead::SafeString& a4, int a5, int a6, bool a7);
void AirOctaFlyUp::calc_(){ void AirOctaFlyUp::calc_(){
if (auto* data_mgr = getDataMgr()) { if (auto* data_mgr = getDataMgr()) {
// I added VFR::getDeltaFrame and changed VFR::getDeltaTime to refer to mDeltaTimes array. // I added VFR::getDeltaFrame and changed VFR::getDeltaTime to refer to mDeltaTimes array.
@ -34,7 +34,7 @@ void AirOctaFlyUp::calc_(){
if (currentChild->isFinished() || currentChild->isFailed() ){ if (currentChild->isFinished() || currentChild->isFailed() ){
auto ASList = getActor()->getASList(); auto ASList = getActor()->getASList();
if (ASList){ if (ASList){
sub_710115b070(ASList, -1.f, -1.f, "Wait", 0, 0, true); ASList->sub_710115b070( -1.f, -1.f, "Wait", 0, 0, true);
} }
mIsEnded = true; mIsEnded = true;
} else if (!mIsEnded) { } else if (!mIsEnded) {

1
src/Game/AI/AI/aiAirOctaFlyUp.h
View File

@ -25,7 +25,6 @@ public:
protected: protected:
// Added // Added
uking::AirOctaDataMgr *getDataMgr() { return sead::DynamicCast<AirOctaDataMgr>(*mAirOctaDataMgr_a); } uking::AirOctaDataMgr *getDataMgr() { return sead::DynamicCast<AirOctaDataMgr>(*mAirOctaDataMgr_a); }
// static_param at offset 0x38 // static_param at offset 0x38
const float* mFlyUpDuration_s{}; const float* mFlyUpDuration_s{};
// dynamic_param at offset 0x40 // dynamic_param at offset 0x40