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

CScriptPickup: Updates from matching decomp

This commit is contained in:
Luke Street 2022-10-09 13:12:38 -04:00
parent 5394e92735
commit 2e3495ec0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CScriptPickup.cpp
View File

@ -73,7 +73,7 @@ void CScriptPickup::Think(float dt, CStateManager& mgr) {
if (x26c_lifeTime < 2.f) { if (x26c_lifeTime < 2.f) {
alpha = 1.f - (x26c_lifeTime / x270_curTime); alpha = 1.f - (x26c_lifeTime / x270_curTime);
} else if ((x26c_lifeTime - x270_curTime) < 2.f) { } else if ((x26c_lifeTime - x270_curTime) < 2.f) {
alpha = (x26c_lifeTime - x270_curTime) * 0.5f; alpha = (x26c_lifeTime - x270_curTime) / 2.f;
} }
drawFlags = CModelFlags(5, 0, 1, zeus::CColor(1.f, alpha)); drawFlags = CModelFlags(5, 0, 1, zeus::CColor(1.f, alpha));
@ -163,7 +163,7 @@ void CScriptPickup::Touch(CActor& act, CStateManager& mgr) {
if (x258_itemType == CPlayerState::EItemType::PowerBombs && if (x258_itemType == CPlayerState::EItemType::PowerBombs &&
g_GameState->SystemOptions().GetShowPowerBombAmmoMessage()) { g_GameState->SystemOptions().GetShowPowerBombAmmoMessage()) {
g_GameState->SystemOptions().IncrementPowerBombAmmoCount(); g_GameState->SystemOptions().IncrementPowerBombAmmoCount();
MP1::CSamusHud::DisplayHudMemo(g_MainStringTable->GetString(109), {0.5f, true, false, false}); MP1::CSamusHud::DisplayHudMemo(g_MainStringTable->GetString(109), {5.f, true, false, false});
} }
} }
} }