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

Initial fixNES integration

Browse Source
This commit is contained in:
Jack Andersen
2018-02-01 13:19:34 -10:00
parent c84845c9a5
commit 93fc2d8072
28 changed files with 1515 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/MP1/CFrontEndUI.cpp
View File

@@ -1223,9 +1223,9 @@ void CFrontEndUI::SFusionBonusFrame::DoAdvance(CGuiTableGroup* caller)
}
else if (g_GameState->SystemOptions().GetPlayerBeatFusion())
{
x8_action = EAction::None;
//x8_action = EAction::None;
CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
//x8_action = EAction::PlayNESMetroid;
x8_action = EAction::PlayNESMetroid;
}
else
{
@@ -1564,15 +1564,15 @@ bool CFrontEndUI::SNesEmulatorFrame::Update(float dt, CSaveGameScreen* saveUi)
void CFrontEndUI::SNesEmulatorFrame::Draw(CSaveGameScreen* saveUi) const
{
zeus::CColor mulColor = zeus::CColor::skWhite;
bool doDraw = (saveUi && saveUi->GetUIType() != CSaveGameScreen::EUIType::SaveReady) ? false : true;
bool blackout = saveUi && saveUi->GetUIType() != CSaveGameScreen::EUIType::SaveReady;
if (doDraw)
if (blackout)
mulColor = zeus::CColor::skBlack;
else if (x8_quitScreen)
mulColor = zeus::CColor{0.376470f, 0.376470f, 0.376470f, 1.f};
x4_nesEmu->Draw(mulColor, x15_enableFiltering);
if (!doDraw && x8_quitScreen)
if (!blackout && x8_quitScreen)
x8_quitScreen->Draw();
if (x10_remTime >= 7.5f)
@@ -2007,7 +2007,7 @@ CFrontEndUI::CFrontEndUI()
m_touchBar = NewFrontEndUITouchBar();
m_touchBar->SetPhase(CFrontEndUITouchBar::EPhase::None);
x14_phase = EPhase::ExitFrontEnd;
//x14_phase = EPhase::ExitFrontEnd;
}
void CFrontEndUI::StartSlideShow(CArchitectureQueue& queue)
@@ -2533,7 +2533,7 @@ static const float AudioFadeTimeB[] =
CIOWin::EMessageReturn CFrontEndUI::Update(float dt, CArchitectureQueue& queue)
{
if (xdc_saveUI && x50_curScreen >= EScreen::FileSelect)
if (xdc_saveUI && (x50_curScreen >= EScreen::FileSelect || true))
{
switch (xdc_saveUI->Update(dt))
{
@@ -2636,6 +2636,11 @@ CIOWin::EMessageReturn CFrontEndUI::Update(float dt, CArchitectureQueue& queue)
}
break;
}
else
{
xec_emuFrme = std::make_unique<SNesEmulatorFrame>();
xdc_saveUI->ResetCardDriver();
}
if (xd2_deferSlideShow)
{