AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CPatterned: Mark CMaterialList instance in CollidedWith as constexpr 

This isn't ever modified, so we can mark it constexpr to eliminate
potential runtime initializers.
This commit is contained in:
Lioncash 2020-01-15 14:48:19 -05:00
parent 677687f228
commit ab2ad38220
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CPatterned.cpp
View File

@ -357,8 +357,8 @@ void CPatterned::CollidedWith(TUniqueId other, const CCollisionInfoList& list, C
} }
} }
} }
static CMaterialList testList(EMaterialTypes::Solid, EMaterialTypes::Ceiling, EMaterialTypes::Wall, static constexpr CMaterialList testList(EMaterialTypes::Solid, EMaterialTypes::Ceiling, EMaterialTypes::Wall,
EMaterialTypes::Floor, EMaterialTypes::Character); EMaterialTypes::Floor, EMaterialTypes::Character);
for (const CCollisionInfo& info : list) { for (const CCollisionInfo& info : list) {
if (info.GetMaterialLeft().Intersection(testList)) { if (info.GetMaterialLeft().Intersection(testList)) {
if (!info.GetMaterialLeft().HasMaterial(EMaterialTypes::Floor)) { if (!info.GetMaterialLeft().HasMaterial(EMaterialTypes::Floor)) {