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

ksys/phys: Fix parameter names for ContactMgr 

forgot to rename the parameters in SystemData
This commit is contained in:
Léo Lam 2021-12-27 13:03:43 +01:00
parent 536a00138e
commit e187c1ecfd
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/KingSystem/Physics/System/physSystemData.cpp
View File

@ -39,13 +39,13 @@ SystemData::~SystemData() {
void SystemData::load(sead::Heap* heap, GroupFilter* entity_group_filter,
GroupFilter* sensor_group_filter, MaterialTable* material_table,
ContactMgr* contact_info_table) {
ContactMgr* contact_mgr) {
loadLayerTable(heap, entity_group_filter, ContactLayerType::Entity);
loadLayerTable(heap, sensor_group_filter, ContactLayerType::Sensor);
loadMaterialTable(heap, material_table);
loadSubMaterialTable(heap, material_table);
loadContactInfoTable(heap, contact_info_table, ContactLayerType::Entity);
loadContactInfoTable(heap, contact_info_table, ContactLayerType::Sensor);
loadContactInfoTable(heap, contact_mgr, ContactLayerType::Entity);
loadContactInfoTable(heap, contact_mgr, ContactLayerType::Sensor);
loadCharacterCtrlTable(heap);
loadRagdollCtrlKeyList(heap);
}
@ -90,10 +90,10 @@ void SystemData::loadSubMaterialTable(sead::Heap* heap, MaterialTable* table) {
table->loadSubMaterialTable(heap, res);
}
void SystemData::loadContactInfoTable(sead::Heap* heap, ContactMgr* table, ContactLayerType type) {
void SystemData::loadContactInfoTable(sead::Heap* heap, ContactMgr* mgr, ContactLayerType type) {
mContactInfoTableHandles[int(type)] = new (heap) res::Handle;
const auto res = loadContactInfoTableRes(type);
table->loadContactInfoTable(heap, res, type);
mgr->loadContactInfoTable(heap, res, type);
}
void SystemData::loadCharacterCtrlTable(sead::Heap* heap) {

4
src/KingSystem/Physics/System/physSystemData.h
View File

@ -62,7 +62,7 @@ public:
virtual ~SystemData();
void load(sead::Heap* heap, GroupFilter* entity_group_filter, GroupFilter* sensor_group_filter,
MaterialTable* material_table, ContactMgr* contact_info_table);
MaterialTable* material_table, ContactMgr* contact_mgr);
private:
using LayerMatrix = Tables<LayerTable, MaxNumLayersPerType>;
@ -70,7 +70,7 @@ private:
void loadLayerTable(sead::Heap* heap, GroupFilter* filter, ContactLayerType type);
void loadMaterialTable(sead::Heap* heap, MaterialTable* table);
void loadSubMaterialTable(sead::Heap* heap, MaterialTable* table);
void loadContactInfoTable(sead::Heap* heap, ContactMgr* table, ContactLayerType type);
void loadContactInfoTable(sead::Heap* heap, ContactMgr* mgr, ContactLayerType type);
void loadCharacterCtrlTable(sead::Heap* heap);
void loadRagdollCtrlKeyList(sead::Heap* heap);