mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Code Activity

local var rename

Browse source
This commit is contained in:
collett 2020-01-05 21:31:54 +09:00
parent 5cbff4f12b
commit 4b89c45790
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/world/Action/Action.cpp
View file

@ -461,7 +461,7 @@ void Action::Action::buildEffects()
// when aoe, these effects are in the target whatever is hit first // when aoe, these effects are in the target whatever is hit first
bool shouldRestoreMP = true; bool shouldRestoreMP = true;
bool shouldShowComboEffect = true; bool shouldApplyComboSucceedEffect = true;
for( auto& actor : m_hitActors ) for( auto& actor : m_hitActors )
{ {
@ -473,10 +473,10 @@ void Action::Action::buildEffects()
if( dmg.first > 0 ) if( dmg.first > 0 )
actor->onActionHostile( m_pSource ); actor->onActionHostile( m_pSource );
if( isCorrectCombo() && shouldShowComboEffect ) if( isCorrectCombo() && shouldApplyComboSucceedEffect )
{ {
m_effectBuilder->comboSucceed( actor ); m_effectBuilder->comboSucceed( actor );
shouldShowComboEffect = false; shouldApplyComboSucceedEffect = false;
} }
if( !isComboAction() || isCorrectCombo() ) if( !isComboAction() || isCorrectCombo() )

2
src/world/Action/EffectBuilder.cpp
View file

@ -172,7 +172,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
break; break;
} }
} }
assert( effectPacket != nullptr ); assert( effectPacket );
pHeader->actionId = m_actionId; pHeader->actionId = m_actionId;
pHeader->actionAnimationId = static_cast< uint16_t >( m_actionId ); pHeader->actionAnimationId = static_cast< uint16_t >( m_actionId );