From 64f8be451252adfdfc2d61dc11c520f5ad3b7e65 Mon Sep 17 00:00:00 2001 From: collett Date: Sat, 4 Jan 2020 19:56:21 +0900 Subject: [PATCH] vs2019 really wants to add that space. --- src/world/Action/Action.cpp | 8 ++++---- src/world/Actor/Player.cpp | 4 ++-- src/world/Manager/ActionMgr.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index d4ef7850..698cc043 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -217,12 +217,12 @@ bool Action::Action::update() return true; } - if ( m_pTarget == nullptr && m_targetId != 0 ) + if( m_pTarget == nullptr && m_targetId != 0 ) { // try to search for the target actor for( auto actor : m_pSource->getInRangeActors( true ) ) { - if ( actor->getId() == m_targetId ) + if( actor->getId() == m_targetId ) { m_pTarget = actor->getAsChara(); 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 setInterrupted( Common::ActionInterruptType::RegularInterrupt ); diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index ec6877f0..4a6ab8d8 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -2151,7 +2151,7 @@ bool Sapphire::Entity::Player::checkAction() 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 m_pQueuedAction = nullptr; @@ -2161,7 +2161,7 @@ bool Sapphire::Entity::Player::checkAction() if( hasQueuedAction() ) { sendDebug( "Queued skill start: {0}", m_pQueuedAction->getId() ); - if ( m_pQueuedAction->hasCastTime() ) + if( m_pQueuedAction->hasCastTime() ) { setCurrentAction( m_pQueuedAction ); } diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp index 878b27aa..ba2be044 100644 --- a/src/world/Manager/ActionMgr.cpp +++ b/src/world/Manager/ActionMgr.cpp @@ -87,7 +87,7 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player, return; } - if ( player.getCurrentAction() ) + if( player.getCurrentAction() ) { player.sendDebug( "Skill queued: {0}", currentAction->getId() ); player.setQueuedAction( currentAction );