mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Code Activity

No more namespace Core, renamed to Sapphire

Browse source
This commit is contained in:
Mordred 2018-11-29 16:55:48 +01:00
parent 2c69d7a22e
commit 2d1a70a4ce
551 changed files with 3180 additions and 3180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/Common.h
View file

@ -8,9 +8,9 @@
// +---------------------------------------------------------------------------
// The following enumerations are structures to require their type be included.
// They are also defined within the Core::Common namespace to avoid collisions.
// They are also defined within the Sapphire::Common namespace to avoid collisions.
// +---------------------------------------------------------------------------
namespace Core::Common
namespace Sapphire::Common
{
// 99 is the last spawn id that seems to spawn any actor

2
src/common/CommonGen.cpp
View file

@ -2,7 +2,7 @@
#include <stdint.h>
namespace Core {
namespace Sapphire {
namespace Common {
bool operator==( const ActionCategory& t, const uint8_t& g )

2
src/common/CommonGen.h
View file

@ -6,7 +6,7 @@
/* This file has been automatically generated.
Changes will be lost upon regeneration.
To change the content edit tools/exd_common_gen */
namespace Core {
namespace Sapphire {
namespace Common {
///////////////////////////////////////////////////////////

4
src/common/Config/ConfigMgr.cpp
View file

@ -10,7 +10,7 @@ namespace fs = std::experimental::filesystem;
* @param configName the name of ini file relative to m_configFolderRoot to load alongside global.ini
* @return true if loading was successful
*/
bool Core::ConfigMgr::loadConfig( const std::string& configName )
bool Sapphire::ConfigMgr::loadConfig( const std::string& configName )
{
// get global config
auto configFile = fs::path( fs::path( m_configFolderRoot ) / configName );
@ -29,7 +29,7 @@ bool Core::ConfigMgr::loadConfig( const std::string& configName )
return true;
}
bool Core::ConfigMgr::copyDefaultConfig( const std::string& configName )
bool Sapphire::ConfigMgr::copyDefaultConfig( const std::string& configName )
{
fs::path configPath( m_configFolderRoot );
configPath /= configName;

2
src/common/Config/ConfigMgr.h
View file

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

4
src/common/Crypt/base64.cpp
View file

@ -39,7 +39,7 @@ static inline bool is_base64( uint8_t c )
return ( isalnum( c ) || ( c == '+' ) || ( c == '/' ) );
}
std::string Core::Util::base64_encode( uint8_t const* bytes_to_encode, uint32_t in_len )
std::string Sapphire::Util::base64_encode( uint8_t const* bytes_to_encode, uint32_t in_len )
{
std::string ret;
int32_t i = 0;
@ -85,7 +85,7 @@ std::string Core::Util::base64_encode( uint8_t const* bytes_to_encode, uint32_t
}
std::string Core::Util::base64_decode( std::string const& encoded_string )
std::string Sapphire::Util::base64_decode( std::string const& encoded_string )
{
int32_t in_len = encoded_string.size();
int32_t i = 0;

2
src/common/Crypt/base64.h
View file

@ -1,6 +1,6 @@
#include <string>
namespace Core::Util
namespace Sapphire::Util
{
std::string base64_encode( uint8_t const*, uint32_t len );

10
src/common/Crypt/md5.cpp
View file

@ -37,7 +37,7 @@
(b)[(i) + 3] = (uint8_t) ( (n) >> 24 ); \
}
void Core::Util::md5_starts( md5_context* ctx )
void Sapphire::Util::md5_starts( md5_context* ctx )
{
ctx->total[ 0 ] = 0;
ctx->total[ 1 ] = 0;
@ -48,7 +48,7 @@ void Core::Util::md5_starts( md5_context* ctx )
ctx->state[ 3 ] = 0x10325476;
}
void md5_process( Core::Util::md5_context* ctx, uint8_t data[64] )
void md5_process( Sapphire::Util::md5_context* ctx, uint8_t data[64] )
{
uint32_t X[16], A, B, C, D;
@ -171,7 +171,7 @@ void md5_process( Core::Util::md5_context* ctx, uint8_t data[64] )
ctx->state[ 3 ] += D;
}
void Core::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length )
void Sapphire::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length )
{
uint32_t left, fill;
@ -219,7 +219,7 @@ static uint8_t md5_padding[64] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
void Core::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
void Sapphire::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
{
uint32_t last, padn;
uint32_t high, low;
@ -248,7 +248,7 @@ void Core::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
* those are the standard RFC 1321 test vectors
*/
void Core::Util::md5( uint8_t* text, uint8_t* hash, int32_t size )
void Sapphire::Util::md5( uint8_t* text, uint8_t* hash, int32_t size )
{
md5_context ctx;
md5_starts( &ctx );

2
src/common/Crypt/md5.h
View file

@ -3,7 +3,7 @@
#include <stdint.h>
namespace Core::Util
namespace Sapphire::Util
{
using md5_context = struct
{

2
src/common/Database/DatabaseDef.h
View file

@ -7,6 +7,6 @@
#include "Database/DbWorkerPool.h"
#include "Database/PreparedStatement.h"
extern Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection > g_charaDb;
extern Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
#endif

42
src/common/Database/DbConnection.cpp
View file

@ -6,9 +6,9 @@
#include "PreparedStatement.h"
#include "Framework.h"
extern Core::Framework g_fw;
extern Sapphire::Framework g_fw;
Core::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
Sapphire::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
m_reconnecting( false ),
m_prepareError( false ),
m_queue( nullptr ),
@ -19,8 +19,8 @@ Core::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
}
Core::Db::DbConnection::DbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
Core::Db::ConnectionInfo& connInfo ) :
Sapphire::Db::DbConnection::DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
Sapphire::Db::ConnectionInfo& connInfo ) :
m_reconnecting( false ),
m_prepareError( false ),
m_queue( queue ),
@ -31,12 +31,12 @@ Core::Db::DbConnection::DbConnection( Core::LockedWaitQueue< std::shared_ptr< Op
m_worker = std::make_shared< DbWorker >( m_queue, this );
}
Core::Db::DbConnection::~DbConnection()
Sapphire::Db::DbConnection::~DbConnection()
{
close();
}
void Core::Db::DbConnection::close()
void Sapphire::Db::DbConnection::close()
{
m_worker.reset();
m_stmts.clear();
@ -50,7 +50,7 @@ void Core::Db::DbConnection::close()
}
uint32_t Core::Db::DbConnection::open()
uint32_t Sapphire::Db::DbConnection::open()
{
std::shared_ptr< Mysql::MySqlBase > base( new Mysql::MySqlBase() );
Mysql::optionMap options;
@ -73,42 +73,42 @@ uint32_t Core::Db::DbConnection::open()
return 0;
}
uint32_t Core::Db::DbConnection::getLastError()
uint32_t Sapphire::Db::DbConnection::getLastError()
{
return m_pConnection->getErrorNo();
}
bool Core::Db::DbConnection::ping()
bool Sapphire::Db::DbConnection::ping()
{
return m_pConnection->ping();
}
bool Core::Db::DbConnection::lockIfReady()
bool Sapphire::Db::DbConnection::lockIfReady()
{
return m_mutex.try_lock();
}
void Core::Db::DbConnection::unlock()
void Sapphire::Db::DbConnection::unlock()
{
m_mutex.unlock();
}
void Core::Db::DbConnection::beginTransaction()
void Sapphire::Db::DbConnection::beginTransaction()
{
m_pConnection->beginTransaction();
}
void Core::Db::DbConnection::rollbackTransaction()
void Sapphire::Db::DbConnection::rollbackTransaction()
{
m_pConnection->rollbackTransaction();
}
void Core::Db::DbConnection::commitTransaction()
void Sapphire::Db::DbConnection::commitTransaction()
{
m_pConnection->commitTransaction();
}
bool Core::Db::DbConnection::execute( const std::string& sql )
bool Sapphire::Db::DbConnection::execute( const std::string& sql )
{
try
{
@ -123,7 +123,7 @@ bool Core::Db::DbConnection::execute( const std::string& sql )
}
}
std::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( const std::string& sql )
std::shared_ptr< Mysql::ResultSet > Sapphire::Db::DbConnection::query( const std::string& sql )
{
try
{
@ -140,7 +140,7 @@ std::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( const std::st
std::shared_ptr< Mysql::ResultSet >
Core::Db::DbConnection::query( std::shared_ptr< Core::Db::PreparedStatement > stmt )
Sapphire::Db::DbConnection::query( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt )
{
std::shared_ptr< Mysql::ResultSet > res( nullptr );
if( !stmt )
@ -176,7 +176,7 @@ Core::Db::DbConnection::query( std::shared_ptr< Core::Db::PreparedStatement > st
}
bool Core::Db::DbConnection::execute( std::shared_ptr< Core::Db::PreparedStatement > stmt )
bool Sapphire::Db::DbConnection::execute( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt )
{
if( !stmt )
return false;
@ -201,7 +201,7 @@ bool Core::Db::DbConnection::execute( std::shared_ptr< Core::Db::PreparedStateme
}
}
std::shared_ptr< Mysql::PreparedStatement > Core::Db::DbConnection::getPreparedStatement( uint32_t index )
std::shared_ptr< Mysql::PreparedStatement > Sapphire::Db::DbConnection::getPreparedStatement( uint32_t index )
{
assert( index < m_stmts.size() );
auto ret = m_stmts[ index ];
@ -211,7 +211,7 @@ std::shared_ptr< Mysql::PreparedStatement > Core::Db::DbConnection::getPreparedS
return ret;
}
void Core::Db::DbConnection::prepareStatement( uint32_t index, const std::string& sql, Core::Db::ConnectionFlags flags )
void Sapphire::Db::DbConnection::prepareStatement( uint32_t index, const std::string& sql, Sapphire::Db::ConnectionFlags flags )
{
m_queries.insert( PreparedStatementMap::value_type( index, std::make_pair( sql, flags ) ) );
@ -240,7 +240,7 @@ void Core::Db::DbConnection::prepareStatement( uint32_t index, const std::string
}
bool Core::Db::DbConnection::prepareStatements()
bool Sapphire::Db::DbConnection::prepareStatements()
{
doPrepareStatements();
return !m_prepareError;

4
src/common/Database/DbConnection.h
View file

@ -16,7 +16,7 @@ namespace Mysql
class PreparedStatement;
}
namespace Core::Db
namespace Sapphire::Db
{
class DatabaseWorker;
class PreparedStatement;
@ -52,7 +52,7 @@ namespace Core::Db
DbConnection( ConnectionInfo& connInfo );
// Constructor for asynchronous connections.
DbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo );
DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo );
virtual ~DbConnection();

18
src/common/Database/DbLoader.cpp
View file

@ -5,14 +5,14 @@
#include "Logging/Logger.h"
#include "Framework.h"
extern Core::Framework g_fw;
extern Sapphire::Framework g_fw;
Core::Db::DbLoader::DbLoader()
Sapphire::Db::DbLoader::DbLoader()
{
}
template< class T >
Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool, const ConnectionInfo& info )
Sapphire::Db::DbLoader& Sapphire::Db::DbLoader::addDb( Sapphire::Db::DbWorkerPool< T >& pool, const ConnectionInfo& info )
{
m_open.push( [ this, info, &pool ]()->bool
@ -65,7 +65,7 @@ Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool
return *this;
}
bool Core::Db::DbLoader::initDbs()
bool Sapphire::Db::DbLoader::initDbs()
{
if( !openDatabases() )
return false;
@ -76,17 +76,17 @@ bool Core::Db::DbLoader::initDbs()
return true;
}
bool Core::Db::DbLoader::openDatabases()
bool Sapphire::Db::DbLoader::openDatabases()
{
return process( m_open );
}
bool Core::Db::DbLoader::prepareStatements()
bool Sapphire::Db::DbLoader::prepareStatements()
{
return process( m_prepare );
}
bool Core::Db::DbLoader::process( std::queue< Predicate >& queue )
bool Sapphire::Db::DbLoader::process( std::queue< Predicate >& queue )
{
while( !queue.empty() )
{
@ -108,7 +108,7 @@ bool Core::Db::DbLoader::process( std::queue< Predicate >& queue )
}
template
Core::Db::DbLoader&
Core::Db::DbLoader::addDb< Core::Db::ZoneDbConnection >( Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection >&,
Sapphire::Db::DbLoader&
Sapphire::Db::DbLoader::addDb< Sapphire::Db::ZoneDbConnection >( Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection >&,
const ConnectionInfo& );

2
src/common/Database/DbLoader.h
View file

@ -8,7 +8,7 @@
#include <string>
#include "DbConnection.h"
namespace Core::Db
namespace Sapphire::Db
{
template< class T >

6
src/common/Database/DbWorker.cpp
View file

@ -2,7 +2,7 @@
#include "Operation.h"
#include "Util/LockedWaitQueue.h"
Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
Sapphire::Db::DbWorker::DbWorker( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
{
m_pConn = pConn;
m_queue = newQueue;
@ -10,14 +10,14 @@ Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< std::shared_ptr< Operation
m_workerThread = std::thread( &DbWorker::workerThread, this );
}
Core::Db::DbWorker::~DbWorker()
Sapphire::Db::DbWorker::~DbWorker()
{
m_cancelationToken = true;
m_queue->cancel();
m_workerThread.join();
}
void Core::Db::DbWorker::workerThread()
void Sapphire::Db::DbWorker::workerThread()
{
if( !m_queue )
return;

2
src/common/Database/DbWorker.h
View file

@ -6,7 +6,7 @@
#include "Util/LockedWaitQueue.h"
#include <memory>
namespace Core::Db
namespace Sapphire::Db
{
class DbConnection;
class Operation;

50
src/common/Database/DbWorkerPool.cpp
View file

@ -10,10 +10,10 @@
#include "Logging/Logger.h"
#include <mysql.h>
extern Core::Framework g_fw;
extern Sapphire::Framework g_fw;
class PingOperation :
public Core::Db::Operation
public Sapphire::Db::Operation
{
bool execute() override
{
@ -23,22 +23,22 @@ class PingOperation :
};
template< class T >
Core::Db::DbWorkerPool< T >::DbWorkerPool()
Sapphire::Db::DbWorkerPool< T >::DbWorkerPool()
:
m_queue( new Core::LockedWaitQueue< std::shared_ptr< Operation > >() ),
m_queue( new Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >() ),
m_asyncThreads( 0 ),
m_synchThreads( 0 )
{
}
template< class T >
Core::Db::DbWorkerPool< T >::~DbWorkerPool()
Sapphire::Db::DbWorkerPool< T >::~DbWorkerPool()
{
m_queue->cancel();
}
template< class T >
void Core::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info,
void Sapphire::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info,
uint8_t asyncThreads,
uint8_t synchThreads )
{
@ -48,7 +48,7 @@ void Core::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info,
}
template< class T >
uint32_t Core::Db::DbWorkerPool< T >::open()
uint32_t Sapphire::Db::DbWorkerPool< T >::open()
{
auto pLog = g_fw.get< Logger >();
pLog->info( "[DbPool] Opening DatabasePool " + getDatabaseName() +
@ -73,7 +73,7 @@ uint32_t Core::Db::DbWorkerPool< T >::open()
}
template< class T >
void Core::Db::DbWorkerPool< T >::close()
void Sapphire::Db::DbWorkerPool< T >::close()
{
auto pLog = g_fw.get< Logger >();
pLog->info( "[DbPool] Closing down DatabasePool " + getDatabaseName() );
@ -83,7 +83,7 @@ void Core::Db::DbWorkerPool< T >::close()
}
template< class T >
bool Core::Db::DbWorkerPool< T >::prepareStatements()
bool Sapphire::Db::DbWorkerPool< T >::prepareStatements()
{
for( auto& connections : m_connections )
for( auto& connection : connections )
@ -104,7 +104,7 @@ bool Core::Db::DbWorkerPool< T >::prepareStatements()
template< class T >
std::shared_ptr< Mysql::ResultSet >
Core::Db::DbWorkerPool< T >::query( const std::string& sql, std::shared_ptr< T > connection )
Sapphire::Db::DbWorkerPool< T >::query( const std::string& sql, std::shared_ptr< T > connection )
{
if( !connection )
connection = getFreeConnection();
@ -117,7 +117,7 @@ Core::Db::DbWorkerPool< T >::query( const std::string& sql, std::shared_ptr< T >
template< class T >
std::shared_ptr< Mysql::PreparedResultSet >
Core::Db::DbWorkerPool< T >::query( std::shared_ptr< PreparedStatement > stmt )
Sapphire::Db::DbWorkerPool< T >::query( std::shared_ptr< PreparedStatement > stmt )
{
auto connection = getFreeConnection();
auto ret = std::static_pointer_cast< Mysql::PreparedResultSet >( connection->query( stmt ) );
@ -127,14 +127,14 @@ Core::Db::DbWorkerPool< T >::query( std::shared_ptr< PreparedStatement > stmt )
}
template< class T >
std::shared_ptr< Core::Db::PreparedStatement >
Core::Db::DbWorkerPool< T >::getPreparedStatement( PreparedStatementIndex index )
std::shared_ptr< Sapphire::Db::PreparedStatement >
Sapphire::Db::DbWorkerPool< T >::getPreparedStatement( PreparedStatementIndex index )
{
return std::make_shared< PreparedStatement >( index );
}
template< class T >
void Core::Db::DbWorkerPool< T >::escapeString( std::string& str )
void Sapphire::Db::DbWorkerPool< T >::escapeString( std::string& str )
{
if( str.empty() )
return;
@ -146,7 +146,7 @@ void Core::Db::DbWorkerPool< T >::escapeString( std::string& str )
}
template< class T >
void Core::Db::DbWorkerPool< T >::keepAlive()
void Sapphire::Db::DbWorkerPool< T >::keepAlive()
{
for( auto& connection : m_connections[ IDX_SYNCH ] )
{
@ -163,7 +163,7 @@ void Core::Db::DbWorkerPool< T >::keepAlive()
}
template< class T >
uint32_t Core::Db::DbWorkerPool< T >::openConnections( InternalIndex type, uint8_t numConnections )
uint32_t Sapphire::Db::DbWorkerPool< T >::openConnections( InternalIndex type, uint8_t numConnections )
{
for( uint8_t i = 0; i < numConnections; ++i )
{
@ -194,7 +194,7 @@ uint32_t Core::Db::DbWorkerPool< T >::openConnections( InternalIndex type, uint8
}
template< class T >
unsigned long Core::Db::DbWorkerPool< T >::escapeString( char* to, const char* from, unsigned long length )
unsigned long Sapphire::Db::DbWorkerPool< T >::escapeString( char* to, const char* from, unsigned long length )
{
if( !to || !from || !length )
return 0;
@ -204,13 +204,13 @@ unsigned long Core::Db::DbWorkerPool< T >::escapeString( char* to, const char* f
}
template< class T >
void Core::Db::DbWorkerPool< T >::enqueue( std::shared_ptr< Operation > op )
void Sapphire::Db::DbWorkerPool< T >::enqueue( std::shared_ptr< Operation > op )
{
m_queue->push( op );
}
template< class T >
std::shared_ptr< T > Core::Db::DbWorkerPool< T >::getFreeConnection()
std::shared_ptr< T > Sapphire::Db::DbWorkerPool< T >::getFreeConnection()
{
uint8_t i = 0;
const auto numCons = m_connections[ IDX_SYNCH ].size();
@ -228,27 +228,27 @@ std::shared_ptr< T > Core::Db::DbWorkerPool< T >::getFreeConnection()
}
template< class T >
const std::string& Core::Db::DbWorkerPool< T >::getDatabaseName() const
const std::string& Sapphire::Db::DbWorkerPool< T >::getDatabaseName() const
{
return m_connectionInfo.database;
}
template< class T >
void Core::Db::DbWorkerPool< T >::execute( const std::string& sql )
void Sapphire::Db::DbWorkerPool< T >::execute( const std::string& sql )
{
auto task = std::make_shared< StatementTask >( sql );
enqueue( task );
}
template< class T >
void Core::Db::DbWorkerPool< T >::execute( std::shared_ptr< PreparedStatement > stmt )
void Sapphire::Db::DbWorkerPool< T >::execute( std::shared_ptr< PreparedStatement > stmt )
{
auto task = std::make_shared< PreparedStatementTask >( stmt );
enqueue( task );
}
template< class T >
void Core::Db::DbWorkerPool< T >::directExecute( const std::string& sql )
void Sapphire::Db::DbWorkerPool< T >::directExecute( const std::string& sql )
{
auto connection = getFreeConnection();
connection->execute( sql );
@ -256,7 +256,7 @@ void Core::Db::DbWorkerPool< T >::directExecute( const std::string& sql )
}
template< class T >
void Core::Db::DbWorkerPool< T >::directExecute( std::shared_ptr< PreparedStatement > stmt )
void Sapphire::Db::DbWorkerPool< T >::directExecute( std::shared_ptr< PreparedStatement > stmt )
{
auto connection = getFreeConnection();
connection->execute( stmt );
@ -284,4 +284,4 @@ void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedState
*/
template
class Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection >;
class Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection >;

4
src/common/Database/DbWorkerPool.h
View file

@ -8,7 +8,7 @@
#include "Util/LockedWaitQueue.h"
#include "DbConnection.h"
namespace Core::Db
namespace Sapphire::Db
{
template< typename T >
@ -83,7 +83,7 @@ namespace Core::Db
const std::string& getDatabaseName() const;
std::unique_ptr< Core::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue;
std::unique_ptr< Sapphire::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue;
std::array< std::vector< std::shared_ptr< T > >, IDX_SIZE > m_connections;
ConnectionInfo m_connectionInfo;
uint8_t m_asyncThreads;

2
src/common/Database/Operation.h
View file

@ -6,7 +6,7 @@ namespace Mysql
class Connection;
}
namespace Core::Db
namespace Sapphire::Db
{
class DbConnection;

28
src/common/Database/PreparedStatement.cpp
View file

@ -7,17 +7,17 @@
#include <sstream>
#include <cassert>
Core::Db::PreparedStatement::PreparedStatement( uint32_t index ) :
Sapphire::Db::PreparedStatement::PreparedStatement( uint32_t index ) :
m_stmt( nullptr ),
m_index( index )
{
}
Core::Db::PreparedStatement::~PreparedStatement()
Sapphire::Db::PreparedStatement::~PreparedStatement()
{
}
void Core::Db::PreparedStatement::bindParameters()
void Sapphire::Db::PreparedStatement::bindParameters()
{
assert( m_stmt );
@ -65,7 +65,7 @@ void Core::Db::PreparedStatement::bindParameters()
}
//- Bind to buffer
void Core::Db::PreparedStatement::setBool( uint8_t index, const bool value )
void Sapphire::Db::PreparedStatement::setBool( uint8_t index, const bool value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -74,7 +74,7 @@ void Core::Db::PreparedStatement::setBool( uint8_t index, const bool value )
m_statementData[ index ].type = TYPE_BOOL;
}
void Core::Db::PreparedStatement::setUInt( uint8_t index, uint32_t value )
void Sapphire::Db::PreparedStatement::setUInt( uint8_t index, uint32_t value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -83,7 +83,7 @@ void Core::Db::PreparedStatement::setUInt( uint8_t index, uint32_t value )
m_statementData[ index ].type = TYPE_UI;
}
void Core::Db::PreparedStatement::setUInt64( uint8_t index, uint64_t value )
void Sapphire::Db::PreparedStatement::setUInt64( uint8_t index, uint64_t value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -92,7 +92,7 @@ void Core::Db::PreparedStatement::setUInt64( uint8_t index, uint64_t value )
m_statementData[ index ].type = TYPE_UI64;
}
void Core::Db::PreparedStatement::setInt( uint8_t index, int32_t value )
void Sapphire::Db::PreparedStatement::setInt( uint8_t index, int32_t value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -101,7 +101,7 @@ void Core::Db::PreparedStatement::setInt( uint8_t index, int32_t value )
m_statementData[ index ].type = TYPE_I;
}
void Core::Db::PreparedStatement::setInt64( uint8_t index, int64_t value )
void Sapphire::Db::PreparedStatement::setInt64( uint8_t index, int64_t value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -110,7 +110,7 @@ void Core::Db::PreparedStatement::setInt64( uint8_t index, int64_t value )
m_statementData[ index ].type = TYPE_I64;
}
void Core::Db::PreparedStatement::setDouble( uint8_t index, double value )
void Sapphire::Db::PreparedStatement::setDouble( uint8_t index, double value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -119,7 +119,7 @@ void Core::Db::PreparedStatement::setDouble( uint8_t index, double value )
m_statementData[ index ].type = TYPE_DOUBLE;
}
void Core::Db::PreparedStatement::setString( uint8_t index, const std::string& value )
void Sapphire::Db::PreparedStatement::setString( uint8_t index, const std::string& value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -129,7 +129,7 @@ void Core::Db::PreparedStatement::setString( uint8_t index, const std::string& v
m_statementData[ index ].type = TYPE_STRING;
}
void Core::Db::PreparedStatement::setBinary( uint8_t index, const std::vector< uint8_t >& value )
void Sapphire::Db::PreparedStatement::setBinary( uint8_t index, const std::vector< uint8_t >& value )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -138,7 +138,7 @@ void Core::Db::PreparedStatement::setBinary( uint8_t index, const std::vector< u
m_statementData[ index ].type = TYPE_BINARY;
}
void Core::Db::PreparedStatement::setNull( uint8_t index )
void Sapphire::Db::PreparedStatement::setNull( uint8_t index )
{
if( index >= m_statementData.size() )
m_statementData.resize( index + 1 );
@ -146,12 +146,12 @@ void Core::Db::PreparedStatement::setNull( uint8_t index )
m_statementData[ index ].type = TYPE_NULL;
}
uint32_t Core::Db::PreparedStatement::getIndex() const
uint32_t Sapphire::Db::PreparedStatement::getIndex() const
{
return m_index;
}
void Core::Db::PreparedStatement::setMysqlPS( std::shared_ptr< Mysql::PreparedStatement > pStmt )
void Sapphire::Db::PreparedStatement::setMysqlPS( std::shared_ptr< Mysql::PreparedStatement > pStmt )
{
m_stmt = pStmt;
}

2
src/common/Database/PreparedStatement.h
View file

@ -12,7 +12,7 @@ namespace Mysql
class PreparedStatement;
}
namespace Core::Db
namespace Sapphire::Db
{
union PreparedStatementDataUnion
{

12
src/common/Database/StatementTask.cpp
View file

@ -4,7 +4,7 @@
#include "DbConnection.h"
#include "PreparedStatement.h"
Core::Db::StatementTask::StatementTask( const std::string& sql, bool async )
Sapphire::Db::StatementTask::StatementTask( const std::string& sql, bool async )
{
m_sql = sql;
m_hasResult = async; // If the operation is async, then there's a result
@ -12,13 +12,13 @@ Core::Db::StatementTask::StatementTask( const std::string& sql, bool async )
// m_result = new QueryResultPromise();
}
Core::Db::StatementTask::~StatementTask()
Sapphire::Db::StatementTask::~StatementTask()
{
//if( m_hasResult && m_result != nullptr)
// delete m_result;
}
bool Core::Db::StatementTask::execute()
bool Sapphire::Db::StatementTask::execute()
{
if( m_hasResult )
{
@ -38,7 +38,7 @@ bool Core::Db::StatementTask::execute()
}
Core::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Core::Db::PreparedStatement > stmt,
Sapphire::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt,
bool async ) :
m_stmt( stmt )
//, m_result(nullptr)
@ -46,13 +46,13 @@ Core::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Core::D
m_hasResult = async; // If the operation is async, then there's a result
}
Core::Db::PreparedStatementTask::~PreparedStatementTask()
Sapphire::Db::PreparedStatementTask::~PreparedStatementTask()
{
//if (m_has_result && m_result != nullptr)
// delete m_result;
}
bool Core::Db::PreparedStatementTask::execute()
bool Sapphire::Db::PreparedStatementTask::execute()
{
//if (m_has_result)
//{

2
src/common/Database/StatementTask.h
View file

@ -5,7 +5,7 @@
#include "Operation.h"
#include <memory>
namespace Core::Db
namespace Sapphire::Db
{
class PreparedStatement;

8
src/common/Database/ZoneDbConnection.cpp
View file

@ -1,22 +1,22 @@
#include "ZoneDbConnection.h"
#include <MySqlConnector.h>
Core::Db::ZoneDbConnection::ZoneDbConnection( ConnectionInfo& connInfo ) :
Sapphire::Db::ZoneDbConnection::ZoneDbConnection( ConnectionInfo& connInfo ) :
DbConnection( connInfo )
{
}
Core::Db::ZoneDbConnection::ZoneDbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* q,
Sapphire::Db::ZoneDbConnection::ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q,
ConnectionInfo& connInfo ) :
DbConnection( q, connInfo )
{
}
Core::Db::ZoneDbConnection::~ZoneDbConnection()
Sapphire::Db::ZoneDbConnection::~ZoneDbConnection()
{
}
void Core::Db::ZoneDbConnection::doPrepareStatements()
void Sapphire::Db::ZoneDbConnection::doPrepareStatements()
{
if( !m_reconnecting )
m_stmts.resize( MAX_STATEMENTS );

4
src/common/Database/ZoneDbConnection.h
View file

@ -3,7 +3,7 @@
#include "DbConnection.h"
namespace Core::Db
namespace Sapphire::Db
{
class DbConnectionInfo;
@ -96,7 +96,7 @@ namespace Core::Db
ZoneDbConnection( ConnectionInfo& connInfo );
ZoneDbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo );
ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo );
~ZoneDbConnection();

908
src/common/Exd/ExdDataGenerated.cpp
View file

File diff suppressed because it is too large Load diff

900
src/common/Exd/ExdDataGenerated.h
View file

File diff suppressed because it is too large Load diff

2
src/common/Forwards.h
View file

@ -3,7 +3,7 @@
#include <memory>
namespace Core
namespace Sapphire
{
class ConfigMgr;

2
src/common/Framework.h
View file

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

2
src/common/Logging/Logger.cpp
View file

@ -10,7 +10,7 @@
namespace fs = std::experimental::filesystem;
namespace Core
namespace Sapphire
{
Logger::Logger()

2
src/common/Logging/Logger.h
View file

@ -3,7 +3,7 @@
#include <string>
namespace Core
namespace Sapphire
{
class Logger

2
src/common/Network/Acceptor.cpp
View file

@ -2,7 +2,7 @@
#include "Acceptor.h"
#include "Connection.h"
namespace Core {
namespace Sapphire {
namespace Network {
//-----------------------------------------------------------------------------

2
src/common/Network/Acceptor.h
View file

@ -13,7 +13,7 @@
#include <vector>
namespace Core::Network
namespace Sapphire::Network
{
class Connection;

4
src/common/Network/CommonActorControl.h
View file

@ -8,9 +8,9 @@
// +---------------------------------------------------------------------------
// The following enumerations are structures to require their type be included.
// They are also defined within the Core::Common namespace to avoid collisions.
// They are also defined within the Sapphire::Common namespace to avoid collisions.
// +---------------------------------------------------------------------------
namespace Core::Network::ActorControl
namespace Sapphire::Network::ActorControl
{
enum ActorControlType : uint16_t

2
src/common/Network/CommonNetwork.h
View file

@ -5,7 +5,7 @@
#include <vector>
#include "PacketDef/Ipcs.h"
namespace Core::Network::Packets
namespace Sapphire::Network::Packets
{
/**

2
src/common/Network/Connection.cpp
View file

@ -2,7 +2,7 @@
#include "Hive.h"
#include <functional>
namespace Core {
namespace Sapphire {
namespace Network {
//-----------------------------------------------------------------------------

2
src/common/Network/Connection.h
View file

@ -12,7 +12,7 @@
#include "Acceptor.h"
#include <memory>
namespace Core::Network
namespace Sapphire::Network
{
class Hive;

2
src/common/Network/GamePacketNew.h
View file

@ -14,7 +14,7 @@
#include "CommonNetwork.h"
#include "PacketDef/Ipcs.h"
namespace Core::Network::Packets
namespace Sapphire::Network::Packets
{
// Must forward define these in order to enable the compiler to produce the

14
src/common/Network/GamePacketParser.cpp
View file

@ -3,9 +3,9 @@
#include <string.h> // memcpy
using namespace Core::Network::Packets;
using namespace Sapphire::Network::Packets;
PacketParseResult Core::Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
PacketParseResult Sapphire::Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
const uint32_t offset,
FFXIVARR_PACKET_HEADER& header )
{
@ -25,7 +25,7 @@ PacketParseResult Core::Network::Packets::getHeader( const std::vector< uint8_t
return Success;
}
PacketParseResult Core::Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer,
PacketParseResult Sapphire::Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer,
const uint32_t offset,
FFXIVARR_PACKET_SEGMENT_HEADER& header )
{
@ -42,7 +42,7 @@ PacketParseResult Core::Network::Packets::getSegmentHeader( const std::vector< u
return Success;
}
PacketParseResult Core::Network::Packets::getPackets( const std::vector< uint8_t >& buffer,
PacketParseResult Sapphire::Network::Packets::getPackets( const std::vector< uint8_t >& buffer,
const uint32_t offset,
const FFXIVARR_PACKET_HEADER& packetHeader,
std::vector< FFXIVARR_PACKET_RAW >& packets )
@ -81,7 +81,7 @@ PacketParseResult Core::Network::Packets::getPackets( const std::vector< uint8_t
return Success;
}
PacketParseResult Core::Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset,
PacketParseResult Sapphire::Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset,
FFXIVARR_PACKET_RAW& packet )
{
// Copy segment header
@ -103,7 +103,7 @@ PacketParseResult Core::Network::Packets::getPacket( const std::vector< uint8_t
return Success;
}
bool Core::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
bool Sapphire::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
{
// Max size of the packet is capped at 1MB for now.
if( header.size > 1 * 1024 * 1024 )
@ -116,7 +116,7 @@ bool Core::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
return true;
}
bool Core::Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header )
bool Sapphire::Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header )
{
// Max size of individual message is capped at 256KB for now.
if( header.size > 256 * 1024 )

2
src/common/Network/GamePacketParser.h
View file

@ -3,7 +3,7 @@
#include "CommonNetwork.h"
namespace Core::Network::Packets
namespace Sapphire::Network::Packets
{
enum PacketParseResult

2
src/common/Network/Hive.cpp
View file

@ -2,7 +2,7 @@
#include <functional>
#include "Hive.h"
namespace Core {
namespace Sapphire {
namespace Network {
//-----------------------------------------------------------------------------

2
src/common/Network/Hive.h
View file

@ -5,7 +5,7 @@
#include <atomic>
#include <memory>
namespace Core:: Network
namespace Sapphire:: Network
{
class Hive : public std::enable_shared_from_this< Hive >

10
src/common/Network/PacketContainer.cpp
View file

@ -7,7 +7,7 @@
#include <string.h>
#include <memory>
Core::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
Sapphire::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
m_segmentTargetOverride( segmentTargetOverride )
{
memset( &m_ipcHdr, 0, sizeof( FFXIVARR_PACKET_HEADER ) );
@ -15,12 +15,12 @@ Core::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTarget
m_ipcHdr.count = 0;
}
Core::Network::Packets::PacketContainer::~PacketContainer()
Sapphire::Network::Packets::PacketContainer::~PacketContainer()
{
m_entryList.clear();
}
void Core::Network::Packets::PacketContainer::addPacket( Core::Network::Packets::FFXIVPacketBasePtr entry )
void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network::Packets::FFXIVPacketBasePtr entry )
{
m_entryList.push_back( entry );
@ -28,7 +28,7 @@ void Core::Network::Packets::PacketContainer::addPacket( Core::Network::Packets:
m_ipcHdr.count++;
}
void Core::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer )
void Sapphire::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer )
{
std::vector< uint8_t > tempBuffer( m_ipcHdr.size );
memset( &tempBuffer[ 0 ], 0, m_ipcHdr.size );
@ -67,7 +67,7 @@ void Core::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8
}
std::string Core::Network::Packets::PacketContainer::toString()
std::string Sapphire::Network::Packets::PacketContainer::toString()
{
std::vector< uint8_t > tmpBuffer;

2
src/common/Network/PacketContainer.h
View file

@ -8,7 +8,7 @@
#include "GamePacketNew.h"
#include "Forwards.h"
namespace Core::Network::Packets
namespace Sapphire::Network::Packets
{
using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;

4
src/common/Network/PacketDef/Chat/ServerChatDef.h
View file

@ -4,7 +4,7 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
namespace Core {
namespace Sapphire {
namespace Network {
namespace Packets {
namespace Server {
@ -39,7 +39,7 @@ struct FFXIVIpcTellErrNotFound :
} /* Server */
} /* Packets */
} /* Network */
} /* Core */
} /* Sapphire */

2
src/common/Network/PacketDef/Ipcs.h
View file

@ -3,7 +3,7 @@
#include <stdint.h>
namespace Core::Network::Packets
namespace Sapphire::Network::Packets
{
////////////////////////////////////////////////////////////////////////////////

2
src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
View file

@ -4,7 +4,7 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
namespace Core {
namespace Sapphire {
namespace Network {
namespace Packets {
namespace Server {

2
src/common/Network/PacketDef/Zone/ClientZoneDef.h
View file

@ -4,7 +4,7 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
namespace Core {
namespace Sapphire {
namespace Network {
namespace Packets {
namespace Client {

4
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -10,7 +10,7 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
namespace Core {
namespace Sapphire {
namespace Network {
namespace Packets {
namespace Server {
@ -1824,7 +1824,7 @@ struct FFXIVIpcDuelChallenge :
} /* Server */
} /* Packets */
} /* Network */
} /* Core */
} /* Sapphire */

2
src/common/Util/LockedQueue.h
View file

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

2
src/common/Util/LockedWaitQueue.h
View file

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

2
src/common/Util/SpawnIndexAllocator.h
View file

@ -5,7 +5,7 @@
#include <unordered_map>
#include <type_traits>
namespace Core::Util
namespace Sapphire::Util
{
template< typename T, typename ActorIdType = uint32_t >

20
src/common/Util/Util.cpp
View file

@ -5,7 +5,7 @@
#include <algorithm>
#include <string>
std::string Core::Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
std::string Sapphire::Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
{
std::string outStr;
@ -17,26 +17,26 @@ std::string Core::Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
return outStr;
}
std::string Core::Util::toLowerCopy( const std::string& inStr )
std::string Sapphire::Util::toLowerCopy( const std::string& inStr )
{
std::string out = inStr;
std::transform( inStr.begin(), inStr.end(), out.begin(), [](unsigned char c) -> unsigned char { return ::tolower(c); });
return out;
}
void Core::Util::eraseAll( std::string& inOutStr, char remove )
void Sapphire::Util::eraseAll( std::string& inOutStr, char remove )
{
inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), remove ), inOutStr.end() );
}
void Core::Util::eraseAllIn( std::string& inOutStr, std::string& remove )
void Sapphire::Util::eraseAllIn( std::string& inOutStr, std::string& remove )
{
for( auto rem : remove )
inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), rem ), inOutStr.end() );
}
std::string Core::Util::intToHexString( uint64_t intValue, uint8_t width )
std::string Sapphire::Util::intToHexString( uint64_t intValue, uint8_t width )
{
std::string hexStr;
@ -51,7 +51,7 @@ std::string Core::Util::intToHexString( uint64_t intValue, uint8_t width )
return hexStr;
}
std::string Core::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
std::string Sapphire::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
{
int bytesPerLine = 16;
constexpr char hexChars[] = "0123456789ABCDEF";
@ -112,25 +112,25 @@ std::string Core::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
}
uint64_t Core::Util::getTimeMs()
uint64_t Sapphire::Util::getTimeMs()
{
std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds >
( std::chrono::system_clock::now().time_since_epoch() );
return epoch.count();
}
int64_t Core::Util::getTimeSeconds()
int64_t Sapphire::Util::getTimeSeconds()
{
std::chrono::seconds epoch = std::chrono::seconds( std::time( nullptr ) );
return epoch.count();
}
uint64_t Core::Util::getEorzeanTimeStamp()
uint64_t Sapphire::Util::getEorzeanTimeStamp()
{
return static_cast< uint64_t >( getTimeSeconds() * 20.571428571428573f );
}
void Core::Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex )
void Sapphire::Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex )
{
uint32_t id = inVal;
outIndex = id / 8;

2
src/common/Util/Util.h
View file

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

18
src/common/Util/UtilMath.cpp
View file

@ -1,7 +1,7 @@
#include <cmath>
#include "UtilMath.h"
float Core::Math::Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 )
float Sapphire::Math::Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 )
{
float deltaX = x - x1;
float deltaY = y - y1;
@ -10,24 +10,24 @@ float Core::Math::Util::distanceSq( float x, float y, float z, float x1, float y
return ( deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ );
}
float Core::Math::Util::distance( float x, float y, float z, float x1, float y1, float z1 )
float Sapphire::Math::Util::distance( float x, float y, float z, float x1, float y1, float z1 )
{
return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) );
}
float Core::Math::Util::distance2DSq( float x, float y, float x1, float y1 )
float Sapphire::Math::Util::distance2DSq( float x, float y, float x1, float y1 )
{
float deltaX = x - x1;
float deltaY = y - y1;
return ( deltaX * deltaX + deltaY * deltaY );
}
float Core::Math::Util::distance2D( float x, float y, float x1, float y1 )
float Sapphire::Math::Util::distance2D( float x, float y, float x1, float y1 )
{
return sqrtf( distance2DSq( x, y, x1, y1 ) );
}
float Core::Math::Util::calcAngTo( float x, float y, float x1, float y1 )
float Sapphire::Math::Util::calcAngTo( float x, float y, float x1, float y1 )
{
float dx = x - x1;
float dy = y - y1;
@ -41,7 +41,7 @@ float Core::Math::Util::calcAngTo( float x, float y, float x1, float y1 )
}
}
float Core::Math::Util::calcAngFrom( float x, float y, float x1, float y1 )
float Sapphire::Math::Util::calcAngFrom( float x, float y, float x1, float y1 )
{
float dx = x - x1;
float dy = y - y1;
@ -55,17 +55,17 @@ float Core::Math::Util::calcAngFrom( float x, float y, float x1, float y1 )
}
}
uint16_t Core::Math::Util::floatToUInt16( float val )
uint16_t Sapphire::Math::Util::floatToUInt16( float val )
{
return static_cast< uint16_t >( 0x8000 + val * 32.767f );
}
uint16_t Core::Math::Util::floatToUInt16Rot( float val )
uint16_t Sapphire::Math::Util::floatToUInt16Rot( float val )
{
return static_cast< uint16_t >( 0x8000 * ( ( val + PI ) ) / PI );
}
uint8_t Core::Math::Util::floatToUInt8Rot( float val )
uint8_t Sapphire::Math::Util::floatToUInt8Rot( float val )
{
return static_cast< uint8_t >( 0x80 * ( ( val + PI ) ) / PI );
}

2
src/common/Util/UtilMath.h
View file

@ -5,7 +5,7 @@
#define PI 3.14159265358979323846f
namespace Core::Math::Util
namespace Sapphire::Math::Util
{
float distanceSq( float x, float y, float z, float x1, float y1, float z1 );

4
src/common/Version.cpp.in
View file

@ -1,10 +1,10 @@
#include "Version.h"
namespace Core {
namespace Sapphire {
namespace Version {
const std::string GIT_HASH = "@GIT_SHA1@";
const std::string VERSION = "@VERSION@";
} /* Version */
} /* Core */
} /* Sapphire */

2
src/common/Version.h
View file

@ -3,7 +3,7 @@
#include <string>
namespace Core::Version
namespace Sapphire::Version
{
extern const std::string GIT_HASH;
extern const std::string VERSION;

2
src/dbm/main.cpp
View file

@ -16,7 +16,7 @@ namespace filesys = std::experimental::filesystem;
#include "DbManager.h"
Core::Logger g_log;
Sapphire::Logger g_log;
std::vector< std::string > getAllFilesInDir( const std::string& dirPath,
const std::vector< std::string > dirSkipList = {} )

2
src/servers/Scripts/action/ActionReturn6.cpp
View file

@ -11,7 +11,7 @@ public:
{
}
void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override
void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ) override
{
player.returnToHomepoint();
}

2
src/servers/Scripts/action/ActionSprint3.cpp
View file

@ -10,7 +10,7 @@ public:
{
}
void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override
void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ) override
{
player.addStatusEffectByIdIfNotExist( 50, 20000, player, 30 );
}

2
src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
View file

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

4
src/servers/Scripts/common/CmnDefHousingSignboard.cpp
View file

@ -8,7 +8,7 @@
#include "Framework.h"
using namespace Core;
using namespace Sapphire;
using namespace Network;
using namespace Packets;
using namespace Server;
@ -35,7 +35,7 @@ public:
auto pTerritory = player.getCurrentZone();
auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory );
auto pHouMgr = pFw->get< Core::HousingMgr >();
auto pHouMgr = pFw->get< Sapphire::HousingMgr >();
LandPurchaseResult res = pHouMgr->purchaseLand( player, activeLand.plot,
static_cast< uint8_t >( result.param2 ) );

2
src/servers/Scripts/common/CmnDefInnBed.cpp
View file

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

2
src/servers/Scripts/common/CmnDefLinkShell.cpp
View file

@ -5,7 +5,7 @@
#define ACTION_RENAME 3
#define ACTION_REMOVE 4
using namespace Core;
using namespace Sapphire;
class CmnDefLinkShell :
public Sapphire::ScriptAPI::EventScript

2
src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
View file

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

2
src/servers/Scripts/common/CmnDefMogLetter.cpp
View file

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

2
src/servers/Scripts/common/CmnDefNpcRepair.cpp
View file

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

2
src/servers/Scripts/common/CmnDefWeatherForeCast.cpp
View file

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

2
src/servers/Scripts/common/ComDefMobHuntBoard.cpp
View file

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

2
src/servers/Scripts/common/GilShop.cpp
View file

@ -4,7 +4,7 @@
#include <Framework.h>
#include <Manager/ShopMgr.h>
using namespace Core;
using namespace Sapphire;
class GilShop :
public Sapphire::ScriptAPI::EventScript

2
src/servers/Scripts/common/HouFurOrchestrion.cpp
View file

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

10
src/servers/Scripts/common/WarpTaxi.cpp
View file

@ -5,7 +5,7 @@
#include <Framework.h>
#include <Manager/PlayerMgr.h>
using namespace Core;
using namespace Sapphire;
class WarpTaxi : public Sapphire::ScriptAPI::EventScript
{
@ -27,8 +27,8 @@ public:
player.eventFinish( 1310721, 0 );
player.eventFinish( getId(), 1 );
auto exdData = getFramework()->get< Core::Data::ExdDataGenerated >();
auto warp = exdData->get< Core::Data::Warp >( getId() );
auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
auto warp = exdData->get< Sapphire::Data::Warp >( getId() );
if( !warp )
return;
@ -53,11 +53,11 @@ public:
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
auto exdData = getFramework()->get< Core::Data::ExdDataGenerated >();
auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
if( !exdData )
return;
auto warp = exdData->get< Core::Data::Warp >( eventId );
auto warp = exdData->get< Sapphire::Data::Warp >( eventId );
if( !warp )
return;

6
src/servers/Scripts/common/aethernet/Aetheryte.cpp
View file

@ -6,7 +6,7 @@
using namespace Core;
using namespace Sapphire;
class Aetheryte :
public Sapphire::ScriptAPI::EventScript
@ -108,11 +108,11 @@ public:
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
auto pExdData = getFramework()->get< Core::Data::ExdDataGenerated >();
auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
if( !pExdData )
return;
auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF );
auto aetherInfo = pExdData->get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
if( !aetherInfo )
return;

6
src/servers/Scripts/common/aethernet/HousingAethernet.cpp
View file

@ -5,7 +5,7 @@
#include <Exd/ExdDataGenerated.h>
#include <Zone/Zone.h>
using namespace Core;
using namespace Sapphire;
class HousingAethernet :
public Sapphire::ScriptAPI::EventScript
@ -20,7 +20,7 @@ public:
{
player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, [this, eventId]( Entity::Player& player, const Event::SceneResult& result )
{
auto pExdData = getFramework()->get< Core::Data::ExdDataGenerated >();
auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >();
if( !pExdData )
return;
@ -28,7 +28,7 @@ public:
auto terrritoryTypeId = player.getCurrentZone()->getTerritoryTypeId();
// param2 is the index starting from 0 inside housingaethernet.exd, but the ID column starts at 0x001E0000........ wtf
auto pHousingAethernet = pExdData->get< Core::Data::HousingAethernet >( getId() + result.param2 );
auto pHousingAethernet = pExdData->get< Sapphire::Data::HousingAethernet >( getId() + result.param2 );
if( !pHousingAethernet )
return;

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
View file

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

2
src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
View file

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

2
src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
View file

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

2
src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
View file

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

2
src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
View file

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

2
src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
View file

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

2
src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
View file

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

Some files were not shown because too many files have changed in this diff Show more