Merge pull request #200 from lioncash/temp

CLogBookScreen: Remove unconditional return true in IsScanComplete()
This commit is contained in:
Phillip Stephens 2020-03-08 18:03:54 -07:00 committed by GitHub
commit fc5170ede9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -31,13 +31,13 @@ CLogBookScreen::~CLogBookScreen() {
bool CLogBookScreen::IsScanComplete(CSaveWorld::EScanCategory category, CAssetId scan, bool CLogBookScreen::IsScanComplete(CSaveWorld::EScanCategory category, CAssetId scan,
const CPlayerState& playerState) { const CPlayerState& playerState) {
return true; const float time = playerState.GetScanTime(scan);
float time = playerState.GetScanTime(scan); if (category == CSaveWorld::EScanCategory::Artifact) {
if (category == CSaveWorld::EScanCategory::Artifact)
return time >= 0.5f; return time >= 0.5f;
else } else {
return time >= 1.f; return time >= 1.f;
} }
}
void CLogBookScreen::InitializeLogBook() { void CLogBookScreen::InitializeLogBook() {
for (size_t i = 0; i < x19c_scanCompletes.size(); ++i) { for (size_t i = 0; i < x19c_scanCompletes.size(); ++i) {