AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-08-06 13:35:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix crashes with FusionSuit active

Browse Source
This commit is contained in:
Phillip Stephens 2020-03-11 06:48:30 -07:00
parent d93df18a37
commit 190c369aeb
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/CInventoryScreen.cpp
View File

@ -63,7 +63,7 @@ CInventoryScreen::CInventoryScreen(const CStateManager& mgr, CGuiFrame& frame, c
CPlayerState& playerState = *mgr.GetPlayerState();
x19c_samusDoll = std::make_unique<CSamusDoll>(
suitDgrp, ballDgrp,
CPlayerState::EPlayerSuit(int(playerState.GetCurrentSuit()) + playerState.IsFusionEnabled() * 4),
CPlayerState::EPlayerSuit(int(playerState.GetCurrentSuitRaw()) + (playerState.IsFusionEnabled() * 4)),
playerState.GetCurrentBeam(), playerState.HasPowerUp(CPlayerState::EItemType::SpiderBall),
playerState.HasPowerUp(CPlayerState::EItemType::GrappleBeam));
}

2
Runtime/World/CPlayer.cpp
View File

@ -466,7 +466,7 @@ void CPlayer::UpdateMorphBallTransition(float dt, CStateManager& mgr) {
switch (x2f8_morphBallState) {
case EPlayerMorphBallState::Unmorphed:
case EPlayerMorphBallState::Morphed: {
CPlayerState::EPlayerSuit suit = mgr.GetPlayerState()->GetCurrentSuit();
CPlayerState::EPlayerSuit suit = mgr.GetPlayerState()->GetCurrentSuitRaw();
if (mgr.GetPlayerState()->IsFusionEnabled())
suit = CPlayerState::EPlayerSuit(int(suit) + 4);
if (x7cc_transitionSuit != suit) {