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

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2017-11-18 10:00:18 -10:00
parent e00f6bfe30 d78a76febe
commit 172a0049cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/CStateManager.cpp
View File

@ -2202,10 +2202,10 @@ void CStateManager::InitializeState(CAssetId mlvlId, TAreaId aid, CAssetId mreaI
if (sp && sp->x30_24_active && sp->FirstSpawn())
{
const zeus::CTransform& xf = sp->GetTransform();
zeus::CVector3f lookVec{xf.basis[0][1], xf.basis[1][1], xf.basis[2][1]};
zeus::CVector3f lookVec = xf.frontVector();
if (lookVec.canBeNormalized())
{
auto lookXf = zeus::lookAt(xf.origin, lookVec);
auto lookXf = zeus::lookAt(xf.origin, xf.origin + lookVec);
x84c_player->Teleport(lookXf, *this, true);
}

2
specter

@ -1 +1 @@
Subproject commit 3e04e86ae9735d69de5ed5889471e8e45669e3ea
Subproject commit 883a7498e1124c12fe65040f76d4079591d7ad60