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

CLogBookScreen: Invert conditional within UpdateBodyText() 

Allows unindenting the contained code by one level.
This commit is contained in:
Lioncash 2019-10-15 10:05:50 -04:00
parent b93f7a4ceb
commit 4db0e49851
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Runtime/MP1/CLogBookScreen.cpp
View File

@ -178,23 +178,25 @@ void CLogBookScreen::UpdateBodyText() {
return; return;
} }
TCachedToken<CStringTable>& str = x1f0_curViewScans[x1c_rightSel].second; const TCachedToken<CStringTable>& str = x1f0_curViewScans[x1c_rightSel].second;
if (str && str.IsLoaded()) { if (!str || !str.IsLoaded()) {
std::u16string accumStr = str->GetString(0); return;
if (str->GetStringCount() > 2) {
accumStr += u"\n\n";
accumStr += str->GetString(2);
}
if (IsArtifactCategorySelected()) {
const int headIdx = GetSelectedArtifactHeadScanIndex();
if (headIdx >= 0 && g_GameState->GetPlayerState()->HasPowerUp(CPlayerState::EItemType(headIdx + 29))) {
accumStr = std::u16string(u"\n\n\n\n\n\n").append(g_MainStringTable->GetString(105));
}
}
x174_textpane_body->TextSupport().SetText(accumStr, true);
} }
std::u16string accumStr = str->GetString(0);
if (str->GetStringCount() > 2) {
accumStr += u"\n\n";
accumStr += str->GetString(2);
}
if (IsArtifactCategorySelected()) {
const int headIdx = GetSelectedArtifactHeadScanIndex();
if (headIdx >= 0 && g_GameState->GetPlayerState()->HasPowerUp(CPlayerState::EItemType(headIdx + 29))) {
accumStr = std::u16string(u"\n\n\n\n\n\n").append(g_MainStringTable->GetString(105));
}
}
x174_textpane_body->TextSupport().SetText(accumStr, true);
} }
void CLogBookScreen::UpdateBodyImagesAndText() { void CLogBookScreen::UpdateBodyImagesAndText() {