From 5913be0a31205d60065ba1bac72bd4a88e3d7b9f Mon Sep 17 00:00:00 2001 From: Mordred Date: Fri, 8 Dec 2017 23:27:59 +0100 Subject: [PATCH] More include refactoring and space adjustments --- .../Server_Zone/Action/ActionCollision.cpp | 12 ++--- .../Server_Zone/Action/ActionCollision.h | 52 +++++++++---------- src/servers/Server_Zone/Actor/Actor.h | 2 +- .../PacketWrappers/ActorControlPacket142.h | 6 +-- .../PacketWrappers/ActorControlPacket143.h | 6 +-- .../PacketWrappers/ActorControlPacket144.h | 4 +- .../Network/PacketWrappers/ActorSpawnPacket.h | 8 +-- .../Network/PacketWrappers/ChatPacket.h | 6 +-- .../PacketWrappers/EventFinishPacket.h | 2 +- .../Network/PacketWrappers/EventPlayPacket.h | 4 +- .../Network/PacketWrappers/EventStartPacket.h | 4 +- .../Network/PacketWrappers/InitUIPacket.h | 8 +-- .../Network/PacketWrappers/ModelEquipPacket.h | 6 +-- .../Network/PacketWrappers/MoveActorPacket.h | 10 ++-- .../Network/PacketWrappers/PingPacket.h | 4 +- .../PacketWrappers/PlayerSpawnPacket.h | 16 +++--- .../PacketWrappers/PlayerStateFlagsPacket.h | 6 +-- .../PacketWrappers/QuestMessagePacket.h | 6 +-- .../PacketWrappers/ServerNoticePacket.h | 6 +-- .../PacketWrappers/UpdateHpMpTpPacket.h | 6 +-- src/servers/Server_Zone/Session.h | 3 -- .../Server_Zone/StatusEffect/StatusEffect.cpp | 14 ++--- .../Server_Zone/StatusEffect/StatusEffect.h | 2 +- 23 files changed, 94 insertions(+), 99 deletions(-) diff --git a/src/servers/Server_Zone/Action/ActionCollision.cpp b/src/servers/Server_Zone/Action/ActionCollision.cpp index 48b04aaa..6eb11182 100644 --- a/src/servers/Server_Zone/Action/ActionCollision.cpp +++ b/src/servers/Server_Zone/Action/ActionCollision.cpp @@ -17,7 +17,7 @@ using namespace Core::Common; bool ActionCollision::isActorApplicable( ActorPtr actorPtr, TargetFilter targetFilter ) { bool actorApplicable = false; - switch ( targetFilter ) + switch( targetFilter ) { case TargetFilter::All: { @@ -58,14 +58,14 @@ std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXI { std::set< ActorPtr > actorsCollided; - switch ( static_cast< ActionCollisionType >( actionInfo->aoe_type ) ) + switch( static_cast< ActionCollisionType >( actionInfo->aoe_type ) ) { case ActionCollisionType::None: case ActionCollisionType::SingleTarget: { // This is actually needed. There is "splash damage" in actions marked as single target. // Notice how we're using aoe_width. How collision works for SingleTarget is unknown as of now. - for ( auto pActor : actorsInRange ) + for( auto pActor : actorsInRange ) { // Make sure actor exists. If it doesn't we done goofed. assert( pActor ); @@ -85,7 +85,7 @@ std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXI } case ActionCollisionType::Circle: { - for ( auto pActor : actorsInRange ) + for( auto pActor : actorsInRange ) { assert( pActor ); @@ -93,15 +93,13 @@ std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXI continue; if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->aoe_range ) ) - { actorsCollided.insert( pActor ); - } } break; } case ActionCollisionType::Box: { - for ( auto pActor : actorsInRange ) + for( auto pActor : actorsInRange ) { assert( pActor ); diff --git a/src/servers/Server_Zone/Action/ActionCollision.h b/src/servers/Server_Zone/Action/ActionCollision.h index dda72d06..db3f7120 100644 --- a/src/servers/Server_Zone/Action/ActionCollision.h +++ b/src/servers/Server_Zone/Action/ActionCollision.h @@ -7,37 +7,37 @@ #include "Action.h" namespace Core { - namespace Entity { +namespace Entity { - enum class TargetFilter - { - All, // All actors in the AoE are applicable for collision - Players, // Only players - Allies, // Only allies (players, ally NPCs) - Party, // Only party members - Enemies // Only enemies - }; + enum class TargetFilter + { + All, // All actors in the AoE are applicable for collision + Players, // Only players + Allies, // Only allies (players, ally NPCs) + Party, // Only party members + Enemies // Only enemies + }; - class ActionCollision - { - public: + class ActionCollision + { + public: - static bool isActorApplicable( ActorPtr actorPtr, TargetFilter targetFilter ); - static std::set< ActorPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition, - std::set< ActorPtr > actorsInRange, - boost::shared_ptr< Data::ActionInfo > actionInfo, - TargetFilter targetFilter ); - - private: - static bool radiusCollision( Common::FFXIVARR_POSITION3 actorPosition, Common::FFXIVARR_POSITION3 aoePosition, - uint16_t radius ); + static bool isActorApplicable( ActorPtr actorPtr, TargetFilter targetFilter ); + static std::set< ActorPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition, + std::set< ActorPtr > actorsInRange, + boost::shared_ptr< Data::ActionInfo > actionInfo, + TargetFilter targetFilter ); - static bool boxCollision( Common::FFXIVARR_POSITION3 actorPosition, Common::FFXIVARR_POSITION3 aoePosition, - uint16_t width, uint16_t height ); - - }; + private: + static bool radiusCollision( Common::FFXIVARR_POSITION3 actorPosition, Common::FFXIVARR_POSITION3 aoePosition, + uint16_t radius ); - } + static bool boxCollision( Common::FFXIVARR_POSITION3 actorPosition, Common::FFXIVARR_POSITION3 aoePosition, + uint16_t width, uint16_t height ); + + }; + +} } #endif diff --git a/src/servers/Server_Zone/Actor/Actor.h b/src/servers/Server_Zone/Actor/Actor.h index 77e89afa..35547b01 100644 --- a/src/servers/Server_Zone/Actor/Actor.h +++ b/src/servers/Server_Zone/Actor/Actor.h @@ -1,7 +1,7 @@ #ifndef _ACTOR_H_ #define _ACTOR_H_ -#include +#include #include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h index 96066473..6a6ae79b 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h @@ -1,9 +1,9 @@ #ifndef _ACTORCONTROL142_H #define _ACTORCONTROL142_H -#include -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h index e501c34b..09dafb08 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h @@ -1,9 +1,9 @@ #ifndef _ACTORCONTROL143_H #define _ACTORCONTROL143_H -#include -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include "Forwards.h" namespace Core { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h index b6906727..ab5d3dad 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL144_H #define _ACTORCONTROL144_H -#include -#include +#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h index df39b4a6..bc52678e 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h @@ -1,10 +1,10 @@ #ifndef _ACTORSPAWN_H #define _ACTORSPAWN_H -#include -#include -#include "src/servers/Server_Zone/Actor/Player.h" -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include "Actor/Player.h" +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h index 1ffe2e75..1a99ed71 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h @@ -1,9 +1,9 @@ #ifndef _CHATPACKET_H #define _CHATPACKET_H -#include -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include "Forwards.h" namespace Core { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h index af8da192..6e55dc76 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTFINISH_H #define _EVENTFINISH_H -#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h index d748ec46..a3505fa2 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h @@ -1,8 +1,8 @@ #ifndef _EVENTPLAY_H #define _EVENTPLAY_H -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h index cec9260c..6872fa7d 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h @@ -1,8 +1,8 @@ #ifndef _EVENTSTART_H #define _EVENTSTART_H -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h index acf1826a..37244eb2 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h @@ -1,10 +1,10 @@ #ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H #define _CORE_NETWORK_PACKETS_INITUIPACKET_H -#include -#include -#include "Server_Zone/Actor/Player.h" -#include "Server_Zone/Forwards.h" +#include +#include +#include "Actor/Player.h" +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h index 087f03cf..88536c0d 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h @@ -1,9 +1,9 @@ #ifndef _MODELEQUIPPACKET_H #define _MODELEQUIPPACKET_H -#include -#include "src/servers/Server_Zone/Actor/Player.h" -#include "src/servers/Server_Zone/Forwards.h" +#include +#include "Actor/Player.h" +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h index 546e76b3..abc7f9d6 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h @@ -1,11 +1,11 @@ #ifndef _MOVEACTORPACKET_H #define _MOVEACTORPACKET_H -#include -#include -#include -#include "src/servers/Server_Zone/Actor/Player.h" -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include +#include "Actor/Player.h" +#include "Forwards.h" namespace Core { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h index 786c2312..8a3e1836 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h @@ -1,9 +1,9 @@ #ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H #define _CORE_NETWORK_PACKETS_PINGPACKET_H -#include +#include -#include "src/servers/Server_Zone/Forwards.h" +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h index a573fc4a..4ee95f5b 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h @@ -1,14 +1,14 @@ #ifndef _PLAYERSPAWN_H #define _PLAYERSPAWN_H -#include -#include -#include -#include "src/servers/Server_Zone/Actor/Player.h" -#include "src/servers/Server_Zone/Forwards.h" -#include "src/servers/Server_Zone/Inventory/Inventory.h" -#include "src/servers/Server_Zone/Inventory/Item.h" -#include "src/servers/Server_Zone/StatusEffect/StatusEffect.h" +#include +#include +#include +#include "Actor/Player.h" +#include "Forwards.h" +#include "Inventory/Inventory.h" +#include "Inventory/Item.h" +#include "StatusEffect/StatusEffect.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h index 716cae67..ac0c4826 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h @@ -1,9 +1,9 @@ #ifndef _PLAYERSTATE_H #define _PLAYERSTATE_H -#include -#include "src/servers/Server_Zone/Actor/Player.h" -#include "src/servers/Server_Zone/Forwards.h" +#include +#include "Actor/Player.h" +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h index 2c272237..1c846b11 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h @@ -1,9 +1,9 @@ #ifndef _QUESTMESSAGE_H #define _QUESTMESSAGE_H -#include -#include "src/servers/Server_Zone/Actor/Player.h" -#include "src/servers/Server_Zone/Forwards.h" +#include +#include "Actor/Player.h" +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h index 9f195144..07ec036e 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h @@ -1,9 +1,9 @@ #ifndef _SERVERNOTICEPACKET_H #define _SERVERNOTICEPACKET_H -#include -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h index 44c16260..927d968f 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h +++ b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h @@ -1,9 +1,9 @@ #ifndef _UPDATEHPMPTP_H #define _UPDATEHPMPTP_H -#include -#include -#include "src/servers/Server_Zone/Forwards.h" +#include +#include +#include "Forwards.h" namespace Core { namespace Network { diff --git a/src/servers/Server_Zone/Session.h b/src/servers/Server_Zone/Session.h index cd2a1c7f..7145c1e9 100644 --- a/src/servers/Server_Zone/Session.h +++ b/src/servers/Server_Zone/Session.h @@ -5,11 +5,8 @@ #include "Forwards.h" - - namespace Core { - class Session : public boost::enable_shared_from_this< Session > { public: diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp index b2885a82..6a4d439c 100644 --- a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp +++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp @@ -1,16 +1,16 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include "src/servers/Server_Zone/Actor/Actor.h" +#include "Actor/Actor.h" #include "StatusEffect.h" -#include "src/servers/Server_Zone/Script/ScriptManager.h" +#include "Script/ScriptManager.h" extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.h b/src/servers/Server_Zone/StatusEffect/StatusEffect.h index cda7c487..070bfb44 100644 --- a/src/servers/Server_Zone/StatusEffect/StatusEffect.h +++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.h @@ -3,7 +3,7 @@ #include -#include "src/servers/Server_Zone/Forwards.h" +#include "Forwards.h" namespace Core {