From 0ac79362cd2ec9da15ffe34cc064cdea8aeb1198 Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Fri, 21 Jun 2024 11:31:58 +0200 Subject: [PATCH] Change size() > 0 checks to !empty() --- src/world/Action/Action.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 28e2267c..aefb889f 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -592,15 +592,13 @@ void Action::Action::buildActionResults() } // If we hit an enemy - if( m_hitActors.size() > 0 && getHitChara()->getObjKind() != m_pSource->getObjKind() ) + if( !m_hitActors.empty() && getHitChara()->getObjKind() != m_pSource->getObjKind() ) { m_pSource->removeStatusEffectByFlag( Common::StatusEffectFlag::RemoveOnSuccessfulHit ); } handleJobAction(); - - if( m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0 ) - handleStatusEffects(); + handleStatusEffects(); m_actionResultBuilder->sendActionResults( m_hitActors ); @@ -620,7 +618,7 @@ void Action::Action::handleStatusEffects() return; // handle caster statuses - if( m_lutEntry.statuses.caster.size() > 0 ) + if( !m_lutEntry.statuses.caster.empty() ) { for( auto& status : m_lutEntry.statuses.caster ) { @@ -629,7 +627,7 @@ void Action::Action::handleStatusEffects() } // handle hit actor statuses - if( m_lutEntry.statuses.target.size() > 0 && m_hitActors.size() > 0 ) + if( !m_lutEntry.statuses.target.empty() && !m_hitActors.empty() ) { for( auto& actor : m_hitActors ) { @@ -638,7 +636,7 @@ void Action::Action::handleStatusEffects() pActionBuilder->applyStatusEffect( actor, status.id, status.duration, 0, std::move( status.modifiers ), status.flag, true ); } - if( actor->getStatusEffectMap().size() > 0 ) + if( !actor->getStatusEffectMap().empty() ) actor->onActionHostile( m_pSource ); } }