AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-06-05 11:53:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr-125'

Browse Source
This commit is contained in:
Luke Street 2020-01-17 19:57:48 -05:00
commit a66a965437
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)) {