Refactoring and modernizing

src/common/Common.h

@@ -10,8 +10,8 @@
 // The following enumerations are structures to require their type be included.
 // They are also defined within the Core::Common namespace to avoid collisions.
 // +---------------------------------------------------------------------------
-namespace Core {
-namespace Common {
+namespace Core::Common
+{
 
   // 99 is the last spawn id that seems to spawn any actor
   const uint8_t MAX_DISPLAYED_ACTORS = 99;
@@ -731,9 +731,8 @@ enum SkillType :
     MountSkill = 0xD,
   };
 
-typedef std::vector< PlayerStateFlag > PlayerStateFlagList;
+  using PlayerStateFlagList = std::vector< PlayerStateFlag >;
 
-} /* Common */
-} /* Core */
+}
 
 #endif

src/common/Config/ConfigMgr.h

@@ -7,7 +7,8 @@
 #include <string>
 #include <stdint.h>
 
-namespace Core {
+namespace Core
+{
     class ConfigMgr
     {
     public:

src/common/Crypt/base64.h

@@ -1,10 +1,10 @@
 #include <string>
 
-namespace Core {
-namespace Util {
+namespace Core::Util
+{
   std::string base64_encode( uint8_t const*, uint32_t len );
 
-std::string base64_decode( std::string const& s );
-}
+  std::string base64_decode( const std::string& s );
 }
 
+

src/common/Crypt/md5.h

@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 
-namespace Core {
-namespace Util {
+namespace Core::Util
+{
   using md5_context = struct
   {
     uint32_t total[2];
@@ -45,7 +45,7 @@ static const char* val[] =
   };
 
 }
-}
+
 
 
 #endif /* md5.h */

src/common/Database/DbConnection.h

@@ -8,26 +8,20 @@
 #include <vector>
 #include "Util/LockedWaitQueue.h"
 
-namespace Mysql {
+namespace Mysql
+{
   class Connection;
-
   class ResultSet;
-
   class PreparedResultSet;
-
   class PreparedStatement;
 }
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
   class DatabaseWorker;
-
   class PreparedStatement;
-
   class Operation;
-
   class DbWorker;
-
   using PreparedStmtScopedPtr = std::unique_ptr< PreparedStatement >;
 
   enum ConnectionFlags
@@ -121,7 +115,5 @@ private:
   };
 
 }
-}
-
 
 #endif

src/common/Database/DbLoader.h

@@ -8,8 +8,8 @@
 #include <string>
 #include "DbConnection.h"
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
 
   template< class T >
   class DbWorkerPool;
@@ -46,6 +46,5 @@ private:
     std::stack< Closer > m_close;
   };
 }
-}
 
 #endif //SAPPHIRE_DBLOADER_H

src/common/Database/DbWorker.h

@@ -6,10 +6,9 @@
 #include "Util/LockedWaitQueue.h"
 #include <memory>
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
   class DbConnection;
-
   class Operation;
 
   class DbWorker
@@ -34,7 +33,5 @@ private:
     DbWorker& operator=( DbWorker const& right ) = delete;
   };
 }
-}
-
 
 #endif //SAPPHIRE_DBWORKER_H

src/common/Database/DbWorkerPool.h

@@ -8,8 +8,8 @@
 #include "Util/LockedWaitQueue.h"
 #include "DbConnection.h"
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
 
   template< typename T >
   class LockedWaitQueue;
@@ -90,7 +90,6 @@ private:
     uint8_t m_synchThreads;
   };
 
-}
 }
 
 #endif //SAPPHIRE_DBWORKERPOOL_H

src/common/Database/Operation.h

@@ -1,12 +1,13 @@
 #ifndef SAPPHIRE_OPERATION_H
 #define SAPPHIRE_OPERATION_H
 
-namespace Mysql {
+namespace Mysql
+{
   class Connection;
 }
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
   class DbConnection;
 
   class PreparedStatement;
@@ -43,9 +44,6 @@ private:
 
     Operation& operator=( Operation const& right ) = delete;
   };
-
-
-}
 }
 
 #endif //SAPPHIRE_OPERATION_H

src/common/Database/PreparedStatement.h

@@ -7,12 +7,13 @@
 #include <memory>
 #include "Operation.h"
 
-namespace Mysql {
+namespace Mysql
+{
   class PreparedStatement;
 }
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
   union PreparedStatementDataUnion
   {
     bool boolean;
@@ -83,9 +84,6 @@ protected:
 
     PreparedStatement& operator=( PreparedStatement const& right ) = delete;
   };
-
-
-}
 }
 
 

