summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-12-27 13:03:43 +0100
committerLéo Lam <leo@leolam.fr>2021-12-27 13:03:43 +0100
commite187c1ecfd7eeae05b2f7e9bf8f3719850e1a845 (patch)
tree674ea2631a01846e1795a29c0036113798126224 /src
parent536a00138ea315814709cfda942dad9c2a3e31d8 (diff)
ksys/phys: Fix parameter names for ContactMgr
forgot to rename the parameters in SystemData
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/Physics/System/physSystemData.cpp10
-rw-r--r--src/KingSystem/Physics/System/physSystemData.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/KingSystem/Physics/System/physSystemData.cpp b/src/KingSystem/Physics/System/physSystemData.cpp
index d21af924..9280e5f5 100644
--- a/src/KingSystem/Physics/System/physSystemData.cpp
+++ b/src/KingSystem/Physics/System/physSystemData.cpp
@@ -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) {
diff --git a/src/KingSystem/Physics/System/physSystemData.h b/src/KingSystem/Physics/System/physSystemData.h
index 9ed3b6f1..a759c72f 100644
--- a/src/KingSystem/Physics/System/physSystemData.h
+++ b/src/KingSystem/Physics/System/physSystemData.h
@@ -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);