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

ksys/phys: Rename SystemGroupHandler mFilterIndex -> mLayerType 

It is actually a ContactLayerType -- there's a comparison against
the contact layer type in RigidBody.
This commit is contained in:
Léo Lam 2022-01-24 12:36:51 +01:00
parent a33ebd2130
commit 4531c033a3
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KingSystem/Physics/System/physEntityGroupFilter.cpp
View File

@ -161,7 +161,7 @@ void EntityGroupFilter::doInitSystemGroupHandlerLists_(sead::Heap* heap) {
for (int i = 1; i < NumEntityHandlers; ++i) { for (int i = 1; i < NumEntityHandlers; ++i) {
auto& list = mFreeLists[i < NumEntityHandlersInList0]; auto& list = mFreeLists[i < NumEntityHandlersInList0];
list.pushBack(new (heap) EntitySystemGroupHandler(i, 0)); list.pushBack(new (heap) EntitySystemGroupHandler(i));
} }
} }

2
src/KingSystem/Physics/System/physEntityGroupFilter.h
View File

@ -10,7 +10,7 @@ namespace ksys::phys {
class EntitySystemGroupHandler : public SystemGroupHandler { class EntitySystemGroupHandler : public SystemGroupHandler {
public: public:
using SystemGroupHandler::SystemGroupHandler; explicit EntitySystemGroupHandler(int i) : SystemGroupHandler(i, ContactLayerType::Entity) {}
u32 m5() override; u32 m5() override;
u32 m6() override; u32 m6() override;

8
src/KingSystem/Physics/System/physGroupFilter.h
View File

@ -13,8 +13,8 @@ namespace ksys::phys {
class SystemGroupHandler { class SystemGroupHandler {
SEAD_RTTI_BASE(SystemGroupHandler) SEAD_RTTI_BASE(SystemGroupHandler)
public: public:
explicit SystemGroupHandler(int index, int filter_index) explicit SystemGroupHandler(int index, ContactLayerType layer_type)
: mIndex(index), mFilterIndex(filter_index) {} : mIndex(index), mLayerType(layer_type) {}
virtual ~SystemGroupHandler() = default; virtual ~SystemGroupHandler() = default;
virtual u32 m5() = 0; virtual u32 m5() = 0;
@ -23,7 +23,7 @@ public:
virtual bool m8() = 0; virtual bool m8() = 0;
int getIndex() const { return mIndex; } int getIndex() const { return mIndex; }
int getFilterIndex() const { return mFilterIndex; } ContactLayerType getLayerType() const { return mLayerType; }
const char* getActorName() const { return mActorName; } const char* getActorName() const { return mActorName; }
void setActorName(const char* name) { mActorName = name; } void setActorName(const char* name) { mActorName = name; }
@ -46,7 +46,7 @@ protected:
const char* mActorName = nullptr; const char* mActorName = nullptr;
const char* mActorProfile = nullptr; const char* mActorProfile = nullptr;
int mIndex = 0; int mIndex = 0;
int mFilterIndex = 0; ContactLayerType mLayerType{};
sead::ListNode mFreeListNode; sead::ListNode mFreeListNode;
sead::ListNode mUsedListNode; sead::ListNode mUsedListNode;
}; };