From e187c1ecfd7eeae05b2f7e9bf8f3719850e1a845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 27 Dec 2021 13:03:43 +0100 Subject: ksys/phys: Fix parameter names for ContactMgr forgot to rename the parameters in SystemData --- src/KingSystem/Physics/System/physSystemData.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/KingSystem/Physics/System/physSystemData.cpp') 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) { -- cgit v1.2.3