2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 16:24:55 +00:00

Various movement and HUD bug fixes

This commit is contained in:
Jack Andersen
2017-12-18 17:05:50 -10:00
parent 1bb7e882a0
commit 1c44f8d1bc
37 changed files with 84 additions and 62 deletions

View File

@@ -7,7 +7,7 @@ namespace urde
{
enum class EMaterialTypes
{
Unknown = 0,
NoStepLogic = 0,
Stone = 1,
Metal = 2,
Grass = 3,
@@ -27,7 +27,7 @@ enum class EMaterialTypes
Sand = 17,
ProjectilePassthrough = 18,
Solid = 19,
Twenty = 20,
NoPlatformCollision = 20,
CameraPassthrough = 21,
Wood = 22,
Organic = 23,

View File

@@ -664,6 +664,11 @@ bool CMetroidAreaCollider::MovingAABoxCollisionCheck_BoxVertexTri(const CCollisi
{
pointOut = float(d) * dir + point;
normalOut = surf.GetNormal();
if (normalOut.z > 100.f)
{
printf("");
normalOut = surf.GetNormal();
}
ret = true;
}
}