More include refactoring and space adjustments

2025-04-30 08:07:46 +00:00 · 2017-12-08 23:27:59 +01:00 · 2017-12-08 23:27:59 +01:00 · 5913be0a31
commit 5913be0a31
parent 381a793a19
23 changed files with 94 additions and 99 deletions
--- 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 );

--- 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
--- 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 <src/servers/Server_Common/Common.h>
+#include <Server_Common/Common.h>
 #include <boost/enable_shared_from_this.hpp>

 #include "Forwards.h"
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include "Forwards.h"


 namespace Core {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Util/UtilMath.h>
-#include "src/servers/Server_Zone/Actor/Player.h"
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Util/UtilMath.h>
+#include "Actor/Player.h"
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include "Forwards.h"


 namespace Core {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/GamePacketNew.h>

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include "Server_Zone/Actor/Player.h"
-#include "Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include "Actor/Player.h"
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include "src/servers/Server_Zone/Actor/Player.h"
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include "Actor/Player.h"
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <src/servers/Server_Common/Util/UtilMath.h>
-#include "src/servers/Server_Zone/Actor/Player.h"
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Server_Common/Util/UtilMath.h>
+#include "Actor/Player.h"
+#include "Forwards.h"


 namespace Core {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/GamePacketNew.h>

-#include "src/servers/Server_Zone/Forwards.h"
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Util/UtilMath.h>
-#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 <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Util/UtilMath.h>
+#include "Actor/Player.h"
+#include "Forwards.h"
+#include "Inventory/Inventory.h"
+#include "Inventory/Item.h"
+#include "StatusEffect/StatusEffect.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include "src/servers/Server_Zone/Actor/Player.h"
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include "Actor/Player.h"
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include "src/servers/Server_Zone/Actor/Player.h"
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include "Actor/Player.h"
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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 <src/servers/Server_Common/Network/GamePacketNew.h>
-#include <src/servers/Server_Zone/Actor/Actor.h>
-#include "src/servers/Server_Zone/Forwards.h"
+#include <Server_Common/Network/GamePacketNew.h>
+#include <Actor/Actor.h>
+#include "Forwards.h"

 namespace Core {
 namespace Network {
--- 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:
--- a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
@ -1,16 +1,16 @@
-#include <src/servers/Server_Common/Exd/ExdData.h>
-#include <src/servers/Server_Common/Util/Util.h>
-#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <src/servers/Server_Common/Logging/Logger.h>
-#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <Server_Common/Exd/ExdData.h>
+#include <Server_Common/Util/Util.h>
+#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Server_Common/Logging/Logger.h>
+#include <Server_Common/Exd/ExdData.h>

 #include <boost/algorithm/string.hpp>
 #include <algorithm>

-#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;
--- a/src/servers/Server_Zone/StatusEffect/StatusEffect.h
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.h
@ -3,7 +3,7 @@

 #include <boost/shared_ptr.hpp>

-#include "src/servers/Server_Zone/Forwards.h"
+#include "Forwards.h"

 namespace Core
 {