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

Merge pull request #270 from lioncash/brace 

CPlayer: Un-nest code within FinishNewScan()
This commit is contained in:
Phillip Stephens 2020-03-23 23:29:59 -07:00 committed by GitHub
parent af2738c7b1 70c51c3a86
commit fc87bd8022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Runtime/World/CPlayer.cpp
View File

@ -1195,18 +1195,36 @@ static CAssetId UpdatePersistentScanPercent(u32 prevLogScans, u32 logScans, u32
} }
void CPlayer::FinishNewScan(CStateManager& mgr) { void CPlayer::FinishNewScan(CStateManager& mgr) {
if (TCastToPtr<CActor> act = mgr.ObjectById(x310_orbitTargetId)) const TCastToConstPtr<CActor> act = mgr.ObjectById(x310_orbitTargetId);
if (act->GetMaterialList().HasMaterial(EMaterialTypes::Scannable))
if (auto scanInfo = act->GetScannableObjectInfo()) if (!act) {
if (mgr.GetPlayerState()->GetScanTime(scanInfo->GetScannableObjectId()) >= 1.f) return;
if (IsDataLoreResearchScan(scanInfo->GetScannableObjectId())) { }
auto scanCompletion = mgr.CalculateScanCompletionRate();
CAssetId message = UpdatePersistentScanPercent(mgr.GetPlayerState()->GetLogScans(), scanCompletion.first, if (!act->GetMaterialList().HasMaterial(EMaterialTypes::Scannable)) {
scanCompletion.second); return;
if (message.IsValid()) }
mgr.ShowPausedHUDMemo(message, 0.f);
mgr.GetPlayerState()->SetScanCompletionRate(scanCompletion); const auto* const scanInfo = act->GetScannableObjectInfo();
} if (!scanInfo) {
return;
}
if (mgr.GetPlayerState()->GetScanTime(scanInfo->GetScannableObjectId()) < 1.f) {
return;
}
if (!IsDataLoreResearchScan(scanInfo->GetScannableObjectId())) {
return;
}
const auto scanCompletion = mgr.CalculateScanCompletionRate();
const CAssetId message = UpdatePersistentScanPercent(mgr.GetPlayerState()->GetLogScans(), scanCompletion.first,
scanCompletion.second);
if (message.IsValid()) {
mgr.ShowPausedHUDMemo(message, 0.f);
}
mgr.GetPlayerState()->SetScanCompletionRate(scanCompletion);
} }
void CPlayer::SetScanningState(EPlayerScanState state, CStateManager& mgr) { void CPlayer::SetScanningState(EPlayerScanState state, CStateManager& mgr) {