Tweak max aspect ratiou

This commit is contained in:
Phillip Stephens 2020-04-05 05:42:02 -07:00
parent e9dada688e
commit fa986ea1ed
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
6 changed files with 13 additions and 13 deletions

View File

@ -1100,7 +1100,7 @@ void CAutoMapper::Update(float dt, const CStateManager& mgr) {
} }
if (!m_frmeInitialized && x28_frmeMapScreen.IsLoaded()) { if (!m_frmeInitialized && x28_frmeMapScreen.IsLoaded()) {
x28_frmeMapScreen->SetMaxAspect(1.78f); x28_frmeMapScreen->SetMaxAspect(1.62f);
m_frmeInitialized = true; m_frmeInitialized = true;
static_cast<CGuiTextPane*>(x28_frmeMapScreen->FindWidget("textpane_left")) static_cast<CGuiTextPane*>(x28_frmeMapScreen->FindWidget("textpane_left"))
->TextSupport() ->TextSupport()

View File

@ -120,7 +120,7 @@ CFrontEndUI::SNewFileSelectFrame::SNewFileSelectFrame(CSaveGameScreen* sui, u32
void CFrontEndUI::SNewFileSelectFrame::FinishedLoading() { void CFrontEndUI::SNewFileSelectFrame::FinishedLoading() {
x1c_loadedFrame->Reset(); x1c_loadedFrame->Reset();
x1c_loadedFrame->SetAspectConstraint(1.78f); x1c_loadedFrame->SetAspectConstraint(1.62f);
x20_tablegroup_fileselect = static_cast<CGuiTableGroup*>(x1c_loadedFrame->FindWidget("tablegroup_fileselect")); x20_tablegroup_fileselect = static_cast<CGuiTableGroup*>(x1c_loadedFrame->FindWidget("tablegroup_fileselect"));
x24_model_erase = static_cast<CGuiModel*>(x1c_loadedFrame->FindWidget("model_erase")); x24_model_erase = static_cast<CGuiModel*>(x1c_loadedFrame->FindWidget("model_erase"));
@ -841,7 +841,7 @@ void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::Update(float dt) {
} }
void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::FinishedLoading() { void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::FinishedLoading() {
x8_frme->SetAspectConstraint(1.78f); x8_frme->SetAspectConstraint(1.62f);
xc_textpane_instructions = FindTextPanePair(x8_frme, "textpane_instructions"); xc_textpane_instructions = FindTextPanePair(x8_frme, "textpane_instructions");
x14_textpane_yes = static_cast<CGuiTextPane*>(x8_frme->FindWidget("textpane_yes")); x14_textpane_yes = static_cast<CGuiTextPane*>(x8_frme->FindWidget("textpane_yes"));
@ -868,7 +868,7 @@ CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::SGBALinkFrame(CGuiFrame* linkFram
} }
void CFrontEndUI::SFusionBonusFrame::FinishedLoading() { void CFrontEndUI::SFusionBonusFrame::FinishedLoading() {
x24_loadedFrame->SetAspectConstraint(1.78f); x24_loadedFrame->SetAspectConstraint(1.62f);
x28_tablegroup_options = static_cast<CGuiTableGroup*>(x24_loadedFrame->FindWidget("tablegroup_options")); x28_tablegroup_options = static_cast<CGuiTableGroup*>(x24_loadedFrame->FindWidget("tablegroup_options"));
x2c_tablegroup_fusionsuit = static_cast<CGuiTableGroup*>(x24_loadedFrame->FindWidget("tablegroup_fusionsuit")); x2c_tablegroup_fusionsuit = static_cast<CGuiTableGroup*>(x24_loadedFrame->FindWidget("tablegroup_fusionsuit"));
@ -1123,7 +1123,7 @@ void CFrontEndUI::FindAndSetPairText(CGuiFrame* frame, std::string_view name, st
} }
void CFrontEndUI::SFrontEndFrame::FinishedLoading() { void CFrontEndUI::SFrontEndFrame::FinishedLoading() {
x14_loadedFrme->SetAspectConstraint(1.78f); x14_loadedFrme->SetAspectConstraint(1.62f);
x18_tablegroup_mainmenu = static_cast<CGuiTableGroup*>(x14_loadedFrme->FindWidget("tablegroup_mainmenu")); x18_tablegroup_mainmenu = static_cast<CGuiTableGroup*>(x14_loadedFrme->FindWidget("tablegroup_mainmenu"));
x1c_gbaPair = FindTextPanePair(x14_loadedFrme, "textpane_gba"); x1c_gbaPair = FindTextPanePair(x14_loadedFrme, "textpane_gba");
@ -1549,7 +1549,7 @@ void CFrontEndUI::SOptionsFrontEndFrame::SetTableColors(CGuiTableGroup* tbgp) co
} }
void CFrontEndUI::SOptionsFrontEndFrame::FinishedLoading() { void CFrontEndUI::SOptionsFrontEndFrame::FinishedLoading() {
x1c_loadedFrame->SetAspectConstraint(1.78f); x1c_loadedFrame->SetAspectConstraint(1.62f);
x24_tablegroup_leftmenu = static_cast<CGuiTableGroup*>(x1c_loadedFrame->FindWidget("tablegroup_leftmenu")); x24_tablegroup_leftmenu = static_cast<CGuiTableGroup*>(x1c_loadedFrame->FindWidget("tablegroup_leftmenu"));
x28_tablegroup_rightmenu = static_cast<CGuiTableGroup*>(x1c_loadedFrame->FindWidget("tablegroup_rightmenu")); x28_tablegroup_rightmenu = static_cast<CGuiTableGroup*>(x1c_loadedFrame->FindWidget("tablegroup_rightmenu"));

View File

@ -97,7 +97,7 @@ bool CPauseScreen::CheckLoadComplete(const CStateManager& mgr) {
if (!x28_pauseScreenInstructions->GetIsFinishedLoading()) if (!x28_pauseScreenInstructions->GetIsFinishedLoading())
return false; return false;
x34_loadedPauseScreenInstructions = x28_pauseScreenInstructions.GetObj(); x34_loadedPauseScreenInstructions = x28_pauseScreenInstructions.GetObj();
x34_loadedPauseScreenInstructions->SetMaxAspect(1.77f); x34_loadedPauseScreenInstructions->SetMaxAspect(1.62f);
InitializeFrameGlue(); InitializeFrameGlue();
} }
if (x60_loadTok) { if (x60_loadTok) {
@ -106,7 +106,7 @@ bool CPauseScreen::CheckLoadComplete(const CStateManager& mgr) {
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
CMemoryInStream s(x5c_frmePauseScreenBuf.get(), x58_frmePauseScreenBufSz); CMemoryInStream s(x5c_frmePauseScreenBuf.get(), x58_frmePauseScreenBufSz);
x64_frameInsts.push_back(CGuiFrame::CreateFrame(x54_frmePauseScreenId, *g_GuiSys, s, g_SimplePool)); 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(); x5c_frmePauseScreenBuf.reset();
x60_loadTok.reset(); x60_loadTok.reset();

View File

@ -45,10 +45,10 @@ CSamusHud::CSamusHud(CStateManager& stateMgr)
x264_loadedFrmeHelmet = x258_frmeHelmet.GetObj(); x264_loadedFrmeHelmet = x258_frmeHelmet.GetObj();
x264_loadedFrmeHelmet->Reset(); x264_loadedFrmeHelmet->Reset();
x264_loadedFrmeHelmet->SetMaxAspect(1.78f); x264_loadedFrmeHelmet->SetMaxAspect(1.62f);
x274_loadedFrmeBaseHud = x268_frmeBaseHud.GetObj(); x274_loadedFrmeBaseHud = x268_frmeBaseHud.GetObj();
x274_loadedFrmeBaseHud->Reset(); x274_loadedFrmeBaseHud->Reset();
x274_loadedFrmeBaseHud->SetMaxAspect(1.78f); x274_loadedFrmeBaseHud->SetMaxAspect(1.62f);
x2a0_helmetIntf = std::make_unique<CHudHelmetInterface>(*x264_loadedFrmeHelmet); x2a0_helmetIntf = std::make_unique<CHudHelmetInterface>(*x264_loadedFrmeHelmet);
rstl::reserved_vector<bool, 4> hasVisors = BuildPlayerHasVisors(stateMgr); rstl::reserved_vector<bool, 4> hasVisors = BuildPlayerHasVisors(stateMgr);
@ -1510,7 +1510,7 @@ void CSamusHud::UpdateStateTransition(float dt, const CStateManager& mgr) {
return; return;
x288_loadedSelectedHud = x278_selectedHud.GetObj(); x288_loadedSelectedHud = x278_selectedHud.GetObj();
x288_loadedSelectedHud->Reset(); x288_loadedSelectedHud->Reset();
x288_loadedSelectedHud->SetMaxAspect(1.78f); x288_loadedSelectedHud->SetMaxAspect(1.62f);
x2b8_curState = x2bc_nextState; x2b8_curState = x2bc_nextState;
x2bc_nextState = x2c0_setState; x2bc_nextState = x2c0_setState;
InitializeFrameGlueMutable(mgr); InitializeFrameGlueMutable(mgr);

View File

@ -94,7 +94,7 @@ bool CSaveGameScreen::PumpLoad() {
return false; return false;
x50_loadedFrame = x44_frmeGenericMenu.GetObj(); x50_loadedFrame = x44_frmeGenericMenu.GetObj();
x50_loadedFrame->SetAspectConstraint(1.78f); x50_loadedFrame->SetAspectConstraint(1.62f);
x54_textpane_message = static_cast<CGuiTextPane*>(x50_loadedFrame->FindWidget("textpane_message")); x54_textpane_message = static_cast<CGuiTextPane*>(x50_loadedFrame->FindWidget("textpane_message"));
x58_tablegroup_choices = static_cast<CGuiTableGroup*>(x50_loadedFrame->FindWidget("tablegroup_choices")); x58_tablegroup_choices = static_cast<CGuiTableGroup*>(x50_loadedFrame->FindWidget("tablegroup_choices"));
x5c_textpane_choice0 = static_cast<CGuiTextPane*>(x50_loadedFrame->FindWidget("textpane_choice0")); x5c_textpane_choice0 = static_cast<CGuiTextPane*>(x50_loadedFrame->FindWidget("textpane_choice0"));

View File

@ -4,7 +4,7 @@
#define MP1_USE_BOO 0 #define MP1_USE_BOO 0
#endif #endif
#ifndef MP1_VARIABLE_DELTA_TIME #ifndef MP1_VARIABLE_DELTA_TIME
#define MP1_VARIABLE_DELTA_TIME 0 #define MP1_VARIABLE_DELTA_TIME 1
#endif #endif
#include "IMain.hpp" #include "IMain.hpp"