From 76de1541f26ae329568289711cd02af5fef9052d Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 18 Sep 2020 17:04:50 -0400 Subject: [PATCH] Runtime: Resolve -Wrange-loop-analysis warnings (part 2) --- Runtime/AutoMapper/CMapWorldInfo.cpp | 4 ++-- Runtime/CGameOptions.cpp | 2 +- Runtime/CStateManager.cpp | 20 ++++++++++---------- Runtime/Camera/CCameraManager.cpp | 4 ++-- Runtime/Collision/CGameCollision.cpp | 6 +++--- Runtime/GuiSys/CHudRadarInterface.cpp | 2 +- Runtime/MP1/World/CFlyingPirate.cpp | 2 +- Runtime/MP1/World/CIceSheegoth.cpp | 10 +++++----- Runtime/MP1/World/CMetroid.cpp | 2 +- Runtime/MP1/World/CRipper.cpp | 2 +- Runtime/MP1/World/CSeedling.cpp | 4 ++-- Runtime/Weapon/CAuxWeapon.cpp | 2 +- Runtime/Weapon/CFlameThrower.cpp | 2 +- Runtime/Weapon/CPlayerGun.cpp | 2 +- Runtime/World/CMorphBall.cpp | 6 +++--- Runtime/World/CPlayer.cpp | 20 ++++++++++---------- Runtime/World/CScriptSpecialFunction.cpp | 2 +- Runtime/World/CScriptSpiderBallWaypoint.cpp | 2 +- 18 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Runtime/AutoMapper/CMapWorldInfo.cpp b/Runtime/AutoMapper/CMapWorldInfo.cpp index 280dfe9ce..c506e273e 100644 --- a/Runtime/AutoMapper/CMapWorldInfo.cpp +++ b/Runtime/AutoMapper/CMapWorldInfo.cpp @@ -20,7 +20,7 @@ CMapWorldInfo::CMapWorldInfo(CBitStreamReader& reader, const CSaveWorld& savw, C SetIsMapped(i, mapped); } - for (const TEditorId doorId : savw.GetDoors()) { + for (const auto& doorId : savw.GetDoors()) { SetDoorVisited(doorId, reader.ReadEncoded(1) != 0); } @@ -46,7 +46,7 @@ void CMapWorldInfo::PutTo(CBitStreamWriter& writer, const CSaveWorld& savw, CAss } } - for (const TEditorId doorId : savw.GetDoors()) { + for (const auto& doorId : savw.GetDoors()) { writer.WriteEncoded(u32(IsDoorVisited(doorId)), 1); } diff --git a/Runtime/CGameOptions.cpp b/Runtime/CGameOptions.cpp index 5b8e4ff3a..c2cea850d 100644 --- a/Runtime/CGameOptions.cpp +++ b/Runtime/CGameOptions.cpp @@ -167,7 +167,7 @@ void CPersistentOptions::PutTo(CBitStreamWriter& w) const { const TLockedToken saveWorld = g_SimplePool->GetObj(SObjectTag{FOURCC('SAVW'), world.second.GetSaveWorldAssetId()}); - for (const TEditorId cineId : saveWorld->GetCinematics()) { + for (const auto& cineId : saveWorld->GetCinematics()) { w.WriteEncoded(u32(GetCinematicState(world.first, cineId)), 1); } } diff --git a/Runtime/CStateManager.cpp b/Runtime/CStateManager.cpp index d4d56d8d9..e278c5348 100644 --- a/Runtime/CStateManager.cpp +++ b/Runtime/CStateManager.cpp @@ -369,7 +369,7 @@ TAreaId CStateManager::GetVisAreaId() const { BuildNearList(nearList, camAABB, CMaterialFilter(EMaterialTypes::AIBlock, CMaterialList(), CMaterialFilter::EFilterType::Include), nullptr); - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr dock = GetObjectById(id)) { if (dock->GetAreaId() == curArea && dock->HasPointCrossedDock(*this, camTranslation)) { return dock->GetCurrentConnectedAreaId(*this); @@ -752,7 +752,7 @@ void CStateManager::DrawWorld() { SetupFogForArea(*areaArr[areaCount - 1]); } - for (const TUniqueId id : x86c_stateManagerContainer->xf370_) { + for (const auto& id : x86c_stateManagerContainer->xf370_) { if (auto* ent = static_cast(ObjectById(id))) { if (!thermal || (ent->xe6_27_thermalVisorFlags & 1) != 0) { ent->Render(*this); @@ -831,7 +831,7 @@ void CStateManager::DrawWorld() { if (thermal) { if (x86c_stateManagerContainer->xf39c_renderLast.size()) { CGraphics::SetDepthRange(DEPTH_SCREEN_ACTORS, DEPTH_GUN); - for (const TUniqueId id : x86c_stateManagerContainer->xf39c_renderLast) { + for (const auto& id : x86c_stateManagerContainer->xf39c_renderLast) { if (auto* actor = static_cast(ObjectById(id))) { if ((actor->xe6_27_thermalVisorFlags & 1) != 0) { actor->Render(*this); @@ -843,7 +843,7 @@ void CStateManager::DrawWorld() { g_Renderer->DoThermalBlendCold(); xf34_thermalFlag = EThermalDrawFlag::Hot; - for (const TUniqueId id : x86c_stateManagerContainer->xf370_) { + for (const auto& id : x86c_stateManagerContainer->xf370_) { if (auto* actor = static_cast(ObjectById(id))) { if ((actor->xe6_27_thermalVisorFlags & 2) != 0) { actor->Render(*this); @@ -909,7 +909,7 @@ void CStateManager::DrawWorld() { if (x86c_stateManagerContainer->xf39c_renderLast.size()) { CGraphics::SetDepthRange(DEPTH_SCREEN_ACTORS, DEPTH_GUN); - for (const TUniqueId id : x86c_stateManagerContainer->xf39c_renderLast) { + for (const auto& id : x86c_stateManagerContainer->xf39c_renderLast) { if (auto* actor = static_cast(ObjectById(id))) { if (!thermal || actor->xe6_27_thermalVisorFlags & 0x2) { actor->Render(*this); @@ -1502,7 +1502,7 @@ std::pair CStateManager::GenerateObject(TEditorId eid) { } void CStateManager::InitScriptObjects(const std::vector& ids) { - for (const TEditorId id : ids) { + for (const auto& id : ids) { if (id == kInvalidEditorId) { continue; } @@ -1619,7 +1619,7 @@ void CStateManager::ApplyDamageToWorld(TUniqueId damager, const CActor& actor, c rstl::reserved_vector nearList; BuildNearList(nearList, aabb, filter, &actor); - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { CEntity* ent = ObjectById(id); if (ent == nullptr) { continue; @@ -1658,7 +1658,7 @@ void CStateManager::ProcessRadiusDamage(const CActor& damager, CActor& damagee, const zeus::CAABox aabb(damager.GetTranslation() - info.GetRadius(), damager.GetTranslation() + info.GetRadius()); rstl::reserved_vector nearList; BuildNearList(nearList, aabb, filter, nullptr); - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { CEntity* ent = ObjectById(id); if (ent == nullptr || ent->GetUniqueId() == damager.GetUniqueId() || ent->GetUniqueId() == senderId || ent->GetUniqueId() == damagee.GetUniqueId()) { @@ -2317,7 +2317,7 @@ void CStateManager::CrossTouchActors() { rstl::reserved_vector nearList; BuildNearList(nearList, *touchAABB, filter, &actor); - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { auto* ent2 = static_cast(ObjectById(id)); if (!ent2) { continue; @@ -2388,7 +2388,7 @@ void CStateManager::ShowPausedHUDMemo(CAssetId strg, float time) { } void CStateManager::ClearGraveyard() { - for (const TUniqueId id : x854_objectGraveyard) { + for (const auto& id : x854_objectGraveyard) { CEntity* ent = GetAllObjectList().GetValidObjectById(id); RemoveObject(id); std::default_delete()(ent); diff --git a/Runtime/Camera/CCameraManager.cpp b/Runtime/Camera/CCameraManager.cpp index 2f2fc6919..036c9fad6 100644 --- a/Runtime/Camera/CCameraManager.cpp +++ b/Runtime/Camera/CCameraManager.cpp @@ -293,7 +293,7 @@ void CCameraManager::UpdateCameraHints(float, CStateManager& mgr) { } bool inactiveHintRemoved = false; - for (const TUniqueId id : x2b0_inactiveCameraHints) { + for (const auto& id : x2b0_inactiveCameraHints) { if (const TCastToConstPtr hint = mgr.GetObjectById(id)) { if (hint->GetHelperCount() == 0 || hint->GetInactive()) { for (auto it = xac_cameraHints.begin(); it != xac_cameraHints.end(); ++it) { @@ -313,7 +313,7 @@ void CCameraManager::UpdateCameraHints(float, CStateManager& mgr) { x2b0_inactiveCameraHints.clear(); bool activeHintAdded = false; - for (const TUniqueId id : x334_activeCameraHints) { + for (const auto& id : x334_activeCameraHints) { if (const TCastToConstPtr hint = mgr.GetObjectById(id)) { bool activeHintPresent = false; for (auto it = xac_cameraHints.begin(); it != xac_cameraHints.end(); ++it) { diff --git a/Runtime/Collision/CGameCollision.cpp b/Runtime/Collision/CGameCollision.cpp index 3687c47bc..8352be196 100644 --- a/Runtime/Collision/CGameCollision.cpp +++ b/Runtime/Collision/CGameCollision.cpp @@ -473,7 +473,7 @@ bool CGameCollision::DetectStaticCollisionBoolean_Cached(const CStateManager& mg bool CGameCollision::DetectDynamicCollisionBoolean(const CCollisionPrimitive& prim, const zeus::CTransform& xf, const rstl::reserved_vector& nearList, const CStateManager& mgr) { - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr actor = mgr.GetObjectById(id)) { const CInternalCollisionStructure::CPrimDesc p0(prim, CMaterialFilter::skPassEverything, xf); const CInternalCollisionStructure::CPrimDesc p1( @@ -643,7 +643,7 @@ bool CGameCollision::DetectStaticCollision_Cached_Moving(const CStateManager& mg bool CGameCollision::DetectDynamicCollision(const CCollisionPrimitive& prim, const zeus::CTransform& xf, const rstl::reserved_vector& nearList, TUniqueId& idOut, CCollisionInfoList& list, const CStateManager& mgr) { - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr actor = mgr.GetObjectById(id)) { const CInternalCollisionStructure::CPrimDesc p0(prim, CMaterialFilter::skPassEverything, xf); const CInternalCollisionStructure::CPrimDesc p1( @@ -663,7 +663,7 @@ bool CGameCollision::DetectDynamicCollisionMoving(const CCollisionPrimitive& pri const zeus::CVector3f& dir, TUniqueId& idOut, CCollisionInfo& infoOut, double& dOut, const CStateManager& mgr) { bool ret = false; - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { double d = dOut; CCollisionInfo info; if (const TCastToConstPtr actor = mgr.GetObjectById(id)) { diff --git a/Runtime/GuiSys/CHudRadarInterface.cpp b/Runtime/GuiSys/CHudRadarInterface.cpp index 3272ab701..cd00e18b5 100644 --- a/Runtime/GuiSys/CHudRadarInterface.cpp +++ b/Runtime/GuiSys/CHudRadarInterface.cpp @@ -137,7 +137,7 @@ void CHudRadarInterface::Draw(const CStateManager& mgr, float alpha) { drawParms.x0_playerPos = mgr.GetPlayer().GetTranslation(); drawParms.x74_alpha = alpha; - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr act = mgr.GetObjectById(id)) { if (!act->GetActive()) { continue; diff --git a/Runtime/MP1/World/CFlyingPirate.cpp b/Runtime/MP1/World/CFlyingPirate.cpp index d354fee33..5d3e0e0a0 100644 --- a/Runtime/MP1/World/CFlyingPirate.cpp +++ b/Runtime/MP1/World/CFlyingPirate.cpp @@ -563,7 +563,7 @@ void CFlyingPirate::CheckForProjectiles(CStateManager& mgr) { rstl::reserved_vector nearList; mgr.BuildNearList(nearList, box, CMaterialFilter::MakeInclude(EMaterialTypes::Projectile), this); - for (const auto id : nearList) { + for (const auto& id : nearList) { if (TCastToConstPtr proj = mgr.GetObjectById(id)) { zeus::CVector3f dist = GetBoundingBox().center() - proj->GetTranslation(); if (dist.isMagnitudeSafe()) { diff --git a/Runtime/MP1/World/CIceSheegoth.cpp b/Runtime/MP1/World/CIceSheegoth.cpp index 3af34a595..d1cfd2b94 100644 --- a/Runtime/MP1/World/CIceSheegoth.cpp +++ b/Runtime/MP1/World/CIceSheegoth.cpp @@ -1274,13 +1274,13 @@ void CIceSheegoth::UpdateHealthInfo(CStateManager& mgr) { hpDelta = std::max(hpDelta, x970_maxHp - colAct->GetHealthInfo(mgr)->GetHP()); } - for (const TUniqueId uid : xafc_gillColliders) { + for (const auto& uid : xafc_gillColliders) { if (const TCastToConstPtr colAct = mgr.ObjectById(uid)) { hpDelta = std::max(hpDelta, x970_maxHp - colAct->GetHealthInfo(mgr)->GetHP()); } } - for (const TUniqueId uid : xb04_) { + for (const auto& uid : xb04_) { if (const TCastToConstPtr colAct = mgr.ObjectById(uid)) { hpDelta = std::max(hpDelta, x970_maxHp - colAct->GetHealthInfo(mgr)->GetHP()); } @@ -1290,13 +1290,13 @@ void CIceSheegoth::UpdateHealthInfo(CStateManager& mgr) { if (const TCastToPtr colAct = mgr.ObjectById(xaf8_mouthCollider)) { colAct->HealthInfo(mgr)->SetHP(x970_maxHp); } - for (const TUniqueId uid : xafc_gillColliders) { + for (const auto& uid : xafc_gillColliders) { if (const TCastToPtr colAct = mgr.ObjectById(uid)) { colAct->HealthInfo(mgr)->SetHP(x970_maxHp); } } - for (const TUniqueId uid : xb04_) { + for (const auto& uid : xb04_) { if (const TCastToPtr colAct = mgr.ObjectById(uid)) { colAct->HealthInfo(mgr)->SetHP(x970_maxHp); } @@ -1497,7 +1497,7 @@ bool CIceSheegoth::IsClosestSheegoth(CStateManager& mgr, const rstl::reserved_ve const zeus::CVector3f& projectileOffset) const { zeus::CVector3f diff = projectileOffset - GetTranslation(); const float diffMag = diff.magSquared(); - for (const TUniqueId uid : nearList) { + for (const auto& uid : nearList) { const CIceSheegoth* goth = CPatterned::CastTo(mgr.GetObjectById(uid)); if (!goth || goth->GetUniqueId() == GetUniqueId()) continue; diff --git a/Runtime/MP1/World/CMetroid.cpp b/Runtime/MP1/World/CMetroid.cpp index a1bc0c894..f46f92ef6 100644 --- a/Runtime/MP1/World/CMetroid.cpp +++ b/Runtime/MP1/World/CMetroid.cpp @@ -1316,7 +1316,7 @@ bool CMetroid::ShouldDodge(CStateManager& mgr, float arg) { return false; } const auto front = xf.frontVector(); - for (const auto id : nearList) { + for (const auto& id : nearList) { if (TCastToConstPtr projectile = mgr.GetObjectById(id)) { if (!projectile->HasAttrib(EProjectileAttrib::Ice)) { continue; diff --git a/Runtime/MP1/World/CRipper.cpp b/Runtime/MP1/World/CRipper.cpp index 5e6e0f5b7..9796489db 100644 --- a/Runtime/MP1/World/CRipper.cpp +++ b/Runtime/MP1/World/CRipper.cpp @@ -170,7 +170,7 @@ zeus::CQuaternion CRipperControlledPlatform::Move(float arg, CStateManager& mgr) rstl::reserved_vector nearList; rstl::reserved_vector filteredNearList; mgr.BuildColliderList(nearList, *this, GetMotionVolume(arg)); - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (!IsRider(id) && !IsSlave(id)) { filteredNearList.push_back(id); } diff --git a/Runtime/MP1/World/CSeedling.cpp b/Runtime/MP1/World/CSeedling.cpp index 8b7fabc16..87b73df0c 100644 --- a/Runtime/MP1/World/CSeedling.cpp +++ b/Runtime/MP1/World/CSeedling.cpp @@ -112,7 +112,7 @@ void CSeedling::Render(CStateManager& mgr) { flags.x2_flags = 3; flags.x4_color = zeus::skWhite; - for (const std::string_view sv : skNeedleLocators[index]) { + for (const auto& sv : skNeedleLocators[index]) { x6bc_spikeData->Render(mgr, GetLctrTransform(sv), x90_actorLights.get(), flags); } } @@ -208,7 +208,7 @@ bool CSeedling::ShouldAttack(CStateManager& mgr, float) { void CSeedling::LaunchNeedles(CStateManager& mgr) { const auto& needleLocators = skNeedleLocators[size_t(x722_25_curNeedleCluster)]; - for (const std::string_view needle : needleLocators) { + for (const auto& needle : needleLocators) { LaunchProjectile(GetLctrTransform(needle), mgr, int(needleLocators.size()), EProjectileAttrib::None, true, {}, 0xFFFF, false, GetModelData()->GetScale()); } diff --git a/Runtime/Weapon/CAuxWeapon.cpp b/Runtime/Weapon/CAuxWeapon.cpp index 2955c8da8..8e555c0cf 100644 --- a/Runtime/Weapon/CAuxWeapon.cpp +++ b/Runtime/Weapon/CAuxWeapon.cpp @@ -43,7 +43,7 @@ CAuxWeapon::CAuxWeapon(TUniqueId playerId) } void CAuxWeapon::InitComboData() { - for (const auto comboName : skComboNames) { + for (const auto& comboName : skComboNames) { x28_combos.push_back(g_SimplePool->GetObj(comboName)); } } diff --git a/Runtime/Weapon/CFlameThrower.cpp b/Runtime/Weapon/CFlameThrower.cpp index 3024e6dab..80692d028 100644 --- a/Runtime/Weapon/CFlameThrower.cpp +++ b/Runtime/Weapon/CFlameThrower.cpp @@ -147,7 +147,7 @@ CRayCastResult CFlameThrower::DoCollisionCheck(TUniqueId& idOut, const zeus::CAA lookXf.origin = delta * 0.5f + colPoints[i - 1]; const zeus::COBBox obb(lookXf, {curRadius, delta.magnitude() * 0.5f, curRadius}); - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (auto* act = static_cast(mgr.ObjectById(id))) { const CProjectileTouchResult tres = CanCollideWith(*act, mgr); if (tres.GetActorId() == kInvalidUniqueId) { diff --git a/Runtime/Weapon/CPlayerGun.cpp b/Runtime/Weapon/CPlayerGun.cpp index dae5cd08c..2b2f6c84f 100644 --- a/Runtime/Weapon/CPlayerGun.cpp +++ b/Runtime/Weapon/CPlayerGun.cpp @@ -200,7 +200,7 @@ void CPlayerGun::InitBombData() { } void CPlayerGun::InitMuzzleData() { - for (const auto muzzleID : g_tweakGunRes->xa4_auxMuzzle) { + for (const auto& muzzleID : g_tweakGunRes->xa4_auxMuzzle) { x7c0_auxMuzzleEffects.push_back(g_SimplePool->GetObj(SObjectTag{FOURCC('PART'), muzzleID})); x800_auxMuzzleGenerators.emplace_back(std::make_unique(x7c0_auxMuzzleEffects.back())); x800_auxMuzzleGenerators.back()->SetParticleEmission(false); diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp index 0ccde6073..800f8f7c5 100644 --- a/Runtime/World/CMorphBall.cpp +++ b/Runtime/World/CMorphBall.cpp @@ -742,7 +742,7 @@ bool CMorphBall::FindClosestSpiderBallWaypoint(CStateManager& mgr, const zeus::C mgr.BuildNearList(nearList, aabb, CMaterialFilter::skPassEverything, nullptr); float minDist = 2.1f; - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr surface = mgr.GetObjectById(id)) { const zeus::CUnitVector3f surfaceNorm(surface->GetTransform().basis[1]); const zeus::CPlane plane(surfaceNorm, surface->GetTranslation().dot(surfaceNorm)); @@ -774,7 +774,7 @@ bool CMorphBall::FindClosestSpiderBallWaypoint(CStateManager& mgr, const zeus::C } } - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr wp = mgr.GetObjectById(id)) { const CScriptSpiderBallWaypoint* closestWp = nullptr; zeus::CVector3f worldPoint; @@ -1916,7 +1916,7 @@ bool CMorphBall::BallCloseToCollision(const CStateManager& mgr, float dist, cons return true; } - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr act = mgr.GetObjectById(id)) { if (CCollisionPrimitive::CollideBoolean( {sphere, filter, zeus::CTransform()}, diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp index d1438063f..68a9beabf 100644 --- a/Runtime/World/CPlayer.cpp +++ b/Runtime/World/CPlayer.cpp @@ -2290,7 +2290,7 @@ void CPlayer::UpdatePhazonDamage(float dt, CStateManager& mgr) { if (CGameCollision::DetectStaticCollisionBoolean(mgr, prim, zeus::CTransform(), filter)) { touchingPhazon = true; } else { - for (const TUniqueId id : nearList) { + for (const auto& id : nearList) { if (const TCastToConstPtr act = mgr.GetObjectById(id)) { const CInternalCollisionStructure::CPrimDesc prim0(prim, filter, zeus::CTransform()); const CInternalCollisionStructure::CPrimDesc prim1( @@ -2387,7 +2387,7 @@ void CPlayer::AddToPlayerHintRemoveList(TUniqueId id, CStateManager& mgr) { return; } - for (const TUniqueId existId : x93c_playerHintsToRemove) { + for (const auto& existId : x93c_playerHintsToRemove) { if (id == existId) { return; } @@ -2404,7 +2404,7 @@ void CPlayer::AddToPlayerHintAddList(TUniqueId id, CStateManager& mgr) { return; } - for (const TUniqueId existId : x980_playerHintsToAdd) { + for (const auto& existId : x980_playerHintsToAdd) { if (id == existId) { return; } @@ -2421,7 +2421,7 @@ void CPlayer::DeactivatePlayerHint(TUniqueId id, CStateManager& mgr) { return; } - for (const TUniqueId existId : x93c_playerHintsToRemove) { + for (const auto& existId : x93c_playerHintsToRemove) { if (id == existId) { return; } @@ -2448,7 +2448,7 @@ void CPlayer::UpdatePlayerHints(CStateManager& mgr) { } bool needsNewHint = false; - for (const TUniqueId id : x93c_playerHintsToRemove) { + for (const auto& id : x93c_playerHintsToRemove) { for (auto it = x838_playerHints.begin(); it != x838_playerHints.end();) { if (it->second == id) { it = x838_playerHints.erase(it); @@ -2463,7 +2463,7 @@ void CPlayer::UpdatePlayerHints(CStateManager& mgr) { x93c_playerHintsToRemove.clear(); bool addedHint = false; - for (const TUniqueId id : x980_playerHintsToAdd) { + for (const auto& id : x980_playerHintsToAdd) { if (const TCastToConstPtr hint = mgr.ObjectById(id)) { bool exists = false; for (auto& p : x838_playerHints) { @@ -4252,7 +4252,7 @@ TUniqueId CPlayer::CheckEnemiesAgainstOrbitZone(const rstl::reserved_vectorGetFirstPersonCamera(); - for (const TUniqueId id : list) { + for (const auto& id : list) { if (const auto* act = static_cast(mgr.ObjectById(id))) { if (act->GetUniqueId() != GetUniqueId() && ValidateObjectForMode(act->GetUniqueId(), mgr)) { const zeus::CVector3f aimPos = act->GetAimPosition(mgr, 0.f); @@ -4349,7 +4349,7 @@ TUniqueId CPlayer::FindBestOrbitableObject(const std::vector& ids, EP const CFirstPersonCamera* fpCam = mgr.GetCameraManager()->GetFirstPersonCamera(); - for (const TUniqueId id : ids) { + for (const auto& id : ids) { if (const TCastToConstPtr act = mgr.ObjectById(id)) { const zeus::CVector3f orbitPos = act->GetOrbitPosition(mgr); zeus::CVector3f eyeToOrbit = orbitPos - eyePos; @@ -4484,7 +4484,7 @@ void CPlayer::FindOrbitableObjects(const rstl::reserved_vector& const CFirstPersonCamera* fpCam = mgr.GetCameraManager()->GetFirstPersonCamera(); const zeus::CVector3f eyePos = GetEyePosition(); - for (const TUniqueId id : nearObjects) { + for (const auto& id : nearObjects) { if (const TCastToConstPtr act = mgr.GetObjectById(id)) { if (GetUniqueId() == act->GetUniqueId()) { continue; @@ -4576,7 +4576,7 @@ void CPlayer::AddOrbitDisableSource(CStateManager& mgr, TUniqueId addId) { return; } - for (const TUniqueId uid : x9e4_orbitDisableList) { + for (const auto& uid : x9e4_orbitDisableList) { if (uid == addId) { return; } diff --git a/Runtime/World/CScriptSpecialFunction.cpp b/Runtime/World/CScriptSpecialFunction.cpp index e648fd21a..c2ca954a0 100644 --- a/Runtime/World/CScriptSpecialFunction.cpp +++ b/Runtime/World/CScriptSpecialFunction.cpp @@ -835,7 +835,7 @@ void CScriptSpecialFunction::ThinkChaffTarget(float dt, CStateManager& mgr) { mgr.BuildNearList(nearList, box, CMaterialFilter::MakeInclude({EMaterialTypes::Projectile}), nullptr); CCameraFilterPassPoly& filter = mgr.GetCameraFilterPass(7); - for (const TUniqueId uid : nearList) { + for (const auto& uid : nearList) { if (const TCastToPtr proj = mgr.ObjectById(uid)) { if (proj->GetHomingTargetId() == GetUniqueId()) { proj->Set3d0_26(true); diff --git a/Runtime/World/CScriptSpiderBallWaypoint.cpp b/Runtime/World/CScriptSpiderBallWaypoint.cpp index b1a607f2c..8de35f469 100644 --- a/Runtime/World/CScriptSpiderBallWaypoint.cpp +++ b/Runtime/World/CScriptSpiderBallWaypoint.cpp @@ -61,7 +61,7 @@ void CScriptSpiderBallWaypoint::AddPreviousWaypoint(TUniqueId uid) { xec_waypoin TUniqueId CScriptSpiderBallWaypoint::PreviousWaypoint(const CStateManager& mgr, ECheckActiveWaypoint checkActive) const { - for (const TUniqueId id : xec_waypoints) { + for (const auto& id : xec_waypoints) { if (const CEntity* ent = mgr.GetObjectById(id)) { if (checkActive == ECheckActiveWaypoint::SkipCheck) { return id;