src/common/Database/StatementTask.h

@@ -5,8 +5,8 @@
 #include "Operation.h"
 #include <memory>
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
   class PreparedStatement;
 
   class StatementTask :
@@ -49,7 +49,6 @@ protected:
   };
 
 }
-}
 
 
 #endif //SAPPHIRE_STATEMENTTASK_H

src/common/Database/ZoneDbConnection.h

@@ -3,8 +3,8 @@
 
 #include "DbConnection.h"
 
-namespace Core {
-namespace Db {
+namespace Core::Db
+{
   class DbConnectionInfo;
 
   enum ZoneDbStatements : uint32_t
@@ -96,7 +96,6 @@ public:
 
   };
 
-}
 }
 
 #endif //SAPPHIRE_CHARACONNECTION_H

src/common/Exd/ExdDataGenerated.h

@@ -13,8 +13,8 @@
 #include <set>
 #include <variant>
 
-namespace Core {
-namespace Data {
+namespace Core::Data
+{
 
 class ExdDataGenerated;
 
@@ -8694,7 +8694,6 @@ const std::set< uint32_t >& getZoneSharedGroupIdList()
   };
 
 }
-}
 
 #endif
 

src/common/Forwards.h

@@ -3,31 +3,27 @@
 
 #include <memory>
 
