summaryrefslogtreecommitdiff
path: root/src/KingSystem/Physics/System/physMaterialMask.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-01-21 12:39:01 +0100
committerLéo Lam <leo@leolam.fr>2022-01-21 12:43:24 +0100
commitc29267564614d1421bbb2e4aab52743f2d71de98 (patch)
treecfe754db629bbe654818205dc22283410651fe97 /src/KingSystem/Physics/System/physMaterialMask.cpp
parent98c69ebaef70dd81d8479f227c33559e0100ff58 (diff)
ksys/phys: Rename MemSystem to System
It was called MemSystem in the IDB because of a string in ksys::InitializeApp that referred to MemSystem initialisation as "Physics Memory System"; however that string actually referred to an initialisation step for the physics system, not to the name of the subsystem itself.
Diffstat (limited to 'src/KingSystem/Physics/System/physMaterialMask.cpp')
-rw-r--r--src/KingSystem/Physics/System/physMaterialMask.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/KingSystem/Physics/System/physMaterialMask.cpp b/src/KingSystem/Physics/System/physMaterialMask.cpp
index 9a2072a6..c468c76d 100644
--- a/src/KingSystem/Physics/System/physMaterialMask.cpp
+++ b/src/KingSystem/Physics/System/physMaterialMask.cpp
@@ -1,6 +1,6 @@
#include "KingSystem/Physics/System/physMaterialMask.h"
#include "KingSystem/Physics/System/physMaterialTable.h"
-#include "KingSystem/Physics/System/physMemSystem.h"
+#include "KingSystem/Physics/System/physSystem.h"
namespace ksys::phys {
@@ -57,15 +57,15 @@ const char* MaterialMask::getSubMaterialName() const {
}
int MaterialMask::getSubMaterialIdx(Material mat, const sead::SafeString& submat_name) {
- return MemSystem::instance()->getMaterialTable()->getSubMaterialIdx(mat, submat_name);
+ return System::instance()->getMaterialTable()->getSubMaterialIdx(mat, submat_name);
}
const sead::SafeString& MaterialMask::getSubMaterialName(Material mat, int submat_idx) {
- return MemSystem::instance()->getMaterialTable()->getSubMaterial(mat, submat_idx);
+ return System::instance()->getMaterialTable()->getSubMaterial(mat, submat_idx);
}
int MaterialMask::getNumSubMaterials(Material mat) {
- return MemSystem::instance()->getMaterialTable()->getNumSubMaterials(mat);
+ return System::instance()->getMaterialTable()->getNumSubMaterials(mat);
}
const sead::SafeString& MaterialMask::getSubMaterialName(int mat, int submat_idx) {