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

ksys/act: Add Actor::getMaxLife and fix encapsulation

This commit is contained in:
Léo Lam 2020-11-08 23:03:22 +01:00
parent cb5976d8ae
commit b28ba7b3ad
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/KingSystem/ActorSystem/actActor.h
View File

@ -16,6 +16,10 @@ public:
SEAD_RTTI_OVERRIDE(Actor, BaseProc)
const ActorParam* getParam() const { return mActorParam; }
virtual s32 getMaxLife();
virtual LifeRecoverInfo* getLifeRecoverInfo();
void emitBasicSigOn();
@ -23,6 +27,7 @@ public:
void nullsub_4649(); // Some kind of logging which has been excluded from the build?
protected:
u8 TEMP1[0x3F4]; // FIXME
ActorParam* mActorParam;
u8 TEMP2[0x2C0]; // FIXME

2
src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
View File

@ -36,7 +36,7 @@ void ActorCaptureMgr::setCamera(Camera* camera) {
}
void ActorCaptureMgr::loadCaptureParam() {
if (!mActor || !mActor->mActorParam)
if (!mActor || !mActor->getParam())
return;
const char* name = getCapturedActorName();

2
src/KingSystem/Damage/dmgDamageManagerBase.cpp
View File

@ -104,7 +104,7 @@ void DamageManagerBase::removeDamageCallback(DamageCallback* callback) {
}
bool DamageManagerBase::applyDamage(s32& life) {
auto* param_list = mActor->mActorParam->getRes().mGParamList;
auto* param_list = mActor->getParam()->getRes().mGParamList;
const res::GParamListObjectGeneral& params = param_list->getGeneral();
if (params.mIsLifeInfinite.ref()) {