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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/CPauseScreenBase.cpp
View File

@@ -277,14 +277,14 @@ void CPauseScreenBase::UpdateSideTable(CGuiTableGroup* table) {
if (IsRightLogDynamic()) {
UpdateRightLogHighlight(tableActive, selInView, selColor, deselColor);
} else {
for (int i = 0; i < x144_model_titles.size(); ++i)
for (size_t i = 0; i < x144_model_titles.size(); ++i)
x144_model_titles[i]->SetColor((i == selInView && tableActive) ? selColor : deselColor);
}
} else {
int sel = x70_tablegroup_leftlog->GetUserSelection();
x78_model_lefthighlight->SetLocalTransform(x78_model_lefthighlight->GetTransform() *
zeus::CTransform::Translate(0.f, 0.f, x38_highlightPitch * sel));
for (int i = 0; i < xc0_model_categories.size(); ++i)
for (size_t i = 0; i < xc0_model_categories.size(); ++i)
xc0_model_categories[i]->SetColor(i == sel ? selColor : deselColor);
}
}
@@ -294,7 +294,7 @@ void CPauseScreenBase::Update(float dt, CRandom16& rand, CArchitectureQueue& arc
x8_frame.Update(dt);
x14_alpha = std::min(2.f * dt + x14_alpha, 1.f);
u32 rightCount = GetRightTableCount();
int rightCount = GetRightTableCount();
bool pulseRightUp = x10_mode == EMode::RightTable && x18_firstViewRightSel > 0;
bool pulseRightDown = x10_mode == EMode::RightTable && x18_firstViewRightSel + 5 < rightCount;
float rightUpT = pulseRightUp ? CGraphics::GetSecondsMod900() : 0.f;