mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-27 11:57:45 +00:00
Code Activity

vs2019 really wants to add that space.

Browse source
This commit is contained in:
collett 2020-01-04 19:56:21 +09:00
parent 4623ed535a
commit 64f8be4512
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,12 +217,12 @@ bool Action::Action::update()
return true; return true;
} }
if ( m_pTarget == nullptr && m_targetId != 0 ) if( m_pTarget == nullptr && m_targetId != 0 )
{ {
// try to search for the target actor // try to search for the target actor
for( auto actor : m_pSource->getInRangeActors( true ) ) for( auto actor : m_pSource->getInRangeActors( true ) )
{ {
if ( actor->getId() == m_targetId ) if( actor->getId() == m_targetId )
{ {
m_pTarget = actor->getAsChara(); m_pTarget = actor->getAsChara();
break; break;
@ -230,9 +230,9 @@ bool Action::Action::update()
} }
} }
if ( m_pTarget != nullptr ) if( m_pTarget != nullptr )
{ {
if ( !m_pTarget->isAlive() ) if( !m_pTarget->isAlive() )
{ {
// interrupt the cast if target died // interrupt the cast if target died
setInterrupted( Common::ActionInterruptType::RegularInterrupt ); setInterrupted( Common::ActionInterruptType::RegularInterrupt );

4
src/world/Actor/Player.cpp
View file

@ -2151,7 +2151,7 @@ bool Sapphire::Entity::Player::checkAction()
if( m_pCurrentAction->update() ) if( m_pCurrentAction->update() )
{ {
if ( m_pCurrentAction->isInterrupted() && m_pCurrentAction->getInterruptType() != Common::ActionInterruptType::DamageInterrupt ) if( m_pCurrentAction->isInterrupted() && m_pCurrentAction->getInterruptType() != Common::ActionInterruptType::DamageInterrupt )
{ {
// we moved (or whatever not damage interrupt) so we don't want to execute queued cast // we moved (or whatever not damage interrupt) so we don't want to execute queued cast
m_pQueuedAction = nullptr; m_pQueuedAction = nullptr;
@ -2161,7 +2161,7 @@ bool Sapphire::Entity::Player::checkAction()
if( hasQueuedAction() ) if( hasQueuedAction() )
{ {
sendDebug( "Queued skill start: {0}", m_pQueuedAction->getId() ); sendDebug( "Queued skill start: {0}", m_pQueuedAction->getId() );
if ( m_pQueuedAction->hasCastTime() ) if( m_pQueuedAction->hasCastTime() )
{ {
setCurrentAction( m_pQueuedAction ); setCurrentAction( m_pQueuedAction );
} }

2
src/world/Manager/ActionMgr.cpp
View file

@ -87,7 +87,7 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
return; return;
} }
if ( player.getCurrentAction() ) if( player.getCurrentAction() )
{ {
player.sendDebug( "Skill queued: {0}", currentAction->getId() ); player.sendDebug( "Skill queued: {0}", currentAction->getId() );
player.setQueuedAction( currentAction ); player.setQueuedAction( currentAction );