From 4b89c457906b53a68dc006532fc96cb67d953195 Mon Sep 17 00:00:00 2001 From: collett Date: Sun, 5 Jan 2020 21:31:54 +0900 Subject: [PATCH] local var rename --- src/world/Action/Action.cpp | 6 +++--- src/world/Action/EffectBuilder.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 60900a53..20ce9ab8 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -461,7 +461,7 @@ void Action::Action::buildEffects() // when aoe, these effects are in the target whatever is hit first bool shouldRestoreMP = true; - bool shouldShowComboEffect = true; + bool shouldApplyComboSucceedEffect = true; for( auto& actor : m_hitActors ) { @@ -473,10 +473,10 @@ void Action::Action::buildEffects() if( dmg.first > 0 ) actor->onActionHostile( m_pSource ); - if( isCorrectCombo() && shouldShowComboEffect ) + if( isCorrectCombo() && shouldApplyComboSucceedEffect ) { m_effectBuilder->comboSucceed( actor ); - shouldShowComboEffect = false; + shouldApplyComboSucceedEffect = false; } if( !isComboAction() || isCorrectCombo() ) diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp index 3ab3e0dd..761af0e3 100644 --- a/src/world/Action/EffectBuilder.cpp +++ b/src/world/Action/EffectBuilder.cpp @@ -172,7 +172,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_ break; } } - assert( effectPacket != nullptr ); + assert( effectPacket ); pHeader->actionId = m_actionId; pHeader->actionAnimationId = static_cast< uint16_t >( m_actionId );