-namespace Core {
+namespace Core
+{
 
   class ConfigMgr;
+  using ConfigMgrPtr = std::shared_ptr< ConfigMgr >;
 
-typedef std::shared_ptr< ConfigMgr > ConfigMgrPtr;
-
-
-namespace Network {
+  namespace Network
+  {
     class Hive;
-
     class Acceptor;
-
     class Connection;
+    using HivePtr = std::shared_ptr< Hive >;
+    using AcceptorPtr = std::shared_ptr< Acceptor >;
+    using ConnectionPtr = std::shared_ptr< Connection >;
 
-typedef std::shared_ptr< Hive > HivePtr;
-typedef std::shared_ptr< Acceptor > AcceptorPtr;
-typedef std::shared_ptr< Connection > ConnectionPtr;
-
-namespace Packets {
+    namespace Packets
+    {
       class GamePacket;
-
       class FFXIVPacketBase;
-
-typedef std::shared_ptr< GamePacket > GamePacketPtr;
-typedef std::shared_ptr< FFXIVPacketBase > FFXIVPacketBasePtr;
+      using GamePacketPtr = std::shared_ptr< GamePacket >;
+      using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
     }
 
   }

src/common/Framework.h

@@ -7,7 +7,8 @@
 #include <memory>
 #include <cassert>
 
-namespace Core {
+namespace Core
+{
 
   class Framework
   {

src/common/Logging/Logger.cpp

@@ -48,11 +48,6 @@ void Logger::init()
   spdlog::flush_on( spdlog::level::critical );
 }
 
-
-void Logger::Log( LoggingSeverity logSev, const std::string& text )
-{
-}
-
 void Logger::error( const std::string& text )
 {
   spdlog::get( "logger" )->error( text );

src/common/Logging/Logger.h

@@ -3,17 +3,8 @@
 
 #include <string>
 
-namespace Core {
-
-enum struct LoggingSeverity : uint8_t
+namespace Core
 {
-  trace = 0,
-  debug = 1,
-  info = 2,
-  warning = 3,
-  error = 4,
-  fatal = 5
-};
 
   class Logger
   {
@@ -28,8 +19,6 @@ public:
 
     void init();
 
-  void Log( LoggingSeverity logSev, const std::string& text );
-
     void error( const std::string& text );
 
     void info( const std::string& text );
@@ -42,7 +31,6 @@ public:
 
   };
 
-
 }
 
 

src/common/Network/Acceptor.h

@@ -13,8 +13,8 @@
 #include <vector>
 
 
-namespace Core {
-namespace Network {
+namespace Core::Network
+{
 
   class Connection;
 
@@ -82,6 +82,5 @@ public:
     void Stop();
   };
 
-}
 }
 #endif

src/common/Network/CommonNetwork.h

@@ -5,9 +5,8 @@
 #include <vector>
 #include "PacketDef/Ipcs.h"
 
-namespace Core {
-namespace Network {
-namespace Packets {
+namespace Core::Network::Packets
+{
 
   /**
   * Anticipated usage:
@@ -179,8 +178,6 @@ inline std::istream& operator>>( std::istream& is, FFXIVARR_IPC_HEADER& hdr )
     return is.read( reinterpret_cast< char* >( &hdr ), sizeof hdr );
   }
 
-} /* Packets */
-} /* Network */
-} /* Core */
+}
 
 #endif /*_CORE_NETWORK_PACKETS_COMMON_H*/

src/common/Network/Connection.h

@@ -12,9 +12,8 @@
 #include "Acceptor.h"
 #include <memory>
 
-namespace Core {
-namespace Network {
-//-----------------------------------------------------------------------------
+namespace Core::Network
+{
 
   class Hive;
 
@@ -161,8 +160,5 @@ std::shared_ptr< T > addServerToHive( const std::string& listenIp, uint32_t port
     }
   }
 
-}
-
-
 }
 #endif

src/common/Network/GamePacketNew.h

@@ -14,9 +14,8 @@
 #include "CommonNetwork.h"
 #include "PacketDef/Ipcs.h"
 
-namespace Core {
-namespace Network {
-namespace Packets {
+namespace Core::Network::Packets
+{
 
   // Must forward define these in order to enable the compiler to produce the
   // correct template functions.
@@ -332,8 +331,6 @@ protected:
   };
 
 
-} /* Packets */
-} /* Network */
-} /* Core */
+}
 
 #endif /*_CORE_NETWORK_PACKETS_CGAMEPACKETNEW_H*/

src/common/Network/GamePacketParser.h

@@ -3,9 +3,8 @@
 
 #include "CommonNetwork.h"
 
-namespace Core {
-namespace Network {
-namespace Packets {
+namespace Core::Network::Packets
+{
 
   enum PacketParseResult
   {
@@ -46,8 +45,5 @@ bool checkHeader( const FFXIVARR_PACKET_HEADER& header );
   bool checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header );
 
 }
-}
-}
-
 
 #endif

src/common/Network/Hive.h

@@ -5,8 +5,8 @@
 #include <atomic>
 #include <memory>
 
-namespace Core {
-namespace Network {
+namespace Core:: Network
+{
 
   class Hive : public std::enable_shared_from_this< Hive >
   {
@@ -51,6 +51,4 @@ public:
   };
 
 }
-}
-//-----------------------------------------------------------------------------
 #endif

src/common/Network/PacketContainer.h

@@ -8,11 +8,10 @@
 #include "GamePacketNew.h"
 #include "Forwards.h"
 
-namespace Core {
-namespace Network {
-namespace Packets {
+namespace Core::Network::Packets
+{
 
-typedef std::shared_ptr< FFXIVPacketBase > FFXIVPacketBasePtr;
+  using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
 
   class PacketContainer
   {
@@ -36,8 +35,6 @@ private:
 
   };
 
-}
-}
 }
 
 #endif

src/common/Util/LockedQueue.h

@@ -7,7 +7,8 @@
 #include <algorithm>
 #include <utility>
 
-namespace Core {
+namespace Core
+{
 
   template< class T >
   class LockedQueue

src/common/Util/LockedWaitQueue.h

@@ -8,7 +8,8 @@
 #include <type_traits>
 #include <utility>
 
-namespace Core {
+namespace Core
+{
 
   template< typename T >
   class LockedWaitQueue

src/common/Util/SpawnIndexAllocator.h

@@ -5,9 +5,11 @@
 #include <unordered_map>
 #include <type_traits>
 
-namespace Core {
-namespace Util {
+namespace Core::Util
+{
+
   template< typename T, typename ActorIdType = uint32_t >
+
   class SpawnIndexAllocator
   {
   public:
@@ -102,7 +104,5 @@ protected:
     bool m_reserveFirstSlot;
   };
 }
-}
-
 
 #endif //SAPPHIRE_SPAWNINDEXALLOCATOR_H

src/common/Util/Util.h

@@ -5,7 +5,8 @@
 #include <string>
 #include <functional>
 
-namespace Core::Util {
+namespace Core::Util
+{
 
   std::string binaryToHexString( uint8_t* pBinData, uint16_t size );
 

src/common/Util/UtilMath.h

@@ -5,9 +5,8 @@
 
 #define PI 3.14159265358979323846f
 
-namespace Core {
-namespace Math {
-namespace Util {
+namespace Core::Math::Util
+{
 
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
 
@@ -39,8 +38,6 @@ T clamp( T val, T minimum, T maximum )
     return val;
   }
 
-}
-}
 }
 
 #endif

src/common/Version.h

@@ -3,13 +3,10 @@
 
 #include <string>
 
-namespace Core {
-namespace Version {
-
+namespace Core::Version
+{
   extern const std::string GIT_HASH;
   extern const std::string VERSION;
-
-} /* Version */
-} /* Core */
+}
 
 #endif

src/servers/Scripts/CMakeLists.txt

@@ -56,7 +56,7 @@ foreach(_scriptDir ${children})
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
-        cotire("script_${_name}")
+        #cotire("script_${_name}")
 
         if(MSVC)
             add_custom_command(TARGET "script_${_name}" POST_BUILD

src/servers/Scripts/common/Aethernet.cpp

@@ -10,6 +10,8 @@
 #define AETHERYTE_MENU_FAVORITE_POINT 4
 #define AETHERYTE_MENU_FAVORITE_POINT_SECURITY_TOKEN 5
 
+using namespace Core;
+
 class Aethernet :
   public EventScript
 {

src/servers/Scripts/common/Aetheryte.cpp

@@ -12,6 +12,8 @@
 #define AETHERYTE_MENU_FAVORITE_POINT 4
 #define AETHERYTE_MENU_FAVORITE_POINT_SECURITY_TOKEN 5
 
+using namespace Core;
+
 class Aetheryte :
   public EventScript
 {

src/servers/Scripts/common/CmnDefCutSceneReplay.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefCutSceneReplay :
   public EventScript
 {

src/servers/Scripts/common/CmnDefHousingSignboard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefHousingSignboard :
   public EventScript
 {

src/servers/Scripts/common/CmnDefInnBed.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefInnBed :
   public EventScript
 {

src/servers/Scripts/common/CmnDefLinkShell.cpp

@@ -5,6 +5,8 @@
 #define ACTION_RENAME 3
 #define ACTION_REMOVE 4
 
+using namespace Core;
+
 class CmnDefLinkShell :
   public EventScript
 {

src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefMarketBoardGridania :
   public EventScript
 {

src/servers/Scripts/common/CmnDefMogLetter.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefMogLetter :
   public EventScript
 {

src/servers/Scripts/common/CmnDefNpcRepair.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefNpcRepair :
   public EventScript
 {

src/servers/Scripts/common/CmnDefWeatherForeCast.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class CmnDefWeatherForeCast :
   public EventScript
 {

src/servers/Scripts/common/ComDefMobHuntBoard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class ComDefMobHuntBoard :
   public EventScript
 {

src/servers/Scripts/common/GilShop.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class GilShop :
   public EventScript
 {

src/servers/Scripts/common/HouFurOrchestrion.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class HouFurOrchestrion :
   public EventScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors101110 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors110 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors111120 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors1120 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors121130 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors131140 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors141150 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors151160 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors161170 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors171180 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors181190 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors191200 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors2130 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors3140 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors4150 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors5160 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors6170 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors7180 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors8190 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ThePalaceoftheDeadFloors91100 :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/AlaMhigo.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class AlaMhigo :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class AmdaporKeep :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class AmdaporKeepHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class BaelsarsWall :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/BardamsMettle.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class BardamsMettle :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class BrayfloxsLongstop :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class BrayfloxsLongstopHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/CastrumAbania.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class CastrumAbania :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class CastrumMeridianum :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/CopperbellMines.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class CopperbellMines :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class CopperbellMinesHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/CuttersCry.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class CuttersCry :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/DomaCastle.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class DomaCastle :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class DzemaelDarkhold :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/Halatali.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class Halatali :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/HalataliHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class HalataliHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/HaukkeManor.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class HaukkeManor :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class HaukkeManorHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/HellsLid.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class HellsLid :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class HullbreakerIsle :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class HullbreakerIsleHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/KuganeCastle.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class KuganeCastle :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/Neverreap.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class Neverreap :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/PharosSirius.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class PharosSirius :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class PharosSiriusHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class SaintMociannesArboretum :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/Sastasha.cpp

@@ -2,6 +2,8 @@
 #include <Zone/InstanceContent.h>
 #include <Actor/Player.h>
 
+using namespace Core;
+
 class Sastasha :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/SastashaHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class SastashaHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class ShisuioftheVioletTides :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/Snowcloak.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class Snowcloak :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/SohmAl.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class SohmAl :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/SohmAlHard.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class SohmAlHard :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/SohrKhai.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class SohrKhai :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/TheAery.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class TheAery :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class TheAetherochemicalResearchFacility :
   public InstanceContentScript
 {

src/servers/Scripts/instances/dungeons/TheAntitower.cpp

@@ -1,6 +1,8 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
+using namespace Core;
+
 class TheAntitower :
   public InstanceContentScript
 {