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

ksys/act: Fix ActorParam encapsulation

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

30
src/KingSystem/ActorSystem/actActorParam.h
View File

@ -8,8 +8,8 @@
#include <thread/seadCriticalSection.h>
#include "KingSystem/ActorSystem/actBaseProcJob.h"
#include "KingSystem/Resource/resHandle.h"
#include "KingSystem/Utils/Thread/Event.h"
#include "KingSystem/Resource/resResourceActorLink.h"
#include "KingSystem/Utils/Thread/Event.h"
namespace ksys {
@ -103,8 +103,25 @@ public:
ActorParam();
virtual ~ActorParam();
const sead::SafeString& getActorName() const { return mActorName; }
const sead::SafeString& getProfile() const { return mProfile; }
const char* getClassName() const { return mClassName; }
Priority getPriority() const { return mPriority; }
u32 get74() const { return _74; }
const Resources& getRes() const { return mRes; }
bool isDummyParam(res::ActorLink::Users::User user) const;
static void resetDummyResources();
static Resources sDummyResources;
private:
friend class ActorParamMgr;
void deleteData();
void deleteResHandles();
u16 _8 = 0;
u8 _a = 0;
sead::FixedSafeString<64> mActorName;
@ -116,17 +133,6 @@ public:
std::array<sead::Buffer<res::Handle>, 2> mHandles;
std::array<s32, 2> mNumHandles;
u32 _168{};
static void resetDummyResources();
static Resources sDummyResources;
private:
friend class ActorParamMgr;
void deleteData();
void deleteResHandles();
sead::CriticalSection mCS{nullptr};
util::Event mEvent{nullptr,
sead::IDisposer::HeapNullOption::DoNotAppendDisposerIfNoHeapSpecified, true};

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->mRes.mGParamList;
auto* param_list = mActor->mActorParam->getRes().mGParamList;
const res::GParamListObjectGeneral& params = param_list->getGeneral();
if (params.mIsLifeInfinite.ref()) {