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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CPlayer.cpp
View File

@@ -924,7 +924,7 @@ bool CPlayer::IsUnderBetaMetroidAttack(CStateManager& mgr) const {
return false;
}
rstl::optional<zeus::CAABox> CPlayer::GetTouchBounds() const {
std::optional<zeus::CAABox> CPlayer::GetTouchBounds() const {
if (x2f8_morphBallState == EPlayerMorphBallState::Morphed) {
float ballTouchRad = x768_morphball->GetBallTouchRadius();
zeus::CVector3f ballCenter = GetTranslation() + zeus::CVector3f(0.f, 0.f, x768_morphball->GetBallRadius());
@@ -1558,7 +1558,7 @@ void CPlayer::ProcessInput(const CFinalInput& input, CStateManager& mgr) {
CGameCollision::BuildAreaCollisionCache(mgr, cache);
rstl::reserved_vector<TUniqueId, 1024> nearList;
mgr.BuildColliderList(nearList, *this, expandedBounds);
rstl::optional<zeus::CVector3f> nonIntVec =
std::optional<zeus::CVector3f> nonIntVec =
CGameCollision::FindNonIntersectingVector(mgr, cache, *this, *prim, nearList);
if (nonIntVec) {
x4a0_failsafeTest->Reset();
@@ -1793,7 +1793,7 @@ void CPlayer::UnFreeze(CStateManager& stateMgr) {
ClearForcesAndTorques();
RemoveMaterial(EMaterialTypes::Immovable, stateMgr);
if (!stateMgr.GetCameraManager()->IsInCinematicCamera() && xa0c_iceTextureId.IsValid()) {
rstl::optional<TToken<CGenDescription>> gpsm;
std::optional<TToken<CGenDescription>> gpsm;
gpsm.emplace(g_SimplePool->GetObj(SObjectTag(FOURCC('PART'), xa0c_iceTextureId)));
CHUDBillboardEffect* effect = new CHUDBillboardEffect(
gpsm, {}, stateMgr.AllocateUniqueId(), true, "FrostExplosion",