AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Start naming EMaterialTypes values

Browse Source
This commit is contained in:
Phillip Stephens
2016-12-29 13:38:59 -08:00
parent b3cae0d4d5
commit af1e22a62d
35 changed files with 173 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/Camera/CFirstPersonCamera.cpp
View File

@@ -98,8 +98,7 @@ void CFirstPersonCamera::UpdateTransform(CStateManager& mgr, float dt)
if (player->x304_ == 4 || player->x304_ == 1)
{
const CActor* act = dynamic_cast<const CActor*>(mgr.GetObjectById(player->x310_grapplePointId));
/* TODO: Not sure about this */
if (act && act->GetMaterialList().BitPosition(0x200) != -1)
if (act && act->GetMaterialList().Intersection(CMaterialList(EMaterialTypes::Lava)) != 0)
{
zeus::CVector3f v = player->x318_ - eyePos;
if (v.canBeNormalized())