From fa986ea1ed971594c291de2152c87921002744d0 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 5 Apr 2020 05:42:02 -0700 Subject: [PATCH] Tweak max aspect ratiou --- Runtime/AutoMapper/CAutoMapper.cpp | 2 +- Runtime/MP1/CFrontEndUI.cpp | 10 +++++----- Runtime/MP1/CPauseScreen.cpp | 4 ++-- Runtime/MP1/CSamusHud.cpp | 6 +++--- Runtime/MP1/CSaveGameScreen.cpp | 2 +- Runtime/MP1/MP1.hpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Runtime/AutoMapper/CAutoMapper.cpp b/Runtime/AutoMapper/CAutoMapper.cpp index 7f1abdc6d..8efb710d3 100644 --- a/Runtime/AutoMapper/CAutoMapper.cpp +++ b/Runtime/AutoMapper/CAutoMapper.cpp @@ -1100,7 +1100,7 @@ void CAutoMapper::Update(float dt, const CStateManager& mgr) { } if (!m_frmeInitialized && x28_frmeMapScreen.IsLoaded()) { - x28_frmeMapScreen->SetMaxAspect(1.78f); + x28_frmeMapScreen->SetMaxAspect(1.62f); m_frmeInitialized = true; static_cast(x28_frmeMapScreen->FindWidget("textpane_left")) ->TextSupport() diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp index d63175e44..51312fc10 100644 --- a/Runtime/MP1/CFrontEndUI.cpp +++ b/Runtime/MP1/CFrontEndUI.cpp @@ -120,7 +120,7 @@ CFrontEndUI::SNewFileSelectFrame::SNewFileSelectFrame(CSaveGameScreen* sui, u32 void CFrontEndUI::SNewFileSelectFrame::FinishedLoading() { x1c_loadedFrame->Reset(); - x1c_loadedFrame->SetAspectConstraint(1.78f); + x1c_loadedFrame->SetAspectConstraint(1.62f); x20_tablegroup_fileselect = static_cast(x1c_loadedFrame->FindWidget("tablegroup_fileselect")); x24_model_erase = static_cast(x1c_loadedFrame->FindWidget("model_erase")); @@ -841,7 +841,7 @@ void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::Update(float dt) { } void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::FinishedLoading() { - x8_frme->SetAspectConstraint(1.78f); + x8_frme->SetAspectConstraint(1.62f); xc_textpane_instructions = FindTextPanePair(x8_frme, "textpane_instructions"); x14_textpane_yes = static_cast(x8_frme->FindWidget("textpane_yes")); @@ -868,7 +868,7 @@ CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::SGBALinkFrame(CGuiFrame* linkFram } void CFrontEndUI::SFusionBonusFrame::FinishedLoading() { - x24_loadedFrame->SetAspectConstraint(1.78f); + x24_loadedFrame->SetAspectConstraint(1.62f); x28_tablegroup_options = static_cast(x24_loadedFrame->FindWidget("tablegroup_options")); x2c_tablegroup_fusionsuit = static_cast(x24_loadedFrame->FindWidget("tablegroup_fusionsuit")); @@ -1123,7 +1123,7 @@ void CFrontEndUI::FindAndSetPairText(CGuiFrame* frame, std::string_view name, st } void CFrontEndUI::SFrontEndFrame::FinishedLoading() { - x14_loadedFrme->SetAspectConstraint(1.78f); + x14_loadedFrme->SetAspectConstraint(1.62f); x18_tablegroup_mainmenu = static_cast(x14_loadedFrme->FindWidget("tablegroup_mainmenu")); x1c_gbaPair = FindTextPanePair(x14_loadedFrme, "textpane_gba"); @@ -1549,7 +1549,7 @@ void CFrontEndUI::SOptionsFrontEndFrame::SetTableColors(CGuiTableGroup* tbgp) co } void CFrontEndUI::SOptionsFrontEndFrame::FinishedLoading() { - x1c_loadedFrame->SetAspectConstraint(1.78f); + x1c_loadedFrame->SetAspectConstraint(1.62f); x24_tablegroup_leftmenu = static_cast(x1c_loadedFrame->FindWidget("tablegroup_leftmenu")); x28_tablegroup_rightmenu = static_cast(x1c_loadedFrame->FindWidget("tablegroup_rightmenu")); diff --git a/Runtime/MP1/CPauseScreen.cpp b/Runtime/MP1/CPauseScreen.cpp index 706156aa2..f65b2340d 100644 --- a/Runtime/MP1/CPauseScreen.cpp +++ b/Runtime/MP1/CPauseScreen.cpp @@ -97,7 +97,7 @@ bool CPauseScreen::CheckLoadComplete(const CStateManager& mgr) { if (!x28_pauseScreenInstructions->GetIsFinishedLoading()) return false; x34_loadedPauseScreenInstructions = x28_pauseScreenInstructions.GetObj(); - x34_loadedPauseScreenInstructions->SetMaxAspect(1.77f); + x34_loadedPauseScreenInstructions->SetMaxAspect(1.62f); InitializeFrameGlue(); } if (x60_loadTok) { @@ -106,7 +106,7 @@ bool CPauseScreen::CheckLoadComplete(const CStateManager& mgr) { for (int i = 0; i < 2; ++i) { CMemoryInStream s(x5c_frmePauseScreenBuf.get(), x58_frmePauseScreenBufSz); x64_frameInsts.push_back(CGuiFrame::CreateFrame(x54_frmePauseScreenId, *g_GuiSys, s, g_SimplePool)); - x64_frameInsts.back()->SetMaxAspect(1.77f); + x64_frameInsts.back()->SetMaxAspect(1.62f); } x5c_frmePauseScreenBuf.reset(); x60_loadTok.reset(); diff --git a/Runtime/MP1/CSamusHud.cpp b/Runtime/MP1/CSamusHud.cpp index 0bc2a4279..6216f81fb 100644 --- a/Runtime/MP1/CSamusHud.cpp +++ b/Runtime/MP1/CSamusHud.cpp @@ -45,10 +45,10 @@ CSamusHud::CSamusHud(CStateManager& stateMgr) x264_loadedFrmeHelmet = x258_frmeHelmet.GetObj(); x264_loadedFrmeHelmet->Reset(); - x264_loadedFrmeHelmet->SetMaxAspect(1.78f); + x264_loadedFrmeHelmet->SetMaxAspect(1.62f); x274_loadedFrmeBaseHud = x268_frmeBaseHud.GetObj(); x274_loadedFrmeBaseHud->Reset(); - x274_loadedFrmeBaseHud->SetMaxAspect(1.78f); + x274_loadedFrmeBaseHud->SetMaxAspect(1.62f); x2a0_helmetIntf = std::make_unique(*x264_loadedFrmeHelmet); rstl::reserved_vector hasVisors = BuildPlayerHasVisors(stateMgr); @@ -1510,7 +1510,7 @@ void CSamusHud::UpdateStateTransition(float dt, const CStateManager& mgr) { return; x288_loadedSelectedHud = x278_selectedHud.GetObj(); x288_loadedSelectedHud->Reset(); - x288_loadedSelectedHud->SetMaxAspect(1.78f); + x288_loadedSelectedHud->SetMaxAspect(1.62f); x2b8_curState = x2bc_nextState; x2bc_nextState = x2c0_setState; InitializeFrameGlueMutable(mgr); diff --git a/Runtime/MP1/CSaveGameScreen.cpp b/Runtime/MP1/CSaveGameScreen.cpp index 95fe4acda..6c332a0a2 100644 --- a/Runtime/MP1/CSaveGameScreen.cpp +++ b/Runtime/MP1/CSaveGameScreen.cpp @@ -94,7 +94,7 @@ bool CSaveGameScreen::PumpLoad() { return false; x50_loadedFrame = x44_frmeGenericMenu.GetObj(); - x50_loadedFrame->SetAspectConstraint(1.78f); + x50_loadedFrame->SetAspectConstraint(1.62f); x54_textpane_message = static_cast(x50_loadedFrame->FindWidget("textpane_message")); x58_tablegroup_choices = static_cast(x50_loadedFrame->FindWidget("tablegroup_choices")); x5c_textpane_choice0 = static_cast(x50_loadedFrame->FindWidget("textpane_choice0")); diff --git a/Runtime/MP1/MP1.hpp b/Runtime/MP1/MP1.hpp index 397031000..cf25985ec 100644 --- a/Runtime/MP1/MP1.hpp +++ b/Runtime/MP1/MP1.hpp @@ -4,7 +4,7 @@ #define MP1_USE_BOO 0 #endif #ifndef MP1_VARIABLE_DELTA_TIME -#define MP1_VARIABLE_DELTA_TIME 0 +#define MP1_VARIABLE_DELTA_TIME 1 #endif #include "IMain.hpp"