diff options
Diffstat (limited to 'src')
277 files changed, 1289 insertions, 1309 deletions
diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake index cd9a199051..7d10b7f706 100644 --- a/src/cmake/showoptions.cmake +++ b/src/cmake/showoptions.cmake @@ -60,7 +60,7 @@ endif() if( WITH_COREDEBUG ) message("* Use coreside debug : Yes") - add_definitions(-DTRINITY_DEBUG) + add_definitions(-DACORE_DEBUG) else() message("* Use coreside debug : No (default)") endif() diff --git a/src/common/AutoPtr.h b/src/common/AutoPtr.h index 4986044a53..c37cefa7b5 100644 --- a/src/common/AutoPtr.h +++ b/src/common/AutoPtr.h @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef _TRINITY_AUTO_PTR_H -#define _TRINITY_AUTO_PTR_H +#ifndef _ACORE_AUTO_PTR_H +#define _ACORE_AUTO_PTR_H #include <ace/Bound_Ptr.h> -namespace Trinity +namespace acore { template <class Pointer, class Lock> @@ -37,6 +37,6 @@ public: } }; -} // namespace Trinity +} // namespace acore #endif diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 5d7b6d2418..bd1c2ad7aa 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -93,7 +93,7 @@ namespace MMAP bool MMapManager::loadMap(uint32 mapId, int32 x, int32 y) { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); // make sure the mmap is loaded and ready to load tiles if(!loadMapData(mapId)) @@ -161,7 +161,7 @@ namespace MMAP dtStatus stat; { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); stat = mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef); } @@ -188,7 +188,7 @@ namespace MMAP bool MMapManager::unloadMap(uint32 mapId, int32 x, int32 y) { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); // check if we have this map loaded if (loadedMMaps.find(mapId) == loadedMMaps.end()) @@ -217,7 +217,7 @@ namespace MMAP dtStatus status; { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); status = mmap->navMesh->removeTile(tileRef, NULL, NULL); } @@ -245,7 +245,7 @@ namespace MMAP bool MMapManager::unloadMap(uint32 mapId) { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); if (loadedMMaps.find(mapId) == loadedMMaps.end()) { @@ -265,7 +265,7 @@ namespace MMAP dtStatus status; { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); status = mmap->navMesh->removeTile(i->second, NULL, NULL); } @@ -291,7 +291,7 @@ namespace MMAP bool MMapManager::unloadMapInstance(uint32 mapId, uint32 instanceId) { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); // check if we have this map loaded if (loadedMMaps.find(mapId) == loadedMMaps.end()) @@ -326,7 +326,7 @@ namespace MMAP dtNavMesh const* MMapManager::GetNavMesh(uint32 mapId) { // pussywizard: moved to calling function - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); + //ACORE_READ_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); if (loadedMMaps.find(mapId) == loadedMMaps.end()) return NULL; @@ -337,7 +337,7 @@ namespace MMAP dtNavMeshQuery const* MMapManager::GetNavMeshQuery(uint32 mapId, uint32 instanceId) { // pussywizard: moved to calling function - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); + //ACORE_READ_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); if (loadedMMaps.find(mapId) == loadedMMaps.end()) return NULL; @@ -346,7 +346,7 @@ namespace MMAP if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end()) { // pussywizard: different instances of the same map shouldn't access this simultaneously - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); // check again after acquiring mutex if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end()) { diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index ce641cce4d..991b8d877c 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -262,7 +262,7 @@ namespace VMAP WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename) { //! Critical section, thread safe access to iLoadedModelFiles - TRINITY_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); + ACORE_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) @@ -287,7 +287,7 @@ namespace VMAP void VMapManager2::releaseModelInstance(const std::string &filename) { //! Critical section, thread safe access to iLoadedModelFiles - TRINITY_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); + ACORE_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) { diff --git a/src/common/Common.h b/src/common/Common.h index 3e1f698ef5..f5f331ce3f 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -193,23 +193,23 @@ typedef std::vector<std::string> StringVector; #define MAX_QUERY_LEN 32*1024 -#define TRINITY_GUARD(MUTEX, LOCK) \ - ACE_Guard< MUTEX > TRINITY_GUARD_OBJECT (LOCK); \ - if (TRINITY_GUARD_OBJECT.locked() == 0) ASSERT(false); +#define ACORE_GUARD(MUTEX, LOCK) \ + ACE_Guard< MUTEX > ACORE_GUARD_OBJECT (LOCK); \ + if (ACORE_GUARD_OBJECT.locked() == 0) ASSERT(false); //! For proper implementation of multiple-read, single-write pattern, use //! ACE_RW_Mutex as underlying @MUTEX -# define TRINITY_WRITE_GUARD(MUTEX, LOCK) \ - ACE_Write_Guard< MUTEX > TRINITY_GUARD_OBJECT (LOCK); \ - if (TRINITY_GUARD_OBJECT.locked() == 0) ASSERT(false); +# define ACORE_WRITE_GUARD(MUTEX, LOCK) \ + ACE_Write_Guard< MUTEX > ACORE_GUARD_OBJECT (LOCK); \ + if (ACORE_GUARD_OBJECT.locked() == 0) ASSERT(false); //! For proper implementation of multiple-read, single-write pattern, use //! ACE_RW_Mutex as underlying @MUTEX -# define TRINITY_READ_GUARD(MUTEX, LOCK) \ - ACE_Read_Guard< MUTEX > TRINITY_GUARD_OBJECT (LOCK); \ - if (TRINITY_GUARD_OBJECT.locked() == 0) ASSERT(false); +# define ACORE_READ_GUARD(MUTEX, LOCK) \ + ACE_Read_Guard< MUTEX > ACORE_GUARD_OBJECT (LOCK); \ + if (ACORE_GUARD_OBJECT.locked() == 0) ASSERT(false); -namespace ACORE +namespace acore { template<class ArgumentType, class ResultType> struct unary_function diff --git a/src/common/CompilerDefs.h b/src/common/CompilerDefs.h index 772a39e4eb..9d99d1ddce 100644 --- a/src/common/CompilerDefs.h +++ b/src/common/CompilerDefs.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_COMPILERDEFS_H -#define TRINITY_COMPILERDEFS_H +#ifndef ACORE_COMPILERDEFS_H +#define ACORE_COMPILERDEFS_H #define AC_PLATFORM_WINDOWS 0 #define AC_PLATFORM_UNIX 1 diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h index 333d10317d..103fd2c1ce 100644 --- a/src/common/Configuration/Config.h +++ b/src/common/Configuration/Config.h @@ -15,7 +15,7 @@ #include <ace/Thread_Mutex.h> #include <AutoPtr.h> -typedef Trinity::AutoPtr<ACE_Configuration_Heap, ACE_Null_Mutex> Config; +typedef acore::AutoPtr<ACE_Configuration_Heap, ACE_Null_Mutex> Config; class ConfigMgr { diff --git a/src/common/Containers.h b/src/common/Containers.h index a5aa39c8d8..047ea5fb9f 100644 --- a/src/common/Containers.h +++ b/src/common/Containers.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CONTAINERS_H -#define TRINITY_CONTAINERS_H +#ifndef ACORE_CONTAINERS_H +#define ACORE_CONTAINERS_H #include "Define.h" #include <list> @@ -13,7 +13,7 @@ //! Because circular includes are bad extern uint32 urand(uint32 min, uint32 max); -namespace Trinity +namespace acore { namespace Containers { @@ -56,6 +56,6 @@ namespace Trinity } //! namespace Containers } -//! namespace Trinity +//! namespace acore -#endif //! #ifdef TRINITY_CONTAINERS_H +#endif //! #ifdef ACORE_CONTAINERS_H diff --git a/src/common/Database/DatabaseWorkerPool.cpp b/src/common/Database/DatabaseWorkerPool.cpp index cd04214222..53b79d7d37 100644 --- a/src/common/Database/DatabaseWorkerPool.cpp +++ b/src/common/Database/DatabaseWorkerPool.cpp @@ -212,7 +212,7 @@ SQLTransaction DatabaseWorkerPool<T>::BeginTransaction() template <class T> void DatabaseWorkerPool<T>::CommitTransaction(SQLTransaction transaction) { - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG //! Only analyze transaction weaknesses in Debug mode. //! Ideally we catch the faults in Debug mode and then correct them, //! so there's no need to waste these CPU cycles in Release mode. @@ -227,7 +227,7 @@ void DatabaseWorkerPool<T>::CommitTransaction(SQLTransaction transaction) default: break; } - #endif // TRINITY_DEBUG + #endif // ACORE_DEBUG Enqueue(new TransactionTask(transaction)); } diff --git a/src/common/Database/DatabaseWorkerPool.h b/src/common/Database/DatabaseWorkerPool.h index 53f46ce5d3..f574acc3de 100644 --- a/src/common/Database/DatabaseWorkerPool.h +++ b/src/common/Database/DatabaseWorkerPool.h @@ -57,10 +57,10 @@ class DatabaseWorkerPool template<typename Format, typename... Args> void PExecute(Format&& sql, Args&&... args) { - if (ACORE::IsFormatEmptyOrNull(sql)) + if (acore::IsFormatEmptyOrNull(sql)) return; - Execute(ACORE::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); + Execute(acore::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); } //! Enqueues a one-way SQL operation in prepared statement format that will be executed asynchronously. @@ -80,10 +80,10 @@ class DatabaseWorkerPool template<typename Format, typename... Args> void DirectPExecute(Format&& sql, Args&&... args) { - if (ACORE::IsFormatEmptyOrNull(sql)) + if (acore::IsFormatEmptyOrNull(sql)) return; - DirectExecute(ACORE::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); + DirectExecute(acore::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); } //! Directly executes a one-way SQL operation in prepared statement format, that will block the calling thread until finished. @@ -103,10 +103,10 @@ class DatabaseWorkerPool template<typename Format, typename... Args> QueryResult PQuery(Format&& sql, T* conn, Args&&... args) { - if (ACORE::IsFormatEmptyOrNull(sql)) + if (acore::IsFormatEmptyOrNull(sql)) return QueryResult(nullptr); - return Query(ACORE::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str(), conn); + return Query(acore::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str(), conn); } //! Directly executes an SQL query in string format -with variable args- that will block the calling thread until finished. @@ -114,10 +114,10 @@ class DatabaseWorkerPool template<typename Format, typename... Args> QueryResult PQuery(Format&& sql, Args&&... args) { - if (ACORE::IsFormatEmptyOrNull(sql)) + if (acore::IsFormatEmptyOrNull(sql)) return QueryResult(nullptr); - return Query(ACORE::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); + return Query(acore::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); } //! Directly executes an SQL query in prepared format that will block the calling thread until finished. @@ -138,10 +138,10 @@ class DatabaseWorkerPool template<typename Format, typename... Args> QueryResultFuture AsyncPQuery(Format&& sql, Args&&... args) { - if (ACORE::IsFormatEmptyOrNull(sql)) + if (acore::IsFormatEmptyOrNull(sql)) return QueryResult(nullptr); - return AsyncQuery(ACORE::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); + return AsyncQuery(acore::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); } //! Enqueues a query in prepared format that will set the value of the PreparedQueryResultFuture return object as soon as the query is executed. diff --git a/src/common/Database/Field.h b/src/common/Database/Field.h index 0fb400d1f4..747011499f 100644 --- a/src/common/Database/Field.h +++ b/src/common/Database/Field.h @@ -29,7 +29,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_TINY)) { sLog->outSQLDriver("Warning: GetUInt8() on non-tinyint field. Using type: %s.", FieldTypeToString(data.type)); @@ -47,7 +47,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_TINY)) { sLog->outSQLDriver("Warning: GetInt8() on non-tinyint field. Using type: %s.", FieldTypeToString(data.type)); @@ -72,7 +72,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_SHORT) && !IsType(MYSQL_TYPE_YEAR)) { sLog->outSQLDriver("Warning: GetUInt16() on non-smallint field. Using type: %s.", FieldTypeToString(data.type)); @@ -90,7 +90,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_SHORT) && !IsType(MYSQL_TYPE_YEAR)) { sLog->outSQLDriver("Warning: GetInt16() on non-smallint field. Using type: %s.", FieldTypeToString(data.type)); @@ -108,7 +108,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_INT24) && !IsType(MYSQL_TYPE_LONG)) { sLog->outSQLDriver("Warning: GetUInt32() on non-(medium)int field. Using type: %s.", FieldTypeToString(data.type)); @@ -126,7 +126,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_INT24) && !IsType(MYSQL_TYPE_LONG)) { sLog->outSQLDriver("Warning: GetInt32() on non-(medium)int field. Using type: %s.", FieldTypeToString(data.type)); @@ -144,7 +144,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_LONGLONG) && !IsType(MYSQL_TYPE_BIT)) { sLog->outSQLDriver("Warning: GetUInt64() on non-bigint field. Using type: %s.", FieldTypeToString(data.type)); @@ -162,7 +162,7 @@ class Field if (!data.value) return 0; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_LONGLONG) && !IsType(MYSQL_TYPE_BIT)) { sLog->outSQLDriver("Warning: GetInt64() on non-bigint field. Using type: %s.", FieldTypeToString(data.type)); @@ -180,7 +180,7 @@ class Field if (!data.value) return 0.0f; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_FLOAT)) { sLog->outSQLDriver("Warning: GetFloat() on non-float field. Using type: %s.", FieldTypeToString(data.type)); @@ -198,7 +198,7 @@ class Field if (!data.value) return 0.0f; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (!IsType(MYSQL_TYPE_DOUBLE)) { sLog->outSQLDriver("Warning: GetDouble() on non-double field. Using type: %s.", FieldTypeToString(data.type)); @@ -216,7 +216,7 @@ class Field if (!data.value) return NULL; - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG if (IsNumeric()) { sLog->outSQLDriver("Error: GetCString() on numeric field. Using type: %s.", FieldTypeToString(data.type)); @@ -345,7 +345,7 @@ class Field } private: - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG static char const* FieldTypeToString(enum_field_types type) { switch (type) diff --git a/src/common/Database/QueryResult.h b/src/common/Database/QueryResult.h index 0f78be1ef6..1445ce3db8 100644 --- a/src/common/Database/QueryResult.h +++ b/src/common/Database/QueryResult.h @@ -48,7 +48,7 @@ class ResultSet MYSQL_FIELD* _fields; }; -typedef Trinity::AutoPtr<ResultSet, ACE_Thread_Mutex> QueryResult; +typedef acore::AutoPtr<ResultSet, ACE_Thread_Mutex> QueryResult; class PreparedResultSet { @@ -93,7 +93,7 @@ class PreparedResultSet }; -typedef Trinity::AutoPtr<PreparedResultSet, ACE_Thread_Mutex> PreparedQueryResult; +typedef acore::AutoPtr<PreparedResultSet, ACE_Thread_Mutex> PreparedQueryResult; #endif diff --git a/src/common/Database/Transaction.h b/src/common/Database/Transaction.h index 8617a682fe..4c2d53a904 100644 --- a/src/common/Database/Transaction.h +++ b/src/common/Database/Transaction.h @@ -39,7 +39,7 @@ class Transaction bool _cleanedUp; }; -typedef Trinity::AutoPtr<Transaction, ACE_Thread_Mutex> SQLTransaction; +typedef acore::AutoPtr<Transaction, ACE_Thread_Mutex> SQLTransaction; /*! Low level class*/ class TransactionTask : public SQLOperation diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp index c7e78b8385..bf7c443f23 100644 --- a/src/common/Debugging/Errors.cpp +++ b/src/common/Debugging/Errors.cpp @@ -54,12 +54,12 @@ namespace } } -namespace Trinity +namespace acore { void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message) { - std::string formattedMessage = ACORE::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + debugInfo + '\n'; + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + debugInfo + '\n'; fprintf(stderr, "%s", formattedMessage.c_str()); fflush(stderr); Crash(formattedMessage.c_str()); @@ -70,7 +70,7 @@ void Assert(char const* file, int line, char const* function, std::string const& va_list args; va_start(args, format); - std::string formattedMessage = ACORE::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + FormatAssertionMessage(format, args) + '\n' + debugInfo + '\n'; + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + FormatAssertionMessage(format, args) + '\n' + debugInfo + '\n'; va_end(args); fprintf(stderr, "%s", formattedMessage.c_str()); @@ -84,7 +84,7 @@ void Fatal(char const* file, int line, char const* function, char const* message va_list args; va_start(args, message); - std::string formattedMessage = ACORE::StringFormat("\n%s:%i in %s FATAL ERROR:\n", file, line, function) + FormatAssertionMessage(message, args) + '\n'; + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s FATAL ERROR:\n", file, line, function) + FormatAssertionMessage(message, args) + '\n'; va_end(args); fprintf(stderr, "%s", formattedMessage.c_str()); @@ -96,7 +96,7 @@ void Fatal(char const* file, int line, char const* function, char const* message void Error(char const* file, int line, char const* function, char const* message) { - std::string formattedMessage = ACORE::StringFormat("\n%s:%i in %s ERROR:\n %s\n", file, line, function, message); + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ERROR:\n %s\n", file, line, function, message); fprintf(stderr, "%s", formattedMessage.c_str()); fflush(stderr); Crash(formattedMessage.c_str()); @@ -110,7 +110,7 @@ void Warning(char const* file, int line, char const* function, char const* messa void Abort(char const* file, int line, char const* function) { - std::string formattedMessage = ACORE::StringFormat("\n%s:%i in %s ABORTED.\n", file, line, function); + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ABORTED.\n", file, line, function); fprintf(stderr, "%s", formattedMessage.c_str()); fflush(stderr); Crash(formattedMessage.c_str()); @@ -119,13 +119,13 @@ void Abort(char const* file, int line, char const* function) void AbortHandler(int sigval) { // nothing useful to log here, no way to pass args - std::string formattedMessage = ACORE::StringFormat("Caught signal %i\n", sigval); + std::string formattedMessage = acore::StringFormat("Caught signal %i\n", sigval); fprintf(stderr, "%s", formattedMessage.c_str()); fflush(stderr); Crash(formattedMessage.c_str()); } -} // namespace Trinity +} // namespace acore std::string GetDebugInfo() { diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h index 1edfdcb759..f40aa52d6d 100644 --- a/src/common/Debugging/Errors.h +++ b/src/common/Debugging/Errors.h @@ -10,7 +10,7 @@ #include "Define.h" #include <string> -namespace Trinity +namespace acore { DECLSPEC_NORETURN void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message) ATTR_NORETURN; DECLSPEC_NORETURN void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message, char const* format, ...) ATTR_NORETURN ATTR_PRINTF(6, 7); @@ -25,7 +25,7 @@ namespace Trinity DECLSPEC_NORETURN void AbortHandler(int sigval) ATTR_NORETURN; -} // namespace Trinity +} // namespace acore std::string GetDebugInfo(); @@ -41,12 +41,12 @@ std::string GetDebugInfo(); #define EXCEPTION_ASSERTION_FAILURE 0xC0000420L #endif -#define WPAssert(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Assert(__FILE__, __LINE__, __FUNCTION__, GetDebugInfo(), #cond, ##__VA_ARGS__); } while(0) ASSERT_END -#define WPAssert_NODEBUGINFO(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Assert(__FILE__, __LINE__, __FUNCTION__, "", #cond, ##__VA_ARGS__); } while(0) ASSERT_END -#define WPFatal(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Fatal(__FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__); } while(0) ASSERT_END -#define WPError(cond, msg) ASSERT_BEGIN do { if (!(cond)) Trinity::Error(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END -#define WPWarning(cond, msg) ASSERT_BEGIN do { if (!(cond)) Trinity::Warning(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END -#define WPAbort() ASSERT_BEGIN do { Trinity::Abort(__FILE__, __LINE__, __FUNCTION__); } while(0) ASSERT_END +#define WPAssert(cond, ...) ASSERT_BEGIN do { if (!(cond)) acore::Assert(__FILE__, __LINE__, __FUNCTION__, GetDebugInfo(), #cond, ##__VA_ARGS__); } while(0) ASSERT_END +#define WPAssert_NODEBUGINFO(cond, ...) ASSERT_BEGIN do { if (!(cond)) acore::Assert(__FILE__, __LINE__, __FUNCTION__, "", #cond, ##__VA_ARGS__); } while(0) ASSERT_END +#define WPFatal(cond, ...) ASSERT_BEGIN do { if (!(cond)) acore::Fatal(__FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__); } while(0) ASSERT_END +#define WPError(cond, msg) ASSERT_BEGIN do { if (!(cond)) acore::Error(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END +#define WPWarning(cond, msg) ASSERT_BEGIN do { if (!(cond)) acore::Warning(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END +#define WPAbort() ASSERT_BEGIN do { acore::Abort(__FILE__, __LINE__, __FUNCTION__); } while(0) ASSERT_END #ifdef PERFORMANCE_PROFILING #define ASSERT(cond, ...) ((void)0) diff --git a/src/common/Define.h b/src/common/Define.h index e7a5266dd0..640d8d2fe9 100644 --- a/src/common/Define.h +++ b/src/common/Define.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_DEFINE_H -#define TRINITY_DEFINE_H +#ifndef ACORE_DEFINE_H +#define ACORE_DEFINE_H #include <cstddef> #include <cinttypes> @@ -17,19 +17,19 @@ #define OS_WIN #endif -#define TRINITY_LITTLEENDIAN 0 -#define TRINITY_BIGENDIAN 1 +#define ACORE_LITTLEENDIAN 0 +#define ACORE_BIGENDIAN 1 -#if !defined(TRINITY_ENDIAN) +#if !defined(ACORE_ENDIAN) # if defined (ACE_BIG_ENDIAN) -# define TRINITY_ENDIAN TRINITY_BIGENDIAN +# define ACORE_ENDIAN ACORE_BIGENDIAN # else //ACE_BYTE_ORDER != ACE_BIG_ENDIAN -# define TRINITY_ENDIAN TRINITY_LITTLEENDIAN +# define ACORE_ENDIAN ACORE_LITTLEENDIAN # endif //ACE_BYTE_ORDER -#endif //TRINITY_ENDIAN +#endif //ACORE_ENDIAN #if AC_PLATFORM == AC_PLATFORM_WINDOWS -# define TRINITY_PATH_MAX MAX_PATH +# define ACORE_PATH_MAX MAX_PATH # ifndef DECLSPEC_NORETURN # define DECLSPEC_NORETURN __declspec(noreturn) # endif //DECLSPEC_NORETURN @@ -37,18 +37,18 @@ # define DECLSPEC_DEPRECATED __declspec(deprecated) # endif //DECLSPEC_DEPRECATED #else //AC_PLATFORM != AC_PLATFORM_WINDOWS -# define TRINITY_PATH_MAX PATH_MAX +# define ACORE_PATH_MAX PATH_MAX # define DECLSPEC_NORETURN # define DECLSPEC_DEPRECATED #endif //AC_PLATFORM #if !defined(COREDEBUG) -# define TRINITY_INLINE inline +# define ACORE_INLINE inline #else //COREDEBUG -# if !defined(TRINITY_DEBUG) -# define TRINITY_DEBUG -# endif //TRINITY_DEBUG -# define TRINITY_INLINE +# if !defined(ACORE_DEBUG) +# define ACORE_DEBUG +# endif //ACORE_DEBUG +# define ACORE_INLINE #endif //!COREDEBUG #if AC_COMPILER == AC_COMPILER_GNU @@ -80,4 +80,4 @@ typedef std::uint32_t uint32; typedef std::uint16_t uint16; typedef std::uint8_t uint8; -#endif //TRINITY_DEFINE_H +#endif //ACORE_DEFINE_H diff --git a/src/common/Dynamic/FactoryHolder.h b/src/common/Dynamic/FactoryHolder.h index ac8721d1db..6e26733cb8 100644 --- a/src/common/Dynamic/FactoryHolder.h +++ b/src/common/Dynamic/FactoryHolder.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_FACTORY_HOLDER -#define TRINITY_FACTORY_HOLDER +#ifndef ACORE_FACTORY_HOLDER +#define ACORE_FACTORY_HOLDER #include "Define.h" #include "Dynamic/TypeList.h" diff --git a/src/common/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h index 97179c911f..3458fa446b 100644 --- a/src/common/Dynamic/ObjectRegistry.h +++ b/src/common/Dynamic/ObjectRegistry.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_OBJECTREGISTRY_H -#define TRINITY_OBJECTREGISTRY_H +#ifndef ACORE_OBJECTREGISTRY_H +#define ACORE_OBJECTREGISTRY_H #include "Define.h" #include <ace/Singleton.h> diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h index c3003d4a16..f7ddd28c72 100644 --- a/src/common/Dynamic/TypeContainer.h +++ b/src/common/Dynamic/TypeContainer.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_TYPECONTAINER_H -#define TRINITY_TYPECONTAINER_H +#ifndef ACORE_TYPECONTAINER_H +#define ACORE_TYPECONTAINER_H /* * Here, you'll find a series of containers that allow you to hold multiple @@ -86,19 +86,19 @@ template<class OBJECT_TYPES> class TypeMapContainer { public: - template<class SPECIFIC_TYPE> size_t Count() const { return Trinity::Count(i_elements, (SPECIFIC_TYPE*)NULL); } + template<class SPECIFIC_TYPE> size_t Count() const { return acore::Count(i_elements, (SPECIFIC_TYPE*)NULL); } /// inserts a specific object into the container template<class SPECIFIC_TYPE> bool insert(SPECIFIC_TYPE *obj) { - SPECIFIC_TYPE* t = Trinity::Insert(i_elements, obj); + SPECIFIC_TYPE* t = acore::Insert(i_elements, obj); return (t != NULL); } /// Removes the object from the container, and returns the removed object //template<class SPECIFIC_TYPE> bool remove(SPECIFIC_TYPE* obj) //{ - // SPECIFIC_TYPE* t = Trinity::Remove(i_elements, obj); + // SPECIFIC_TYPE* t = acore::Remove(i_elements, obj); // return (t != NULL); //} diff --git a/src/common/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h index b4302d9aff..d1a63c84b9 100644 --- a/src/common/Dynamic/TypeContainerFunctions.h +++ b/src/common/Dynamic/TypeContainerFunctions.h @@ -17,7 +17,7 @@ #include "Dynamic/TypeList.h" #include <map> -namespace Trinity +namespace acore { /* ContainerMapList Helpers */ // count functions diff --git a/src/common/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h index c8ddbea731..06b34d7ee6 100644 --- a/src/common/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h @@ -17,7 +17,7 @@ #include "Utilities/TypeList.h" #include <map> -namespace Trinity +namespace acore { /* ContainerMapList Helpers */ // count functions diff --git a/src/common/Dynamic/TypeContainerVisitor.h b/src/common/Dynamic/TypeContainerVisitor.h index 9cbe1fa291..0a584bbe48 100644 --- a/src/common/Dynamic/TypeContainerVisitor.h +++ b/src/common/Dynamic/TypeContainerVisitor.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_TYPECONTAINERVISITOR_H -#define TRINITY_TYPECONTAINERVISITOR_H +#ifndef ACORE_TYPECONTAINERVISITOR_H +#define ACORE_TYPECONTAINERVISITOR_H /* * @class TypeContainerVisitor is implemented as a visitor pattern. It is diff --git a/src/common/Dynamic/TypeList.h b/src/common/Dynamic/TypeList.h index a7daa06adc..16148ba582 100644 --- a/src/common/Dynamic/TypeList.h +++ b/src/common/Dynamic/TypeList.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_TYPELIST_H -#define TRINITY_TYPELIST_H +#ifndef ACORE_TYPELIST_H +#define ACORE_TYPELIST_H /* @struct TypeList diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 7f58477106..44fae1ef1d 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -199,8 +199,8 @@ FILE* Log::openGmlogPerAccount(uint32 account) if (m_gmlog_filename_format.empty()) return NULL; - char namebuf[TRINITY_PATH_MAX]; - snprintf(namebuf, TRINITY_PATH_MAX, m_gmlog_filename_format.c_str(), account); + char namebuf[ACORE_PATH_MAX]; + snprintf(namebuf, ACORE_PATH_MAX, m_gmlog_filename_format.c_str(), account); return fopen(namebuf, "a"); } diff --git a/src/common/Threading/DelayExecutor.cpp b/src/common/Threading/DelayExecutor.cpp index 99d8133f81..107f6388a1 100644 --- a/src/common/Threading/DelayExecutor.cpp +++ b/src/common/Threading/DelayExecutor.cpp @@ -80,8 +80,8 @@ int DelayExecutor::start(int num_threads, ACE_Method_Request* pre_svc_hook, ACE_ queue_.queue()->activate(); // pussywizard: - //ACORE::ThreadPriority tp; - //int _priority = tp.getPriority(ACORE::Priority_Highest); + //acore::ThreadPriority tp; + //int _priority = tp.getPriority(acore::Priority_Highest); //if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE, num_threads, 0, _priority) == -1) // return -1; diff --git a/src/common/Threading/Threading.cpp b/src/common/Threading/Threading.cpp index d954ba3ec6..9eb40d7fae 100644 --- a/src/common/Threading/Threading.cpp +++ b/src/common/Threading/Threading.cpp @@ -10,7 +10,7 @@ #include <chrono> #include <system_error> -using namespace ACORE; +using namespace acore; Thread::Thread() : m_task(nullptr), m_iThreadId(), m_ThreadImp() { diff --git a/src/common/Threading/Threading.h b/src/common/Threading/Threading.h index 6ddd56483f..6a15d8eb85 100644 --- a/src/common/Threading/Threading.h +++ b/src/common/Threading/Threading.h @@ -13,7 +13,7 @@ #include <thread> #include <atomic> -namespace ACORE +namespace acore { class Runnable { diff --git a/src/common/Utilities/ByteConverter.h b/src/common/Utilities/ByteConverter.h index 01045746b9..b004184272 100644 --- a/src/common/Utilities/ByteConverter.h +++ b/src/common/Utilities/ByteConverter.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_BYTECONVERTER_H -#define TRINITY_BYTECONVERTER_H +#ifndef ACORE_BYTECONVERTER_H +#define ACORE_BYTECONVERTER_H /** ByteConverter reverse your byte order. This is use for cross platform where they have different endians. @@ -32,7 +32,7 @@ namespace ByteConverter } } -#if TRINITY_ENDIAN == TRINITY_BIGENDIAN +#if ACORE_ENDIAN == ACORE_BIGENDIAN template<typename T> inline void EndianConvert(T& val) { ByteConverter::apply<T>(&val); } template<typename T> inline void EndianConvertReverse(T&) { } template<typename T> inline void EndianConvertPtr(void* val) { ByteConverter::apply<T>(val); } diff --git a/src/common/Utilities/SignalHandler.h b/src/common/Utilities/SignalHandler.h index 66cd5fe814..1e31c2dfda 100644 --- a/src/common/Utilities/SignalHandler.h +++ b/src/common/Utilities/SignalHandler.h @@ -9,7 +9,7 @@ #include <ace/Event_Handler.h> -namespace Trinity +namespace acore { /// Handle termination signals diff --git a/src/common/Utilities/StringFormat.h b/src/common/Utilities/StringFormat.h index 77fd4f176c..99197ef756 100644 --- a/src/common/Utilities/StringFormat.h +++ b/src/common/Utilities/StringFormat.h @@ -9,7 +9,7 @@ #include "fmt/printf.h" -namespace ACORE +namespace acore { /// Default AC string format function. template<typename Format, typename... Args> diff --git a/src/common/Utilities/Timer.h b/src/common/Utilities/Timer.h index b74fdb2be9..20fa6d13ef 100644 --- a/src/common/Utilities/Timer.h +++ b/src/common/Utilities/Timer.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_TIMER_H -#define TRINITY_TIMER_H +#ifndef ACORE_TIMER_H +#define ACORE_TIMER_H #include "ace/OS_NS_sys_time.h" #include "Common.h" diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index ebf4fe0a78..8202225513 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -38,7 +38,7 @@ add_dependencies(authserver revision.h) if(NOT WIN32) set_target_properties(authserver PROPERTIES - COMPILE_DEFINITIONS _TRINITY_REALM_CONFIG="${CONF_DIR}/authserver.conf") + COMPILE_DEFINITIONS _ACORE_REALM_CONFIG="${CONF_DIR}/authserver.conf") endif() target_link_libraries(authserver diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index bef6b45657..d7ab216006 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -35,8 +35,8 @@ #define PROCESS_HIGH_PRIORITY -15 // [-20, 19], default is 0 #endif -#ifndef _TRINITY_REALM_CONFIG -# define _TRINITY_REALM_CONFIG "authserver.conf" +#ifndef _ACORE_REALM_CONFIG +# define _ACORE_REALM_CONFIG "authserver.conf" #endif bool StartDB(); @@ -47,7 +47,7 @@ bool stopEvent = false; // Setting it to tru LoginDatabaseWorkerPool LoginDatabase; // Accessor to the authserver database /// Handle authserver's termination signals -class AuthServerSignalHandler : public Trinity::SignalHandler +class AuthServerSignalHandler : public acore::SignalHandler { public: virtual void HandleSignal(int sigNum) @@ -74,7 +74,7 @@ void usage(const char* prog) extern int main(int argc, char** argv) { // Command line parsing to get the configuration file name - char const* configFile = _TRINITY_REALM_CONFIG; + char const* configFile = _ACORE_REALM_CONFIG; int count = 1; while (count < argc) { @@ -92,7 +92,7 @@ extern int main(int argc, char** argv) ++count; } - std::string cfg_def_file=_TRINITY_REALM_CONFIG; + std::string cfg_def_file=_ACORE_REALM_CONFIG; cfg_def_file += ".dist"; if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) { diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index d7ef7221f0..c1549b3549 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -129,7 +129,7 @@ typedef struct AuthHandler #endif // Launch a thread to transfer a patch to the client -class PatcherRunnable: public ACORE::Runnable +class PatcherRunnable: public acore::Runnable { public: PatcherRunnable(class AuthSocket*); @@ -329,7 +329,7 @@ bool AuthSocket::_HandleLogonChallenge() // pussywizard: logon flood protection: { - TRINITY_GUARD(ACE_Thread_Mutex, LastLoginAttemptMutex); + ACORE_GUARD(ACE_Thread_Mutex, LastLoginAttemptMutex); std::string ipaddr = socket().getRemoteAddress(); uint32 currTime = time(NULL); std::map<std::string, uint32>::iterator itr = LastLoginAttemptTimeForIP.find(ipaddr); @@ -1145,7 +1145,7 @@ bool AuthSocket::_HandleXferResume() socket().recv((char*)&start, sizeof(start)); fseek(pPatch, long(start), 0); - ACORE::Thread u(new PatcherRunnable(this)); + acore::Thread u(new PatcherRunnable(this)); return true; } @@ -1181,7 +1181,7 @@ bool AuthSocket::_HandleXferAccept() socket().recv_skip(1); // clear input buffer fseek(pPatch, 0, 0); - ACORE::Thread u(new PatcherRunnable(this)); + acore::Thread u(new PatcherRunnable(this)); return true; } diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 65e5fe50fd..f563b93e01 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_COMBATAI_H -#define TRINITY_COMBATAI_H +#ifndef ACORE_COMBATAI_H +#define ACORE_COMBATAI_H #include "CreatureAI.h" #include "CreatureAIImpl.h" diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 895ac8cce3..625c9160ae 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GAMEOBJECTAI_H -#define TRINITY_GAMEOBJECTAI_H +#ifndef ACORE_GAMEOBJECTAI_H +#define ACORE_GAMEOBJECTAI_H #include "Define.h" #include <list> diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h index 1c947a93a9..efd6e13ec9 100644 --- a/src/server/game/AI/CoreAI/GuardAI.h +++ b/src/server/game/AI/CoreAI/GuardAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GUARDAI_H -#define TRINITY_GUARDAI_H +#ifndef ACORE_GUARDAI_H +#define ACORE_GUARDAI_H #include "ScriptedCreature.h" diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index 60175fce26..634c1725a0 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_PASSIVEAI_H -#define TRINITY_PASSIVEAI_H +#ifndef ACORE_PASSIVEAI_H +#define ACORE_PASSIVEAI_H #include "CreatureAI.h" //#include "CreatureAIImpl.h" diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index c4f42ba63c..355d4d71e8 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_PETAI_H -#define TRINITY_PETAI_H +#ifndef ACORE_PETAI_H +#define ACORE_PETAI_H #include "CreatureAI.h" #include "Timer.h" diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h index 3efb9f92c6..d2ffc54de3 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.h +++ b/src/server/game/AI/CoreAI/ReactorAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_REACTORAI_H -#define TRINITY_REACTORAI_H +#ifndef ACORE_REACTORAI_H +#define ACORE_REACTORAI_H #include "CreatureAI.h" diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 6b98b45feb..63f6edcd22 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -72,8 +72,8 @@ void TotemAI::UpdateAI(uint32 /*diff*/) me->IsFriendlyTo(victim) || !me->CanSeeOrDetect(victim)) { victim = NULL; - Trinity::NearestAttackableUnitInObjectRangeCheck u_check(me, me, max_range); - Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck> checker(me, victim, u_check); + acore::NearestAttackableUnitInObjectRangeCheck u_check(me, me, max_range); + acore::UnitLastSearcher<acore::NearestAttackableUnitInObjectRangeCheck> checker(me, victim, u_check); me->VisitNearbyObject(max_range, checker); } diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index b297f83b22..578b2fda44 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_TOTEMAI_H -#define TRINITY_TOTEMAI_H +#ifndef ACORE_TOTEMAI_H +#define ACORE_TOTEMAI_H #include "CreatureAI.h" #include "Timer.h" diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 7ba101728a..52e4181562 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_UNITAI_H -#define TRINITY_UNITAI_H +#ifndef ACORE_UNITAI_H +#define ACORE_UNITAI_H #include "Define.h" #include "Unit.h" @@ -28,7 +28,7 @@ enum SelectAggroTarget }; // default predicate function to select target based on distance, player and/or aura criteria -struct DefaultTargetSelector : public ACORE::unary_function<Unit*, bool> +struct DefaultTargetSelector : public acore::unary_function<Unit*, bool> { const Unit* me; float m_dist; @@ -78,7 +78,7 @@ struct DefaultTargetSelector : public ACORE::unary_function<Unit*, bool> // Target selector for spell casts checking range, auras and attributes // TODO: Add more checks from Spell::CheckCast -struct SpellTargetSelector : public ACORE::unary_function<Unit*, bool> +struct SpellTargetSelector : public acore::unary_function<Unit*, bool> { public: SpellTargetSelector(Unit* caster, uint32 spellId); @@ -92,7 +92,7 @@ struct SpellTargetSelector : public ACORE::unary_function<Unit*, bool> // Very simple target selector, will just skip main target // NOTE: When passing to UnitAI::SelectTarget remember to use 0 as position for random selection // because tank will not be in the temporary list -struct NonTankTargetSelector : public ACORE::unary_function<Unit*, bool> +struct NonTankTargetSelector : public acore::unary_function<Unit*, bool> { public: NonTankTargetSelector(Creature* source, bool playerOnly = true) : _source(source), _playerOnly(playerOnly) { } @@ -104,7 +104,7 @@ struct NonTankTargetSelector : public ACORE::unary_function<Unit*, bool> }; // Simple selector for units using mana -struct PowerUsersSelector : public ACORE::unary_function<Unit*, bool> +struct PowerUsersSelector : public acore::unary_function<Unit*, bool> { Unit const* _me; Powers const _power; @@ -135,7 +135,7 @@ struct PowerUsersSelector : public ACORE::unary_function<Unit*, bool> } }; -struct FarthestTargetSelector : public ACORE::unary_function<Unit*, bool> +struct FarthestTargetSelector : public acore::unary_function<Unit*, bool> { FarthestTargetSelector(Unit const* unit, float dist, bool playerOnly, bool inLos) : _me(unit), _dist(dist), _playerOnly(playerOnly), _inLos(inLos) {} @@ -191,7 +191,7 @@ class UnitAI Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. - // predicate shall extend ACORE::unary_function<Unit*, bool> + // predicate shall extend acore::unary_function<Unit*, bool> template <class PREDICATE> Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE const& predicate) { ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); @@ -207,7 +207,7 @@ class UnitAI return NULL; if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST) - targetList.sort(Trinity::ObjectDistanceOrderPred(me)); + targetList.sort(acore::ObjectDistanceOrderPred(me)); switch (targetType) { @@ -241,7 +241,7 @@ class UnitAI void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. - // predicate shall extend ACORE::unary_function<Unit*, bool> + // predicate shall extend acore::unary_function<Unit*, bool> template <class PREDICATE> void SelectTargetList(std::list<Unit*>& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectAggroTarget targetType) { ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); @@ -256,13 +256,13 @@ class UnitAI return; if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST) - targetList.sort(Trinity::ObjectDistanceOrderPred(me)); + targetList.sort(acore::ObjectDistanceOrderPred(me)); if (targetType == SELECT_TARGET_FARTHEST || targetType == SELECT_TARGET_BOTTOMAGGRO) targetList.reverse(); if (targetType == SELECT_TARGET_RANDOM) - Trinity::Containers::RandomResizeList(targetList, maxTargets); + acore::Containers::RandomResizeList(targetList, maxTargets); else targetList.resize(maxTargets); } diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 28303b573d..8dc2f2fd81 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CREATUREAI_H -#define TRINITY_CREATUREAI_H +#ifndef ACORE_CREATUREAI_H +#define ACORE_CREATUREAI_H #include "Creature.h" #include "UnitAI.h" diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h index d6353dfbbd..bd26b94f02 100644 --- a/src/server/game/AI/CreatureAIFactory.h +++ b/src/server/game/AI/CreatureAIFactory.h @@ -3,8 +3,8 @@ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CREATUREAIFACTORY_H -#define TRINITY_CREATUREAIFACTORY_H +#ifndef ACORE_CREATUREAIFACTORY_H +#define ACORE_CREATUREAIFACTORY_H //#include "Policies/Singleton.h" #include "ObjectRegistry.h" diff --git a/src/server/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h index e7485f5a19..fe403a5e57 100644 --- a/src/server/game/AI/CreatureAIRegistry.h +++ b/src/server/game/AI/CreatureAIRegistry.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CREATUREAIREGISTRY_H -#define TRINITY_CREATUREAIREGISTRY_H +#ifndef ACORE_CREATUREAIREGISTRY_H +#define ACORE_CREATUREAIREGISTRY_H namespace AIRegistry { diff --git a/src/server/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h index 4f79777481..88eee68f7b 100644 --- a/src/server/game/AI/CreatureAISelector.h +++ b/src/server/game/AI/CreatureAISelector.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CREATUREAISELECTOR_H -#define TRINITY_CREATUREAISELECTOR_H +#ifndef ACORE_CREATUREAISELECTOR_H +#define ACORE_CREATUREAISELECTOR_H class CreatureAI; class Creature; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 25b2abc91a..d5821190b7 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -378,8 +378,8 @@ void ScriptedAI::DoTeleportAll(float x, float y, float z, float o) Unit* ScriptedAI::DoSelectLowestHpFriendly(float range, uint32 minHPDiff) { Unit* unit = NULL; - Trinity::MostHPMissingInRange u_check(me, range, minHPDiff); - Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange> searcher(me, unit, u_check); + acore::MostHPMissingInRange u_check(me, range, minHPDiff); + acore::UnitLastSearcher<acore::MostHPMissingInRange> searcher(me, unit, u_check); me->VisitNearbyObject(range, searcher); return unit; @@ -388,8 +388,8 @@ Unit* ScriptedAI::DoSelectLowestHpFriendly(float range, uint32 minHPDiff) std::list<Creature*> ScriptedAI::DoFindFriendlyCC(float range) { std::list<Creature*> list; - Trinity::FriendlyCCedInRange u_check(me, range); - Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange> searcher(me, list, u_check); + acore::FriendlyCCedInRange u_check(me, range); + acore::CreatureListSearcher<acore::FriendlyCCedInRange> searcher(me, list, u_check); me->VisitNearbyObject(range, searcher); return list; } @@ -397,8 +397,8 @@ std::list<Creature*> ScriptedAI::DoFindFriendlyCC(float range) std::list<Creature*> ScriptedAI::DoFindFriendlyMissingBuff(float range, uint32 uiSpellid) { std::list<Creature*> list; - Trinity::FriendlyMissingBuffInRange u_check(me, range, uiSpellid); - Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange> searcher(me, list, u_check); + acore::FriendlyMissingBuffInRange u_check(me, range, uiSpellid); + acore::CreatureListSearcher<acore::FriendlyMissingBuffInRange> searcher(me, list, u_check); me->VisitNearbyObject(range, searcher); return list; } @@ -407,13 +407,13 @@ Player* ScriptedAI::GetPlayerAtMinimumRange(float minimumRange) { Player* player = NULL; - CellCoord pair(Trinity::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); - Trinity::PlayerAtMinimumRangeAway check(me, minimumRange); - Trinity::PlayerSearcher<Trinity::PlayerAtMinimumRangeAway> searcher(me, player, check); - TypeContainerVisitor<Trinity::PlayerSearcher<Trinity::PlayerAtMinimumRangeAway>, GridTypeMapContainer> visitor(searcher); + acore::PlayerAtMinimumRangeAway check(me, minimumRange); + acore::PlayerSearcher<acore::PlayerAtMinimumRangeAway> searcher(me, player, check); + TypeContainerVisitor<acore::PlayerSearcher<acore::PlayerAtMinimumRangeAway>, GridTypeMapContainer> visitor(searcher); cell.Visit(pair, visitor, *me->GetMap(), *me, minimumRange); diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 9d2f09a433..a8856b1697 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -107,7 +107,7 @@ public: // We need to use a copy of SummonList here, otherwise original SummonList would be modified StorageType listCopy = storage_; - Trinity::Containers::RandomResizeList<uint64, Predicate>(listCopy, predicate, max); + acore::Containers::RandomResizeList<uint64, Predicate>(listCopy, predicate, max); for (StorageType::iterator i = listCopy.begin(); i != listCopy.end(); ++i) { Creature* summon = ObjectAccessor::GetCreature(*me, *i); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 8cb06aae63..399bb5ab75 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SMARTAI_H -#define TRINITY_SMARTAI_H +#ifndef ACORE_SMARTAI_H +#define ACORE_SMARTAI_H #include "Common.h" #include "Creature.h" diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 17cca22bc6..c40661b3d6 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -27,17 +27,17 @@ #include "SpellMgr.h" #include "Vehicle.h" -class TrinityStringTextBuilder +class AcoreStringTextBuilder { public: - TrinityStringTextBuilder(WorldObject* obj, ChatMsg msgtype, int32 id, uint32 language, WorldObject* target) + AcoreStringTextBuilder(WorldObject* obj, ChatMsg msgtype, int32 id, uint32 language, WorldObject* target) : _source(obj), _msgType(msgtype), _textId(id), _language(language), _target(target) { } size_t operator()(WorldPacket* data, LocaleConstant locale) const { - std::string text = sObjectMgr->GetTrinityString(_textId, locale); + std::string text = sObjectMgr->GetAcoreString(_textId, locale); return ChatHandler::BuildChatPacket(*data, _msgType, Language(_language), _source, _target, text, 0, "", locale); } @@ -741,7 +741,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u caster = unit->SummonTrigger(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), unit->GetOrientation(), 5000); if (e.action.cast.targetsLimit > 0 && targets->size() > e.action.cast.targetsLimit) - Trinity::Containers::RandomResizeList(*targets, e.action.cast.targetsLimit); + acore::Containers::RandomResizeList(*targets, e.action.cast.targetsLimit); for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { @@ -797,7 +797,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; if (e.action.cast.targetsLimit > 0 && targets->size() > e.action.cast.targetsLimit) - Trinity::Containers::RandomResizeList(*targets, e.action.cast.targetsLimit); + acore::Containers::RandomResizeList(*targets, e.action.cast.targetsLimit); for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { @@ -1042,7 +1042,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u me->DoFleeToGetAssistance(); if (e.action.flee.withEmote) { - TrinityStringTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, LANG_FLEE, LANG_UNIVERSAL, NULL); + AcoreStringTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, LANG_FLEE, LANG_UNIVERSAL, NULL); sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); } #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) @@ -1340,7 +1340,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u (*itr)->ToCreature()->CallForHelp((float)e.action.callHelp.range); if (e.action.callHelp.withEmote) { - TrinityStringTextBuilder builder(*itr, CHAT_MSG_MONSTER_EMOTE, LANG_CALL_FOR_HELP, LANG_UNIVERSAL, NULL); + AcoreStringTextBuilder builder(*itr, CHAT_MSG_MONSTER_EMOTE, LANG_CALL_FOR_HELP, LANG_UNIVERSAL, NULL); sCreatureTextMgr->SendChatPacket(*itr, builder, CHAT_MSG_MONSTER_EMOTE); } } @@ -1516,7 +1516,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; // xinef: attack random target - if (Unit* target = Trinity::Containers::SelectRandomContainerElement(*targets)->ToUnit()) + if (Unit* target = acore::Containers::SelectRandomContainerElement(*targets)->ToUnit()) me->AI()->AttackStart(target); delete targets; @@ -1880,7 +1880,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (ObjectList* targets = GetTargets(e, unit)) { // xinef: we want to move to random element - target = Trinity::Containers::SelectRandomContainerElement(*targets); + target = acore::Containers::SelectRandomContainerElement(*targets); delete targets; } } @@ -2436,7 +2436,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u // xinef: my implementation if (e.action.jump.selfJump) { - if (WorldObject* target = Trinity::Containers::SelectRandomContainerElement(*targets)) + if (WorldObject* target = acore::Containers::SelectRandomContainerElement(*targets)) if (me) me->GetMotionMaster()->MoveJump(target->GetPositionX() + e.target.x, target->GetPositionY() + e.target.y, target->GetPositionZ() + e.target.z, (float)e.action.jump.speedxy, (float)e.action.jump.speedz); } @@ -3554,8 +3554,8 @@ ObjectList* SmartScript::GetWorldObjectsInDist(float dist) WorldObject* obj = GetBaseObject(); if (obj) { - Trinity::AllWorldObjectsInRange u_check(obj, dist); - Trinity::WorldObjectListSearcher<Trinity::AllWorldObjectsInRange> searcher(obj, *targets, u_check); + acore::AllWorldObjectsInRange u_check(obj, dist); + acore::WorldObjectListSearcher<acore::AllWorldObjectsInRange> searcher(obj, *targets, u_check); obj->VisitNearbyObject(dist, searcher); } return targets; @@ -3685,7 +3685,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui RecalcTimer(e, 1000, 3000); return; } - ProcessTimedAction(e, e.event.friendlyCC.repeatMin, e.event.friendlyCC.repeatMax, Trinity::Containers::SelectRandomContainerElement(pList)); + ProcessTimedAction(e, e.event.friendlyCC.repeatMin, e.event.friendlyCC.repeatMax, acore::Containers::SelectRandomContainerElement(pList)); break; } case SMART_EVENT_FRIENDLY_MISSING_BUFF: @@ -3696,7 +3696,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui if (pList.empty()) return; - ProcessTimedAction(e, e.event.missingBuff.repeatMin, e.event.missingBuff.repeatMax, Trinity::Containers::SelectRandomContainerElement(pList)); + ProcessTimedAction(e, e.event.missingBuff.repeatMin, e.event.missingBuff.repeatMax, acore::Containers::SelectRandomContainerElement(pList)); break; } case SMART_EVENT_HAS_AURA: @@ -4321,7 +4321,7 @@ void SmartScript::FillScript(SmartAIEventList e, WorldObject* obj, AreaTrigger c } for (SmartAIEventList::iterator i = e.begin(); i != e.end(); ++i) { -#ifndef TRINITY_DEBUG +#ifndef ACORE_DEBUG if ((*i).event.event_flags & SMART_EVENT_FLAG_DEBUG_ONLY) continue; #endif @@ -4503,8 +4503,8 @@ Unit* SmartScript::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff) Unit* unit = NULL; - Trinity::MostHPMissingInRange u_check(me, range, MinHPDiff); - Trinity::UnitLastSearcher<Trinity::MostHPMissingInRange> searcher(me, unit, u_check); + acore::MostHPMissingInRange u_check(me, range, MinHPDiff); + acore::UnitLastSearcher<acore::MostHPMissingInRange> searcher(me, unit, u_check); me->VisitNearbyObject(range, searcher); return unit; } @@ -4514,8 +4514,8 @@ void SmartScript::DoFindFriendlyCC(std::list<Creature*>& _list, float range) if (!me) return; - Trinity::FriendlyCCedInRange u_check(me, range); - Trinity::CreatureListSearcher<Trinity::FriendlyCCedInRange> searcher(me, _list, u_check); + acore::FriendlyCCedInRange u_check(me, range); + acore::CreatureListSearcher<acore::FriendlyCCedInRange> searcher(me, _list, u_check); me->VisitNearbyObject(range, searcher); } @@ -4524,8 +4524,8 @@ void SmartScript::DoFindFriendlyMissingBuff(std::list<Creature*>& list, float ra if (!me) return; - Trinity::FriendlyMissingBuffInRange u_check(me, range, spellid); - Trinity::CreatureListSearcher<Trinity::FriendlyMissingBuffInRange> searcher(me, list, u_check); + acore::FriendlyMissingBuffInRange u_check(me, range, spellid); + acore::CreatureListSearcher<acore::FriendlyMissingBuffInRange> searcher(me, list, u_check); me->VisitNearbyObject(range, searcher); } @@ -4535,8 +4535,8 @@ Unit* SmartScript::DoFindClosestFriendlyInRange(float range, bool playerOnly) return NULL; Unit* unit = NULL; - Trinity::AnyFriendlyNotSelfUnitInObjectRangeCheck u_check(me, me, range, playerOnly); - Trinity::UnitLastSearcher<Trinity::AnyFriendlyNotSelfUnitInObjectRangeCheck> searcher(me, unit, u_check); + acore::AnyFriendlyNotSelfUnitInObjectRangeCheck u_check(me, me, range, playerOnly); + acore::UnitLastSearcher<acore::AnyFriendlyNotSelfUnitInObjectRangeCheck> searcher(me, unit, u_check); me->VisitNearbyObject(range, searcher); return unit; } diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 53972a4768..99b5326758 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SMARTSCRIPT_H -#define TRINITY_SMARTSCRIPT_H +#ifndef ACORE_SMARTSCRIPT_H +#define ACORE_SMARTSCRIPT_H #include "Common.h" #include "Creature.h" @@ -162,13 +162,13 @@ class SmartScript { GameObject* gameObject = NULL; - CellCoord p(Trinity::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); Cell cell(p); - Trinity::GameObjectWithDbGUIDCheck goCheck(guid); - Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(searchObject, gameObject, goCheck); + acore::GameObjectWithDbGUIDCheck goCheck(guid); + acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck> checker(searchObject, gameObject, goCheck); - TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > objectChecker(checker); + TypeContainerVisitor<acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > objectChecker(checker); cell.Visit(p, objectChecker, *searchObject->GetMap(), *searchObject, searchObject->GetVisibilityRange()); return gameObject; @@ -177,13 +177,13 @@ class SmartScript Creature* FindCreatureNear(WorldObject* searchObject, uint32 guid) const { Creature* creature = NULL; - CellCoord p(Trinity::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); Cell cell(p); - Trinity::CreatureWithDbGUIDCheck target_check(guid); - Trinity::CreatureSearcher<Trinity::CreatureWithDbGUIDCheck> checker(searchObject, creature, target_check); + acore::CreatureWithDbGUIDCheck target_check(guid); + acore::CreatureSearcher<acore::CreatureWithDbGUIDCheck> checker(searchObject, creature, target_check); - TypeContainerVisitor<Trinity::CreatureSearcher <Trinity::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker); + TypeContainerVisitor<acore::CreatureSearcher <acore::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker); cell.Visit(p, unit_checker, *searchObject->GetMap(), *searchObject, searchObject->GetVisibilityRange()); return creature; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index e1d1566cc6..5c3f53e710 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -1097,7 +1097,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) } case SMART_ACTION_LOAD_GRID: { - if (!Trinity::IsValidMapCoord(e.target.x, e.target.y)) + if (!acore::IsValidMapCoord(e.target.x, e.target.y)) { sLog->outError("SmartScript: SMART_ACTION_LOAD_GRID uses invalid map coords: %u, skipped.", e.entryOrGuid); return false; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index e8917db750..ea89b5f282 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SMARTSCRIPTMGR_H -#define TRINITY_SMARTSCRIPTMGR_H +#ifndef ACORE_SMARTSCRIPTMGR_H +#define ACORE_SMARTSCRIPTMGR_H #include "Common.h" #include "Creature.h" diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 25ac28fc4b..251ffc5f1b 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -32,7 +32,7 @@ #include "World.h" #include "WorldPacket.h" -namespace Trinity +namespace acore { class AchievementChatBuilder { @@ -42,7 +42,7 @@ namespace Trinity void operator()(WorldPacket& data, LocaleConstant loc_idx) { - std::string text = sObjectMgr->GetTrinityString(i_textId, loc_idx); + std::string text = sObjectMgr->GetAcoreString(i_textId, loc_idx); ChatHandler::BuildChatPacket(data, i_msgtype, LANG_UNIVERSAL, &i_player, &i_player, text, i_achievementId); } @@ -52,7 +52,7 @@ namespace Trinity int32 i_textId; uint32 i_achievementId; }; -} // namespace Trinity +} // namespace acore bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) { @@ -662,14 +662,14 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) if (achievement->flags & ACHIEVEMENT_FLAG_HIDDEN) return; - #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) && defined(TRINITY_DEBUG) + #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) && defined(ACORE_DEBUG) sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::SendAchievementEarned(%u)", achievement->ID); #endif if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildId())) { - Trinity::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID); - Trinity::LocalizedPacketDo<Trinity::AchievementChatBuilder> say_do(say_builder); + acore::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID); + acore::LocalizedPacketDo<acore::AchievementChatBuilder> say_do(say_builder); guild->BroadcastWorker(say_do, GetPlayer()); } @@ -686,15 +686,15 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) // if player is in world he can tell his friends about new achievement else if (GetPlayer()->IsInWorld()) { - CellCoord p = Trinity::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID); - Trinity::LocalizedPacketDo<Trinity::AchievementChatBuilder> say_do(say_builder); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::AchievementChatBuilder> > say_worker(GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::AchievementChatBuilder> >, WorldTypeMapContainer > message(say_worker); + acore::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID); + acore::LocalizedPacketDo<acore::AchievementChatBuilder> say_do(say_builder); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::AchievementChatBuilder> > say_worker(GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::AchievementChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetPlayer()->GetMap(), *GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY)); } diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index bc421d22db..1034cde573 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -3,8 +3,8 @@ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_ACHIEVEMENTMGR_H -#define __TRINITY_ACHIEVEMENTMGR_H +#ifndef __ACORE_ACHIEVEMENTMGR_H +#define __ACORE_ACHIEVEMENTMGR_H #include <map> #include <string> diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 6235ef3c0f..3288849da3 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -978,8 +978,8 @@ bool BfCapturePoint::Update(uint32 diff) } std::list<Player*> players; - Trinity::AnyPlayerInObjectRangeCheck checker(capturePoint, radius); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(capturePoint, players, checker); + acore::AnyPlayerInObjectRangeCheck checker(capturePoint, radius); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(capturePoint, players, checker); capturePoint->VisitNearbyWorldObject(radius, searcher); for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index d822517db5..64ee67215e 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -36,7 +36,7 @@ #ifdef ELUNA #include "LuaEngine.h" #endif -namespace Trinity +namespace acore { class BattlegroundChatBuilder { @@ -46,7 +46,7 @@ namespace Trinity void operator()(WorldPacket& data, LocaleConstant loc_idx) { - char const* text = sObjectMgr->GetTrinityString(_textId, loc_idx); + char const* text = sObjectMgr->GetAcoreString(_textId, loc_idx); if (_args) { // we need copy va_list before use or original va_list will corrupted @@ -83,9 +83,9 @@ namespace Trinity void operator()(WorldPacket& data, LocaleConstant loc_idx) { - char const* text = sObjectMgr->GetTrinityString(_textId, loc_idx); - char const* arg1str = _arg1 ? sObjectMgr->GetTrinityString(_arg1, loc_idx) : ""; - char const* arg2str = _arg2 ? sObjectMgr->GetTrinityString(_arg2, loc_idx) : ""; + char const* text = sObjectMgr->GetAcoreString(_textId, loc_idx); + char const* arg1str = _arg1 ? sObjectMgr->GetAcoreString(_arg1, loc_idx) : ""; + char const* arg2str = _arg2 ? sObjectMgr->GetAcoreString(_arg2, loc_idx) : ""; char str[2048]; snprintf(str, 2048, text, arg1str, arg2str); @@ -100,7 +100,7 @@ namespace Trinity uint32 _arg1; uint32 _arg2; }; -} // namespace Trinity +} // namespace acore template<class Do> void Battleground::BroadcastWorker(Do& _do) @@ -1064,7 +1064,7 @@ uint32 Battleground::GetBonusHonorFromKill(uint32 kills) const { //variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill) uint32 maxLevel = std::min<uint32>(GetMaxLevel(), 80U); - return Trinity::Honor::hk_honor_at_level(maxLevel, float(kills)); + return acore::Honor::hk_honor_at_level(maxLevel, float(kills)); } void Battleground::BlockMovement(Player* player) @@ -1745,8 +1745,8 @@ void Battleground::SendMessageToAll(uint32 entry, ChatMsg type, Player const* so if (!entry) return; - Trinity::BattlegroundChatBuilder bg_builder(type, entry, source); - Trinity::LocalizedPacketDo<Trinity::BattlegroundChatBuilder> bg_do(bg_builder); + acore::BattlegroundChatBuilder bg_builder(type, entry, source); + acore::LocalizedPacketDo<acore::BattlegroundChatBuilder> bg_do(bg_builder); BroadcastWorker(bg_do); } @@ -1758,8 +1758,8 @@ void Battleground::PSendMessageToAll(uint32 entry, ChatMsg type, Player const* s va_list ap; va_start(ap, source); - Trinity::BattlegroundChatBuilder bg_builder(type, entry, source, &ap); - Trinity::LocalizedPacketDo<Trinity::BattlegroundChatBuilder> bg_do(bg_builder); + acore::BattlegroundChatBuilder bg_builder(type, entry, source, &ap); + acore::LocalizedPacketDo<acore::BattlegroundChatBuilder> bg_do(bg_builder); BroadcastWorker(bg_do); va_end(ap); @@ -1775,7 +1775,7 @@ void Battleground::SendWarningToAll(uint32 entry, ...) { if (localizedPackets.find(itr->second->GetSession()->GetSessionDbLocaleIndex()) == localizedPackets.end()) { - char const* format = sObjectMgr->GetTrinityString(entry, itr->second->GetSession()->GetSessionDbLocaleIndex()); + char const* format = sObjectMgr->GetAcoreString(entry, itr->second->GetSession()->GetSessionDbLocaleIndex()); char str[1024]; va_list ap; @@ -1792,8 +1792,8 @@ void Battleground::SendWarningToAll(uint32 entry, ...) void Battleground::SendMessage2ToAll(uint32 entry, ChatMsg type, Player const* source, uint32 arg1, uint32 arg2) { - Trinity::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2); - Trinity::LocalizedPacketDo<Trinity::Battleground2ChatBuilder> bg_do(bg_builder); + acore::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2); + acore::LocalizedPacketDo<acore::Battleground2ChatBuilder> bg_do(bg_builder); BroadcastWorker(bg_do); } @@ -1804,10 +1804,10 @@ void Battleground::EndNow() } // To be removed -char const* Battleground::GetTrinityString(int32 entry) +char const* Battleground::GetAcoreString(int32 entry) { // FIXME: now we have different DBC locales and need localized message for each target client - return sObjectMgr->GetTrinityStringForDBCLocale(entry); + return sObjectMgr->GetAcoreStringForDBCLocale(entry); } void Battleground::HandleTriggerBuff(GameObject* gameObject) diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 3f98b1ab97..187345ab44 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -569,7 +569,7 @@ class Battleground void DoorOpen(uint32 type); void DoorClose(uint32 type); //to be removed - const char* GetTrinityString(int32 entry); + const char* GetAcoreString(int32 entry); virtual bool HandlePlayerUnderMap(Player* /*player*/) { return false; } diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index c8e3639b7a..1d879efe94 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -641,8 +641,8 @@ void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, uint64 guid uint32 winner_arena = player->GetRandomWinner() ? BG_REWARD_WINNER_ARENA_LAST : BG_REWARD_WINNER_ARENA_FIRST; uint32 loser_kills = player->GetRandomWinner() ? BG_REWARD_LOSER_HONOR_LAST : BG_REWARD_LOSER_HONOR_FIRST; - winner_kills = Trinity::Honor::hk_honor_at_level(player->getLevel(), float(winner_kills)); - loser_kills = Trinity::Honor::hk_honor_at_level(player->getLevel(), float(loser_kills)); + winner_kills = acore::Honor::hk_honor_at_level(player->getLevel(), float(winner_kills)); + loser_kills = acore::Honor::hk_honor_at_level(player->getLevel(), float(loser_kills)); data->Initialize(SMSG_BATTLEFIELD_LIST); *data << uint64(guid); // battlemaster guid diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index c6e57d65a2..aeb352f50a 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -109,7 +109,7 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+i, RESPAWN_IMMEDIATELY); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature, GetTrinityString(LANG_BG_AV_A_CAPTAIN_DEAD), LANG_UNIVERSAL); + YellToAll(creature, GetAcoreString(LANG_BG_AV_A_CAPTAIN_DEAD), LANG_UNIVERSAL); DelCreature(AV_CPLACE_TRIGGER16); } else if (entry == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN]) @@ -128,7 +128,7 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_HORDE+i, RESPAWN_IMMEDIATELY); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature, GetTrinityString(LANG_BG_AV_H_CAPTAIN_DEAD), LANG_UNIVERSAL); + YellToAll(creature, GetAcoreString(LANG_BG_AV_H_CAPTAIN_DEAD), LANG_UNIVERSAL); DelCreature(AV_CPLACE_TRIGGER18); } else if (entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_N_4] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_A_4] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_H_4]) @@ -642,9 +642,9 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) //send a nice message to all :) char buf[256]; if (IsTower(node)) - sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN), GetNodeName(node), (ownerId == TEAM_ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetAcoreString(LANG_BG_AV_TOWER_TAKEN), GetNodeName(node), (ownerId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); else - sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN), GetNodeName(node), (ownerId == TEAM_ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetAcoreString(LANG_BG_AV_GRAVE_TAKEN), GetNodeName(node), (ownerId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) :GetAcoreString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) @@ -727,8 +727,8 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, TeamId teamId, bool initial) { m_Mine_Reclaim_Timer[mine]=AV_MINE_RECLAIM_TIMER; char buf[256]; - sprintf(buf, GetTrinityString(LANG_BG_AV_MINE_TAKEN), GetTrinityString((mine == AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH), - (teamId == TEAM_ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetAcoreString(LANG_BG_AV_MINE_TAKEN), GetAcoreString((mine == AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH), + (teamId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) YellToAll(creature, buf, LANG_UNIVERSAL); @@ -976,7 +976,7 @@ void BattlegroundAV::EventPlayerDefendsPoint(Player* player, uint32 object) } //send a nice message to all :) char buf[256]; - sprintf(buf, GetTrinityString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node), (teamId == TEAM_ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetAcoreString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node), (teamId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) YellToAll(creature, buf, LANG_UNIVERSAL); @@ -1078,7 +1078,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) //send a nice message to all :) char buf[256]; - sprintf(buf, (IsTower(node)) ? GetTrinityString(LANG_BG_AV_TOWER_ASSAULTED) : GetTrinityString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node), (teamId == TEAM_ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, (IsTower(node)) ? GetAcoreString(LANG_BG_AV_TOWER_ASSAULTED) : GetAcoreString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node), (teamId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) YellToAll(creature, buf, LANG_UNIVERSAL); @@ -1436,21 +1436,21 @@ char const* BattlegroundAV::GetNodeName(BG_AV_Nodes node) { switch (node) { - case BG_AV_NODES_FIRSTAID_STATION: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_STORM_AID); - case BG_AV_NODES_DUNBALDAR_SOUTH: return GetTrinityString(LANG_BG_AV_NODE_TOWER_DUN_S); - case BG_AV_NODES_DUNBALDAR_NORTH: return GetTrinityString(LANG_BG_AV_NODE_TOWER_DUN_N); - case BG_AV_NODES_STORMPIKE_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_STORMPIKE); - case BG_AV_NODES_ICEWING_BUNKER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_ICEWING); - case BG_AV_NODES_STONEHEART_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_STONE); - case BG_AV_NODES_STONEHEART_BUNKER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_STONE); - case BG_AV_NODES_SNOWFALL_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_SNOW); - case BG_AV_NODES_ICEBLOOD_TOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_ICE); - case BG_AV_NODES_ICEBLOOD_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_ICE); - case BG_AV_NODES_TOWER_POINT: return GetTrinityString(LANG_BG_AV_NODE_TOWER_POINT); - case BG_AV_NODES_FROSTWOLF_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_FROST); - case BG_AV_NODES_FROSTWOLF_ETOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_FROST_E); - case BG_AV_NODES_FROSTWOLF_WTOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_FROST_W); - case BG_AV_NODES_FROSTWOLF_HUT: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_FROST_HUT); + case BG_AV_NODES_FIRSTAID_STATION: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_STORM_AID); + case BG_AV_NODES_DUNBALDAR_SOUTH: return GetAcoreString(LANG_BG_AV_NODE_TOWER_DUN_S); + case BG_AV_NODES_DUNBALDAR_NORTH: return GetAcoreString(LANG_BG_AV_NODE_TOWER_DUN_N); + case BG_AV_NODES_STORMPIKE_GRAVE: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_STORMPIKE); + case BG_AV_NODES_ICEWING_BUNKER: return GetAcoreString(LANG_BG_AV_NODE_TOWER_ICEWING); + case BG_AV_NODES_STONEHEART_GRAVE: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_STONE); + case BG_AV_NODES_STONEHEART_BUNKER: return GetAcoreString(LANG_BG_AV_NODE_TOWER_STONE); + case BG_AV_NODES_SNOWFALL_GRAVE: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_SNOW); + case BG_AV_NODES_ICEBLOOD_TOWER: return GetAcoreString(LANG_BG_AV_NODE_TOWER_ICE); + case BG_AV_NODES_ICEBLOOD_GRAVE: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_ICE); + case BG_AV_NODES_TOWER_POINT: return GetAcoreString(LANG_BG_AV_NODE_TOWER_POINT); + case BG_AV_NODES_FROSTWOLF_GRAVE: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_FROST); + case BG_AV_NODES_FROSTWOLF_ETOWER: return GetAcoreString(LANG_BG_AV_NODE_TOWER_FROST_E); + case BG_AV_NODES_FROSTWOLF_WTOWER: return GetAcoreString(LANG_BG_AV_NODE_TOWER_FROST_W); + case BG_AV_NODES_FROSTWOLF_HUT: return GetAcoreString(LANG_BG_AV_NODE_GRAVE_FROST_HUT); default: sLog->outError("tried to get name for node %u", node); break; diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index 8484f57a2d..87e66d90db 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CALENDARMGR_H -#define TRINITY_CALENDARMGR_H +#ifndef ACORE_CALENDARMGR_H +#define ACORE_CALENDARMGR_H #include <ace/Singleton.h> #include "Common.h" diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index 04822a6928..c814836748 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -3,8 +3,8 @@ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_CHANNELMGR_H -#define __TRINITY_CHANNELMGR_H +#ifndef __ACORE_CHANNELMGR_H +#define __ACORE_CHANNELMGR_H #include "Common.h" #include "Channel.h" diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 9ceb80dd4f..5308dc37f0 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -61,7 +61,7 @@ std::vector<ChatCommand> const& ChatHandler::getCommandTable() std::string ChatHandler::PGetParseString(uint32 entry, ...) const { - const char *format = GetTrinityString(entry); + const char *format = GetAcoreString(entry); char str[1024]; va_list ap; va_start(ap, entry); @@ -70,9 +70,9 @@ std::string ChatHandler::PGetParseString(uint32 entry, ...) const return std::string(str); } -char const* ChatHandler::GetTrinityString(uint32 entry) const +char const* ChatHandler::GetAcoreString(uint32 entry) const { - return m_session->GetTrinityString(entry); + return m_session->GetAcoreString(entry); } bool ChatHandler::isAvailable(ChatCommand const& cmd) const @@ -211,12 +211,12 @@ void ChatHandler::SendGlobalGMSysMessage(const char *str) void ChatHandler::SendSysMessage(uint32 entry) { - SendSysMessage(GetTrinityString(entry)); + SendSysMessage(GetAcoreString(entry)); } void ChatHandler::PSendSysMessage(uint32 entry, ...) { - const char *format = GetTrinityString(entry); + const char *format = GetAcoreString(entry); va_list ap; char str [2048]; va_start(ap, entry); @@ -886,8 +886,8 @@ GameObject* ChatHandler::GetNearbyGameObject() Player* pl = m_session->GetPlayer(); GameObject* obj = NULL; - Trinity::NearestGameObjectCheck check(*pl); - Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectCheck> searcher(pl, obj, check); + acore::NearestGameObjectCheck check(*pl); + acore::GameObjectLastSearcher<acore::NearestGameObjectCheck> searcher(pl, obj, check); pl->VisitNearbyGridObject(SIZE_OF_GRIDS, searcher); return obj; } @@ -904,13 +904,13 @@ GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid if (!obj && sObjectMgr->GetGOData(lowguid)) // guid is DB guid of object { // search near player then - CellCoord p(Trinity::ComputeCellCoord(pl->GetPositionX(), pl->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(pl->GetPositionX(), pl->GetPositionY())); Cell cell(p); - Trinity::GameObjectWithDbGUIDCheck go_check(lowguid); - Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(pl, obj, go_check); + acore::GameObjectWithDbGUIDCheck go_check(lowguid); + acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck> checker(pl, obj, go_check); - TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker); + TypeContainerVisitor<acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker); cell.Visit(p, object_checker, *pl->GetMap(), *pl, pl->GetGridActivationRange()); } @@ -1217,9 +1217,9 @@ std::string ChatHandler::GetNameLink(Player* chr) const return playerLink(chr->GetName()); } -char const* CliHandler::GetTrinityString(uint32 entry) const +char const* CliHandler::GetAcoreString(uint32 entry) const { - return sObjectMgr->GetTrinityStringForDBCLocale(entry); + return sObjectMgr->GetAcoreStringForDBCLocale(entry); } bool CliHandler::isAvailable(ChatCommand const& cmd) const @@ -1236,7 +1236,7 @@ void CliHandler::SendSysMessage(const char *str) std::string CliHandler::GetNameLink() const { - return GetTrinityString(LANG_CONSOLE_COMMAND); + return GetAcoreString(LANG_CONSOLE_COMMAND); } bool CliHandler::needReportToTarget(Player* /*chr*/) const diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 6d44604994..daa7fe8e9c 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -56,7 +56,7 @@ class ChatHandler static char* LineFromMessage(char*& pos) { char* start = strtok(pos, "\n"); pos = NULL; return start; } // function with different implementation for chat/console - virtual char const* GetTrinityString(uint32 entry) const; + virtual char const* GetAcoreString(uint32 entry) const; virtual void SendSysMessage(char const* str); void SendSysMessage(uint32 entry); @@ -139,7 +139,7 @@ class CliHandler : public ChatHandler explicit CliHandler(void* callbackArg, Print* zprint) : m_callbackArg(callbackArg), m_print(zprint) {} // overwrite functions - char const* GetTrinityString(uint32 entry) const override; + char const* GetAcoreString(uint32 entry) const override; bool isAvailable(ChatCommand const& cmd) const override; void SendSysMessage(const char *str) override; std::string GetNameLink() const override; diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 2c63997388..2dcb349a81 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -279,7 +279,7 @@ void ThreatContainer::modifyThreatPercent(Unit* victim, int32 percent) void ThreatContainer::update() { if (iDirty && iThreatList.size() > 1) - iThreatList.sort(Trinity::ThreatOrderPred()); + iThreatList.sort(acore::ThreatOrderPred()); iDirty = false; } diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index 7e8fd6ccee..395ea7e822 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -259,7 +259,7 @@ class ThreatManager //================================================= -namespace Trinity +namespace acore { // Binary predicate for sorting HostileReferences based on threat value class ThreatOrderPred diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 3085462745..7600b7a867 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CONDITIONMGR_H -#define TRINITY_CONDITIONMGR_H +#ifndef ACORE_CONDITIONMGR_H +#define ACORE_CONDITIONMGR_H #include "Define.h" #include "Errors.h" diff --git a/src/server/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h index 5974a178e8..852af76411 100644 --- a/src/server/game/Conditions/DisableMgr.h +++ b/src/server/game/Conditions/DisableMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_DISABLEMGR_H -#define TRINITY_DISABLEMGR_H +#ifndef ACORE_DISABLEMGR_H +#define ACORE_DISABLEMGR_H #include "Define.h" @@ -53,4 +53,4 @@ namespace DisableMgr void CheckQuestDisables(); } -#endif //TRINITY_DISABLEMGR_H +#endif //ACORE_DISABLEMGR_H diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index 3c64658d41..a8549b314f 100644 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_DBCSTORES_H -#define TRINITY_DBCSTORES_H +#ifndef ACORE_DBCSTORES_H +#define ACORE_DBCSTORES_H #include "Common.h" #include "DBCStore.h" diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 6ee68b30d4..111f7bf296 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_DBCSTRUCTURE_H -#define TRINITY_DBCSTRUCTURE_H +#ifndef ACORE_DBCSTRUCTURE_H +#define ACORE_DBCSTRUCTURE_H #include "Common.h" #include "DBCEnums.h" diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 85bde05b44..d4d04325e4 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_DBCSFRM_H -#define TRINITY_DBCSFRM_H +#ifndef ACORE_DBCSFRM_H +#define ACORE_DBCSFRM_H char const Achievementfmt[] = "niixssssssssssssssssxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxxxxxxxxii"; const std::string CustomAchievementfmt="pppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapapaaaaaaaaaaaaaaaaaapp"; diff --git a/src/server/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp index e6582cd1cd..6aa1ea315e 100644 --- a/src/server/game/DungeonFinding/LFG.cpp +++ b/src/server/game/DungeonFinding/LFG.cpp @@ -31,31 +31,31 @@ namespace lfg std::string rolesstr = ""; if (roles & PLAYER_ROLE_TANK) - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_TANK)); + rolesstr.append(sObjectMgr->GetAcoreStringForDBCLocale(LANG_LFG_ROLE_TANK)); if (roles & PLAYER_ROLE_HEALER) { if (!rolesstr.empty()) rolesstr.append(", "); - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_HEALER)); + rolesstr.append(sObjectMgr->GetAcoreStringForDBCLocale(LANG_LFG_ROLE_HEALER)); } if (roles & PLAYER_ROLE_DAMAGE) { if (!rolesstr.empty()) rolesstr.append(", "); - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_DAMAGE)); + rolesstr.append(sObjectMgr->GetAcoreStringForDBCLocale(LANG_LFG_ROLE_DAMAGE)); } if (roles & PLAYER_ROLE_LEADER) { if (!rolesstr.empty()) rolesstr.append(", "); - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_LEADER)); + rolesstr.append(sObjectMgr->GetAcoreStringForDBCLocale(LANG_LFG_ROLE_LEADER)); } if (rolesstr.empty()) - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_NONE)); + rolesstr.append(sObjectMgr->GetAcoreStringForDBCLocale(LANG_LFG_ROLE_NONE)); return rolesstr; } @@ -91,7 +91,7 @@ namespace lfg break; } - return std::string(sObjectMgr->GetTrinityStringForDBCLocale(entry)); + return std::string(sObjectMgr->GetAcoreStringForDBCLocale(entry)); } } // namespace lfg diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index 30ae2a4ec4..676a9cbe56 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -412,7 +412,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(Lfg5Guids const& checkWith, const proposal.cancelTime = time(NULL) + LFG_TIME_PROPOSAL; proposal.state = LFG_PROPOSAL_INITIATING; proposal.leader = 0; - proposal.dungeonId = Trinity::Containers::SelectRandomContainerElement(proposalDungeons); + proposal.dungeonId = acore::Containers::SelectRandomContainerElement(proposalDungeons); bool leader = false; for (LfgRolesMap::const_iterator itRoles = proposalRoles.begin(); itRoles != proposalRoles.end(); ++itRoles) diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 608a2f1a6c..c490033456 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -79,7 +79,7 @@ bool Corpse::Create(uint32 guidlow, Player* owner) SetObjectScale(1); SetUInt64Value(CORPSE_FIELD_OWNER, owner->GetGUID()); - _gridCoord = Trinity::ComputeGridCoord(GetPositionX(), GetPositionY()); + _gridCoord = acore::ComputeGridCoord(GetPositionX(), GetPositionY()); return true; } @@ -173,7 +173,7 @@ bool Corpse::LoadCorpseFromDB(uint32 guid, Field* fields) return false; } - _gridCoord = Trinity::ComputeGridCoord(GetPositionX(), GetPositionY()); + _gridCoord = acore::ComputeGridCoord(GetPositionX(), GetPositionY()); return true; } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 6612fdba90..ba7a7bda66 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -759,13 +759,13 @@ void Creature::DoFleeToGetAssistance() { Creature* creature = NULL; - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); - Trinity::NearestAssistCreatureInCreatureRangeCheck u_check(this, GetVictim(), radius); - Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck> searcher(this, creature, u_check); + acore::NearestAssistCreatureInCreatureRangeCheck u_check(this, GetVictim(), radius); + acore::CreatureLastSearcher<acore::NearestAssistCreatureInCreatureRangeCheck> searcher(this, creature, u_check); - TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); + TypeContainerVisitor<acore::CreatureLastSearcher<acore::NearestAssistCreatureInCreatureRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); cell.Visit(p, grid_creature_searcher, *GetMap(), *this, radius); @@ -1846,7 +1846,7 @@ SpellInfo const* Creature::reachWithSpellCure(Unit* victim) // select nearest hostile unit within the given distance (regardless of threat list). Unit* Creature::SelectNearestTarget(float dist, bool playerOnly /* = false */) const { - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); @@ -1856,11 +1856,11 @@ Unit* Creature::SelectNearestTarget(float dist, bool playerOnly /* = false */) c if (dist == 0.0f) dist = MAX_SEARCHER_DISTANCE; - Trinity::NearestHostileUnitCheck u_check(this, dist, playerOnly); - Trinity::UnitLastSearcher<Trinity::NearestHostileUnitCheck> searcher(this, target, u_check); + acore::NearestHostileUnitCheck u_check(this, dist, playerOnly); + acore::UnitLastSearcher<acore::NearestHostileUnitCheck> searcher(this, target, u_check); - TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); - TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); + TypeContainerVisitor<acore::UnitLastSearcher<acore::NearestHostileUnitCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); + TypeContainerVisitor<acore::UnitLastSearcher<acore::NearestHostileUnitCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); cell.Visit(p, world_unit_searcher, *GetMap(), *this, dist); cell.Visit(p, grid_unit_searcher, *GetMap(), *this, dist); @@ -1872,7 +1872,7 @@ Unit* Creature::SelectNearestTarget(float dist, bool playerOnly /* = false */) c // select nearest hostile unit within the given attack distance (i.e. distance is ignored if > than ATTACK_DISTANCE), regardless of threat list. Unit* Creature::SelectNearestTargetInAttackDistance(float dist) const { - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); @@ -1884,11 +1884,11 @@ Unit* Creature::SelectNearestTargetInAttackDistance(float dist) const dist = MAX_SEARCHER_DISTANCE; { - Trinity::NearestHostileUnitInAttackDistanceCheck u_check(this, dist); - Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck> searcher(this, target, u_check); + acore::NearestHostileUnitInAttackDistanceCheck u_check(this, dist); + acore::UnitLastSearcher<acore::NearestHostileUnitInAttackDistanceCheck> searcher(this, target, u_check); - TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); - TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); + TypeContainerVisitor<acore::UnitLastSearcher<acore::NearestHostileUnitInAttackDistanceCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); + TypeContainerVisitor<acore::UnitLastSearcher<acore::NearestHostileUnitInAttackDistanceCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); cell.Visit(p, world_unit_searcher, *GetMap(), *this, dist); cell.Visit(p, grid_unit_searcher, *GetMap(), *this, dist); @@ -1924,14 +1924,14 @@ void Creature::CallAssistance() std::list<Creature*> assistList; { - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); - Trinity::AnyAssistCreatureInRangeCheck u_check(this, GetVictim(), radius); - Trinity::CreatureListSearcher<Trinity::AnyAssistCreatureInRangeCheck> searcher(this, assistList, u_check); + acore::AnyAssistCreatureInRangeCheck u_check(this, GetVictim(), radius); + acore::CreatureListSearcher<acore::AnyAssistCreatureInRangeCheck> searcher(this, assistList, u_check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AnyAssistCreatureInRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AnyAssistCreatureInRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); cell.Visit(p, grid_creature_searcher, *GetMap(), *this, radius); } @@ -1956,14 +1956,14 @@ void Creature::CallForHelp(float radius) if (radius <= 0.0f || !GetVictim() || IsPet() || IsCharmed()) return; - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); cell.SetNoCreate(); - Trinity::CallOfHelpCreatureInRangeDo u_do(this, GetVictim(), radius); - Trinity::CreatureWorker<Trinity::CallOfHelpCreatureInRangeDo> worker(this, u_do); + acore::CallOfHelpCreatureInRangeDo u_do(this, GetVictim(), radius); + acore::CreatureWorker<acore::CallOfHelpCreatureInRangeDo> worker(this, u_do); - TypeContainerVisitor<Trinity::CreatureWorker<Trinity::CallOfHelpCreatureInRangeDo>, GridTypeMapContainer > grid_creature_searcher(worker); + TypeContainerVisitor<acore::CreatureWorker<acore::CallOfHelpCreatureInRangeDo>, GridTypeMapContainer > grid_creature_searcher(worker); cell.Visit(p, grid_creature_searcher, *GetMap(), *this, radius); } @@ -2585,7 +2585,7 @@ std::string const& Creature::GetNameForLocaleIdx(LocaleConstant loc_idx) const void Creature::SetPosition(float x, float y, float z, float o) { - if (!Trinity::IsValidMapCoord(x, y, z, o)) + if (!acore::IsValidMapCoord(x, y, z, o)) return; GetMap()->CreatureRelocation(this, x, y, z, o); diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 2c2bdabe65..a68d046a5b 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -258,8 +258,8 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z, bool run) float dy = y + sin(followAngle + pathAngle) * followDist; float dz = z; - Trinity::NormalizeMapCoord(dx); - Trinity::NormalizeMapCoord(dy); + acore::NormalizeMapCoord(dx); + acore::NormalizeMapCoord(dy); member->UpdateGroundPositionZ(dx, dy, dz); diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index ffabc9fd40..054e03c626 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -25,7 +25,6 @@ GossipMenu::~GossipMenu() void GossipMenu::AddMenuItem(int32 menuItemId, uint8 icon, std::string const& message, uint32 sender, uint32 action, std::string const& boxMessage, uint32 boxMoney, bool coded /*= false*/) { - //TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetLock()); ASSERT(_menuItems.size() <= GOSSIP_MAX_MENU_ITEMS); // Find a free new id - script case @@ -120,7 +119,6 @@ void GossipMenu::AddMenuItem(uint32 menuId, uint32 menuItemId, uint32 sender, ui void GossipMenu::AddGossipMenuItemData(uint32 menuItemId, uint32 gossipActionMenuId, uint32 gossipActionPoi) { - //TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetLock()); GossipMenuItemData& itemData = _menuItemData[menuItemId]; itemData.GossipActionMenuId = gossipActionMenuId; @@ -129,7 +127,6 @@ void GossipMenu::AddGossipMenuItemData(uint32 menuItemId, uint32 gossipActionMen uint32 GossipMenu::GetMenuItemSender(uint32 menuItemId) const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); GossipMenuItemContainer::const_iterator itr = _menuItems.find(menuItemId); if (itr == _menuItems.end()) return 0; @@ -139,7 +136,6 @@ uint32 GossipMenu::GetMenuItemSender(uint32 menuItemId) const uint32 GossipMenu::GetMenuItemAction(uint32 menuItemId) const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); GossipMenuItemContainer::const_iterator itr = _menuItems.find(menuItemId); if (itr == _menuItems.end()) return 0; @@ -149,7 +145,6 @@ uint32 GossipMenu::GetMenuItemAction(uint32 menuItemId) const bool GossipMenu::IsMenuItemCoded(uint32 menuItemId) const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); GossipMenuItemContainer::const_iterator itr = _menuItems.find(menuItemId); if (itr == _menuItems.end()) return false; @@ -159,7 +154,6 @@ bool GossipMenu::IsMenuItemCoded(uint32 menuItemId) const void GossipMenu::ClearMenu() { - //TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetLock()); _menuItems.clear(); _menuItemData.clear(); } @@ -281,8 +275,6 @@ void QuestMenu::AddMenuItem(uint32 QuestId, uint8 Icon) if (!sObjectMgr->GetQuestTemplate(QuestId)) return; - //TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetLock()); - ASSERT(_questMenuItems.size() <= GOSSIP_MAX_MENU_ITEMS); QuestMenuItem questMenuItem; @@ -295,7 +287,6 @@ void QuestMenu::AddMenuItem(uint32 QuestId, uint8 Icon) bool QuestMenu::HasItem(uint32 questId) const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); for (QuestMenuItemList::const_iterator i = _questMenuItems.begin(); i != _questMenuItems.end(); ++i) if (i->QuestId == questId) return true; @@ -305,7 +296,6 @@ bool QuestMenu::HasItem(uint32 questId) const void QuestMenu::ClearMenu() { - //TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetLock()); _questMenuItems.clear(); } diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h index 0433fbfce4..67278c4fff 100644 --- a/src/server/game/Entities/Creature/GossipDef.h +++ b/src/server/game/Entities/Creature/GossipDef.h @@ -163,19 +163,16 @@ class GossipMenu uint32 GetMenuItemCount() const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); return _menuItems.size(); } bool Empty() const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); return _menuItems.empty(); } GossipMenuItem const* GetItem(uint32 id) const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); GossipMenuItemContainer::const_iterator itr = _menuItems.find(id); if (itr != _menuItems.end()) return &itr->second; @@ -185,7 +182,6 @@ class GossipMenu GossipMenuItemData const* GetItemData(uint32 indexId) const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); GossipMenuItemDataContainer::const_iterator itr = _menuItemData.find(indexId); if (itr != _menuItemData.end()) return &itr->second; @@ -204,9 +200,6 @@ class GossipMenu return _menuItems; } - //ACE_RW_Thread_Mutex& GetLock() const { return *(const_cast<ACE_RW_Thread_Mutex*>(&_menuLock)); } - //ACE_RW_Thread_Mutex _menuLock; // pussywizard - private: GossipMenuItemContainer _menuItems; GossipMenuItemDataContainer _menuItemData; @@ -225,13 +218,11 @@ class QuestMenu uint8 GetMenuItemCount() const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); return _questMenuItems.size(); } bool Empty() const { - //TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, GetLock()); return _questMenuItems.empty(); } @@ -239,13 +230,9 @@ class QuestMenu QuestMenuItem const& GetItem(uint16 index) const { - //TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, GetLock()); return _questMenuItems[index]; } - //ACE_RW_Thread_Mutex& GetLock() const { return *(const_cast<ACE_RW_Thread_Mutex*>(&_menuLock)); } - //ACE_RW_Thread_Mutex _menuLock; // pussywizard - private: QuestMenuItemList _questMenuItems; }; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 32a261716c..eb472998c1 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -453,7 +453,7 @@ void GameObject::Update(uint32 diff) if (info->summoningRitual.casterTargetSpell && info->summoningRitual.casterTargetSpell != 1) // No idea why this field is a bool in some cases for (uint32 i = 0; i < info->summoningRitual.casterTargetSpellTargets; i++) // m_unique_users can contain only player GUIDs - if (Player* target = ObjectAccessor::GetPlayer(*this, Trinity::Containers::SelectRandomContainerElement(m_unique_users))) + if (Player* target = ObjectAccessor::GetPlayer(*this, acore::Containers::SelectRandomContainerElement(m_unique_users))) spellCaster->CastSpell(target, info->summoningRitual.casterTargetSpell, true); // finish owners spell @@ -601,8 +601,8 @@ void GameObject::Update(uint32 diff) // search unfriendly creature if (owner) // hunter trap { - Trinity::AnyUnfriendlyNoTotemUnitInObjectRangeCheck checker(this, owner, radius); - Trinity::UnitSearcher<Trinity::AnyUnfriendlyNoTotemUnitInObjectRangeCheck> searcher(this, target, checker); + acore::AnyUnfriendlyNoTotemUnitInObjectRangeCheck checker(this, owner, radius); + acore::UnitSearcher<acore::AnyUnfriendlyNoTotemUnitInObjectRangeCheck> searcher(this, target, checker); VisitNearbyGridObject(radius, searcher); if (!target) VisitNearbyWorldObject(radius, searcher); @@ -612,8 +612,8 @@ void GameObject::Update(uint32 diff) // environmental damage spells already have around enemies targeting but this not help in case not existed GO casting support // affect only players Player* player = NULL; - Trinity::AnyPlayerInObjectRangeCheck checker(this, radius, true, true); - Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(this, player, checker); + acore::AnyPlayerInObjectRangeCheck checker(this, radius, true, true); + acore::PlayerSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(this, player, checker); VisitNearbyWorldObject(radius, searcher); target = player; } @@ -1170,13 +1170,13 @@ void GameObject::TriggeringLinkedGameObject(uint32 trapEntry, Unit* target) GameObject* trapGO = NULL; { // using original GO distance - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); - Trinity::NearestGameObjectEntryInObjectRangeCheck go_check(*target, trapEntry, range); - Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck> checker(this, trapGO, go_check); + acore::NearestGameObjectEntryInObjectRangeCheck go_check(*target, trapEntry, range); + acore::GameObjectLastSearcher<acore::NearestGameObjectEntryInObjectRangeCheck> checker(this, trapGO, go_check); - TypeContainerVisitor<Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer > object_checker(checker); + TypeContainerVisitor<acore::GameObjectLastSearcher<acore::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer > object_checker(checker); cell.Visit(p, object_checker, *GetMap(), *target, range); } @@ -1190,12 +1190,12 @@ GameObject* GameObject::LookupFishingHoleAround(float range) { GameObject* ok = NULL; - CellCoord p(Trinity::ComputeCellCoord(GetPositionX(), GetPositionY())); + CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); - Trinity::NearestGameObjectFishingHole u_check(*this, range); - Trinity::GameObjectSearcher<Trinity::NearestGameObjectFishingHole> checker(this, ok, u_check); + acore::NearestGameObjectFishingHole u_check(*this, range); + acore::GameObjectSearcher<acore::NearestGameObjectFishingHole> checker(this, ok, u_check); - TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::NearestGameObjectFishingHole>, GridTypeMapContainer > grid_object_checker(checker); + TypeContainerVisitor<acore::GameObjectSearcher<acore::NearestGameObjectFishingHole>, GridTypeMapContainer > grid_object_checker(checker); cell.Visit(p, grid_object_checker, *GetMap(), *this, range); return ok; @@ -1951,7 +1951,7 @@ void GameObject::SendMessageToSetInRange(WorldPacket* data, float dist, bool /*s dist += GetObjectSize(); if (includeMargin) dist += VISIBILITY_COMPENSATION * 2.0f; // pussywizard: to ensure everyone receives all important packets - Trinity::MessageDistDeliverer notifier(this, data, dist, false, skipped_rcvr); + acore::MessageDistDeliverer notifier(this, data, dist, false, skipped_rcvr); VisitNearbyWorldObject(dist, notifier); } @@ -2455,7 +2455,7 @@ void GameObject::SetPosition(float x, float y, float z, float o) { // pussywizard: do not call for MotionTransport and other gobjects not in grid - if (!Trinity::IsValidMapCoord(x, y, z, o)) + if (!acore::IsValidMapCoord(x, y, z, o)) return; GetMap()->GameObjectRelocation(this, x, y, z, o); diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h index def5d187a9..5955845745 100644 --- a/src/server/game/Entities/Item/Container/Bag.h +++ b/src/server/game/Entities/Item/Container/Bag.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_BAG_H -#define TRINITY_BAG_H +#ifndef ACORE_BAG_H +#define ACORE_BAG_H // Maximum 36 Slots ((CONTAINER_END - CONTAINER_FIELD_SLOT_1)/2 #define MAX_BAG_SIZE 36 // 2.0.12 diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 2e14b7ba11..4b760a9032 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1421,8 +1421,8 @@ void WorldObject::GetRandomPoint(const Position &pos, float distance, float &ran rand_y = pos.m_positionY + new_dist * sin(angle); rand_z = pos.m_positionZ; - Trinity::NormalizeMapCoord(rand_x); - Trinity::NormalizeMapCoord(rand_y); + acore::NormalizeMapCoord(rand_x); + acore::NormalizeMapCoord(rand_y); UpdateGroundPositionZ(rand_x, rand_y, rand_z); // update to LOS height if available } @@ -1503,7 +1503,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const bool Position::IsPositionValid() const { - return Trinity::IsValidMapCoord(m_positionX, m_positionY, m_positionZ, m_orientation); + return acore::IsValidMapCoord(m_positionX, m_positionY, m_positionZ, m_orientation); } float WorldObject::GetGridActivationRange() const @@ -1871,7 +1871,7 @@ void Object::ForceValuesUpdateAtIndex(uint32 i) } } -namespace Trinity +namespace acore { class MonsterChatBuilder { @@ -1919,61 +1919,61 @@ namespace Trinity Language i_language; WorldObject const* i_target; }; -} // namespace Trinity +} // namespace acore void WorldObject::MonsterSay(const char* text, uint32 language, WorldObject const* target) { - CellCoord p = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPositionX(), GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::MonsterCustomChatBuilder say_build(this, CHAT_MSG_MONSTER_SAY, text, language, target); - Trinity::LocalizedPacketDo<Trinity::MonsterCustomChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterCustomChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterCustomChatBuilder> >, WorldTypeMapContainer > message(say_worker); + acore::MonsterCustomChatBuilder say_build(this, CHAT_MSG_MONSTER_SAY, text, language, target); + acore::LocalizedPacketDo<acore::MonsterCustomChatBuilder> say_do(say_build); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterCustomChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterCustomChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY)); } void WorldObject::MonsterSay(int32 textId, uint32 language, WorldObject const* target) { - CellCoord p = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPositionX(), GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::MonsterChatBuilder say_build(this, CHAT_MSG_MONSTER_SAY, textId, language, target); - Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); + acore::MonsterChatBuilder say_build(this, CHAT_MSG_MONSTER_SAY, textId, language, target); + acore::LocalizedPacketDo<acore::MonsterChatBuilder> say_do(say_build); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY)); } void WorldObject::MonsterYell(const char* text, uint32 language, WorldObject const* target) { - CellCoord p = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPositionX(), GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::MonsterCustomChatBuilder say_build(this, CHAT_MSG_MONSTER_YELL, text, language, target); - Trinity::LocalizedPacketDo<Trinity::MonsterCustomChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterCustomChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL), say_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterCustomChatBuilder> >, WorldTypeMapContainer > message(say_worker); + acore::MonsterCustomChatBuilder say_build(this, CHAT_MSG_MONSTER_YELL, text, language, target); + acore::LocalizedPacketDo<acore::MonsterCustomChatBuilder> say_do(say_build); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterCustomChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL), say_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterCustomChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL)); } void WorldObject::MonsterYell(int32 textId, uint32 language, WorldObject const* target) { - CellCoord p = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPositionX(), GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::MonsterChatBuilder say_build(this, CHAT_MSG_MONSTER_YELL, textId, language, target); - Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL), say_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); + acore::MonsterChatBuilder say_build(this, CHAT_MSG_MONSTER_YELL, textId, language, target); + acore::LocalizedPacketDo<acore::MonsterChatBuilder> say_do(say_build); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL), say_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL)); } @@ -1987,15 +1987,15 @@ void WorldObject::MonsterTextEmote(const char* text, WorldObject const* target, void WorldObject::MonsterTextEmote(int32 textId, WorldObject const* target, bool IsBossEmote) { - CellCoord p = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPositionX(), GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::MonsterChatBuilder say_build(this, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, textId, LANG_UNIVERSAL, target); - Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this, (IsBossEmote ? 200.0f : sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)), say_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); + acore::MonsterChatBuilder say_build(this, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, textId, LANG_UNIVERSAL, target); + acore::LocalizedPacketDo<acore::MonsterChatBuilder> say_do(say_build); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterChatBuilder> > say_worker(this, (IsBossEmote ? 200.0f : sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)), say_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, (IsBossEmote ? 200.0f : sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE))); } @@ -2043,7 +2043,7 @@ void WorldObject::SendMessageToSetInRange(WorldPacket* data, float dist, bool /* dist += GetObjectSize(); if (includeMargin) dist += VISIBILITY_COMPENSATION; // pussywizard: to ensure everyone receives all important packets - Trinity::MessageDistDeliverer notifier(this, data, dist, false, skipped_rcvr); + acore::MessageDistDeliverer notifier(this, data, dist, false, skipped_rcvr); VisitNearbyWorldObject(dist, notifier); } @@ -2370,8 +2370,8 @@ void WorldObject::SummonCreatureGroup(uint8 group, std::list<TempSummon*>* list Creature* WorldObject::FindNearestCreature(uint32 entry, float range, bool alive) const { Creature* creature = NULL; - Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck checker(*this, entry, alive, range); - Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(this, creature, checker); + acore::NearestCreatureEntryWithLiveStateInObjectRangeCheck checker(*this, entry, alive, range); + acore::CreatureLastSearcher<acore::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(this, creature, checker); VisitNearbyObject(range, searcher); return creature; } @@ -2379,8 +2379,8 @@ Creature* WorldObject::FindNearestCreature(uint32 entry, float range, bool alive GameObject* WorldObject::FindNearestGameObject(uint32 entry, float range) const { GameObject* go = NULL; - Trinity::NearestGameObjectEntryInObjectRangeCheck checker(*this, entry, range); - Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck> searcher(this, go, checker); + acore::NearestGameObjectEntryInObjectRangeCheck checker(*this, entry, range); + acore::GameObjectLastSearcher<acore::NearestGameObjectEntryInObjectRangeCheck> searcher(this, go, checker); VisitNearbyGridObject(range, searcher); return go; } @@ -2388,8 +2388,8 @@ GameObject* WorldObject::FindNearestGameObject(uint32 entry, float range) const GameObject* WorldObject::FindNearestGameObjectOfType(GameobjectTypes type, float range) const { GameObject* go = NULL; - Trinity::NearestGameObjectTypeInObjectRangeCheck checker(*this, type, range); - Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectTypeInObjectRangeCheck> searcher(this, go, checker); + acore::NearestGameObjectTypeInObjectRangeCheck checker(*this, type, range); + acore::GameObjectLastSearcher<acore::NearestGameObjectTypeInObjectRangeCheck> searcher(this, go, checker); VisitNearbyGridObject(range, searcher); return go; } @@ -2398,8 +2398,8 @@ Player* WorldObject::SelectNearestPlayer(float distance) const { Player* target = NULL; - Trinity::NearestPlayerInObjectRangeCheck checker(this, distance); - Trinity::PlayerLastSearcher<Trinity::NearestPlayerInObjectRangeCheck> searcher(this, target, checker); + acore::NearestPlayerInObjectRangeCheck checker(this, distance); + acore::PlayerLastSearcher<acore::NearestPlayerInObjectRangeCheck> searcher(this, target, checker); VisitNearbyObject(distance, searcher); return target; @@ -2407,32 +2407,32 @@ Player* WorldObject::SelectNearestPlayer(float distance) const void WorldObject::GetGameObjectListWithEntryInGrid(std::list<GameObject*>& gameobjectList, uint32 entry, float maxSearchRange) const { - CellCoord pair(Trinity::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllGameObjectsWithEntryInRange check(this, entry, maxSearchRange); - Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInRange> searcher(this, gameobjectList, check); - TypeContainerVisitor<Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInRange>, GridTypeMapContainer> visitor(searcher); + acore::AllGameObjectsWithEntryInRange check(this, entry, maxSearchRange); + acore::GameObjectListSearcher<acore::AllGameObjectsWithEntryInRange> searcher(this, gameobjectList, check); + TypeContainerVisitor<acore::GameObjectListSearcher<acore::AllGameObjectsWithEntryInRange>, GridTypeMapContainer> visitor(searcher); cell.Visit(pair, visitor, *(this->GetMap()), *this, maxSearchRange); } void WorldObject::GetCreatureListWithEntryInGrid(std::list<Creature*>& creatureList, uint32 entry, float maxSearchRange) const { - CellCoord pair(Trinity::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllCreaturesOfEntryInRange check(this, entry, maxSearchRange); - Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(this, creatureList, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> visitor(searcher); + acore::AllCreaturesOfEntryInRange check(this, entry, maxSearchRange); + acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange> searcher(this, creatureList, check); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange>, GridTypeMapContainer> visitor(searcher); cell.Visit(pair, visitor, *(this->GetMap()), *this, maxSearchRange); } /* -namespace Trinity +namespace acore { class NearUsedPosDo { @@ -2501,7 +2501,7 @@ namespace Trinity float i_angle; ObjectPosSelector& i_selector; }; -} // namespace Trinity +} // namespace acore */ //=================================================================================================== @@ -2511,8 +2511,8 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs x = GetPositionX() + (GetObjectSize() + distance2d) * cos(absAngle); y = GetPositionY() + (GetObjectSize() + distance2d) * sin(absAngle); - Trinity::NormalizeMapCoord(x); - Trinity::NormalizeMapCoord(y); + acore::NormalizeMapCoord(x); + acore::NormalizeMapCoord(y); } void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle) const @@ -2619,7 +2619,7 @@ void WorldObject::MovePosition(Position &pos, float dist, float angle) desty = pos.m_positionY + dist * sin(angle); // Prevent invalid coordinates here, position is unchanged - if (!Trinity::IsValidMapCoord(destx, desty)) + if (!acore::IsValidMapCoord(destx, desty)) { sLog->outCrash("WorldObject::MovePosition invalid coordinates X: %f and Y: %f were passed!", destx, desty); return; @@ -2649,8 +2649,8 @@ void WorldObject::MovePosition(Position &pos, float dist, float angle) pos.Relocate(destx, desty, destz); - Trinity::NormalizeMapCoord(pos.m_positionX); - Trinity::NormalizeMapCoord(pos.m_positionY); + acore::NormalizeMapCoord(pos.m_positionX); + acore::NormalizeMapCoord(pos.m_positionY); UpdateGroundPositionZ(pos.m_positionX, pos.m_positionY, pos.m_positionZ); pos.m_orientation = m_orientation; } @@ -2666,7 +2666,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float destz += 2.0f; // Prevent invalid coordinates here, position is unchanged - if (!Trinity::IsValidMapCoord(destx, desty)) + if (!acore::IsValidMapCoord(destx, desty)) { sLog->outCrash("WorldObject::MovePositionToFirstCollision invalid coordinates X: %f and Y: %f were passed!", destx, desty); return; @@ -2731,8 +2731,8 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float break; } - Trinity::NormalizeMapCoord(destx); - Trinity::NormalizeMapCoord(desty); + acore::NormalizeMapCoord(destx); + acore::NormalizeMapCoord(desty); UpdateAllowedPositionZ(destx, desty, destz); float ground = GetMap()->GetHeight(GetPhaseMask(), destx, desty, MAX_HEIGHT, true); @@ -2766,7 +2766,7 @@ void WorldObject::MovePositionToFirstCollisionForTotem(Position &pos, float dist destz = pos.GetPositionZ(); // Prevent invalid coordinates here, position is unchanged - if (!Trinity::IsValidMapCoord(destx, desty)) + if (!acore::IsValidMapCoord(destx, desty)) { sLog->outCrash("WorldObject::MovePositionToFirstCollision invalid coordinates X: %f and Y: %f were passed!", destx, desty); return; @@ -2842,8 +2842,8 @@ void WorldObject::MovePositionToFirstCollisionForTotem(Position &pos, float dist destz = prevdz; } - Trinity::NormalizeMapCoord(destx); - Trinity::NormalizeMapCoord(desty); + acore::NormalizeMapCoord(destx); + acore::NormalizeMapCoord(desty); pos.Relocate(destx, desty, destz); pos.m_orientation = m_orientation; @@ -2884,8 +2884,8 @@ void WorldObject::DestroyForNearbyPlayers() return; std::list<Player*> targets; - Trinity::AnyPlayerInObjectRangeCheck check(this, GetVisibilityRange()+VISIBILITY_COMPENSATION, false); - Trinity::PlayerListSearcherWithSharedVision<Trinity::AnyPlayerInObjectRangeCheck> searcher(this, targets, check); + acore::AnyPlayerInObjectRangeCheck check(this, GetVisibilityRange()+VISIBILITY_COMPENSATION, false); + acore::PlayerListSearcherWithSharedVision<acore::AnyPlayerInObjectRangeCheck> searcher(this, targets, check); VisitNearbyWorldObject(GetVisibilityRange()+VISIBILITY_COMPENSATION, searcher); for (std::list<Player*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) { @@ -2908,7 +2908,7 @@ void WorldObject::DestroyForNearbyPlayers() void WorldObject::UpdateObjectVisibility(bool /*forced*/, bool /*fromUpdate*/) { //updates object's visibility for nearby players - Trinity::VisibleChangesNotifier notifier(*this); + acore::VisibleChangesNotifier notifier(*this); VisitNearbyWorldObject(GetVisibilityRange()+VISIBILITY_COMPENSATION, notifier); } @@ -3013,7 +3013,7 @@ struct WorldObjectChangeAccumulator void WorldObject::BuildUpdate(UpdateDataMapType& data_map, UpdatePlayerSet& player_set) { - CellCoord p = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPositionX(), GetPositionY()); Cell cell(p); cell.SetNoCreate(); WorldObjectChangeAccumulator notifier(*this, data_map, player_set); @@ -3027,17 +3027,17 @@ void WorldObject::BuildUpdate(UpdateDataMapType& data_map, UpdatePlayerSet& play void WorldObject::GetCreaturesWithEntryInRange(std::list<Creature*> &creatureList, float radius, uint32 entry) { - CellCoord pair(Trinity::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(this->GetPositionX(), this->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllCreaturesOfEntryInRange check(this, entry, radius); - Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(this, creatureList, check); + acore::AllCreaturesOfEntryInRange check(this, entry, radius); + acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange> searcher(this, creatureList, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, WorldTypeMapContainer> world_visitor(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange>, WorldTypeMapContainer> world_visitor(searcher); cell.Visit(pair, world_visitor, *(this->GetMap()), *this, radius); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> grid_visitor(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange>, GridTypeMapContainer> grid_visitor(searcher); cell.Visit(pair, grid_visitor, *(this->GetMap()), *this, radius); } diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 2c68bcf003..165dd0cc30 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -1059,7 +1059,7 @@ class WorldObject : public Object, public WorldLocation bool CanDetectStealthOf(WorldObject const* obj, bool checkAlert = false) const; }; -namespace Trinity +namespace acore { // Binary predicate to sort WorldObjects based on the distance to a reference WorldObject class ObjectDistanceOrderPred diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 66219b6a52..1f2a98ced6 100644 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_OBJECTDEFINES_H -#define TRINITY_OBJECTDEFINES_H +#ifndef ACORE_OBJECTDEFINES_H +#define ACORE_OBJECTDEFINES_H #include "Define.h" diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 4dde7860cc..179bbbb5ec 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -482,7 +482,7 @@ inline void KillRewarder::_InitGroupData() _maxLevel = lvl; // 2.4. _maxNotGrayMember - maximum level of alive group member within reward distance, // for whom victim is not gray; - uint32 grayLevel = Trinity::XP::GetGrayLevel(lvl); + uint32 grayLevel = acore::XP::GetGrayLevel(lvl); if (_victim->getLevel() > grayLevel && (!_maxNotGrayMember || _maxNotGrayMember->getLevel() < lvl)) _maxNotGrayMember = member; } @@ -502,7 +502,7 @@ inline void KillRewarder::_InitXP(Player* player) // * otherwise, not in PvP; // * not if killer is on vehicle. if (_isBattleGround || (!_isPvP && !_killer->GetVehicle())) - _xp = Trinity::XP::Gain(player, _victim, _isBattleGround); + _xp = acore::XP::Gain(player, _victim, _isBattleGround); if (_xp && !_isBattleGround && _victim) // pussywizard: npcs with relatively low hp give lower exp if (_victim->GetTypeId() == TYPEID_UNIT) @@ -615,7 +615,7 @@ void KillRewarder::_RewardGroup() { // 3.1.2. Alter group rate if group is in raid (not for battlegrounds). const bool isRaid = !_isPvP && sMapStore.LookupEntry(_killer->GetMapId())->IsRaid() && _group->isRaidGroup(); - _groupRate = Trinity::XP::xp_in_group_rate(_count, isRaid); + _groupRate = acore::XP::xp_in_group_rate(_count, isRaid); } // 3.1.3. Reward each group member (even dead or corpse) within reward distance. @@ -5697,7 +5697,7 @@ void Player::UpdateLocalChannels(uint32 newZone) { // pussywizard: mutex needed (tc changed opcode to THREAD UNSAFE) static ACE_Thread_Mutex channelsLock; - TRINITY_GUARD(ACE_Thread_Mutex, channelsLock); + ACORE_GUARD(ACE_Thread_Mutex, channelsLock); if (GetSession()->PlayerLoading() && !IsBeingTeleportedFar()) return; // The client handles it automatically after loading, but not after teleporting @@ -5742,7 +5742,7 @@ void Player::UpdateLocalChannels(uint32 newZone) char const* currentNameExt; if (channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY) - currentNameExt = sObjectMgr->GetTrinityStringForDBCLocale(LANG_CHANNEL_CITY); + currentNameExt = sObjectMgr->GetAcoreStringForDBCLocale(LANG_CHANNEL_CITY); else currentNameExt = current_zone_name.c_str(); @@ -6387,7 +6387,7 @@ void Player::UpdateWeaponSkill(WeaponAttackType attType) void Player::UpdateCombatSkills(Unit* victim, WeaponAttackType attType, bool defence) { uint8 plevel = getLevel(); // if defense than victim == attacker - uint8 greylevel = Trinity::XP::GetGrayLevel(plevel); + uint8 greylevel = acore::XP::GetGrayLevel(plevel); uint8 moblevel = victim->getLevelForTarget(this); /*if (moblevel < greylevel) return;*/ // Patch 3.0.8 (2009-01-20): You can no longer skill up weapons on mobs that are immune to damage. @@ -6883,7 +6883,7 @@ void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self, b dist += GetObjectSize(); if (includeMargin) dist += VISIBILITY_COMPENSATION; // pussywizard: to ensure everyone receives all important packets - Trinity::MessageDistDeliverer notifier(this, data, dist, false, skipped_rcvr); + acore::MessageDistDeliverer notifier(this, data, dist, false, skipped_rcvr); VisitNearbyWorldObject(dist, notifier); } @@ -6893,7 +6893,7 @@ void Player::SendMessageToSetInRange_OwnTeam(WorldPacket* data, float dist, bool if (self) GetSession()->SendPacket(data); - Trinity::MessageDistDeliverer notifier(this, data, dist, true); + acore::MessageDistDeliverer notifier(this, data, dist, true); VisitNearbyWorldObject(dist, notifier); } @@ -7067,7 +7067,7 @@ int32 Player::CalculateReputationGain(ReputationSource source, uint32 creatureOr break; } - if (rate != 1.0f && creatureOrQuestLevel <= Trinity::XP::GetGrayLevel(getLevel())) + if (rate != 1.0f && creatureOrQuestLevel <= acore::XP::GetGrayLevel(getLevel())) percent *= rate; if (percent <= 0.0f) @@ -7299,7 +7299,7 @@ bool Player::RewardHonor(Unit* uVictim, uint32 groupsize, int32 honor, bool awar return false; uint8 k_level = getLevel(); - uint8 k_grey = Trinity::XP::GetGrayLevel(k_level); + uint8 k_grey = acore::XP::GetGrayLevel(k_level); uint8 v_level = victim->getLevel(); if (v_level <= k_grey) @@ -7326,7 +7326,7 @@ bool Player::RewardHonor(Unit* uVictim, uint32 groupsize, int32 honor, bool awar else victim_guid = 0; // Don't show HK: <rank> message, only log. - honor_f = ceil(Trinity::Honor::hk_honor_at_level_f(k_level) * (v_level - k_grey) / (k_level - k_grey)); + honor_f = ceil(acore::Honor::hk_honor_at_level_f(k_level) * (v_level - k_grey) / (k_level - k_grey)); // count the number of playerkills in one day ApplyModUInt32Value(PLAYER_FIELD_KILLS, 1, true); @@ -14112,7 +14112,7 @@ void Player::TradeCancel(bool sendback) void Player::UpdateSoulboundTradeItems() { - TRINITY_GUARD(ACE_Thread_Mutex, m_soulboundTradableLock); + ACORE_GUARD(ACE_Thread_Mutex, m_soulboundTradableLock); if (m_itemSoulboundTradeable.empty()) return; @@ -14136,14 +14136,14 @@ void Player::UpdateSoulboundTradeItems() void Player::AddTradeableItem(Item* item) { - TRINITY_GUARD(ACE_Thread_Mutex, m_soulboundTradableLock); + ACORE_GUARD(ACE_Thread_Mutex, m_soulboundTradableLock); m_itemSoulboundTradeable.push_back(item); } //TODO: should never allow an item to be added to m_itemSoulboundTradeable twice void Player::RemoveTradeableItem(Item* item) { - TRINITY_GUARD(ACE_Thread_Mutex, m_soulboundTradableLock); + ACORE_GUARD(ACE_Thread_Mutex, m_soulboundTradableLock); m_itemSoulboundTradeable.remove(item); } @@ -14991,7 +14991,7 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool } if (sWorld->getIntConfig(CONFIG_INSTANT_TAXI) == 2 && npcflags & UNIT_NPC_FLAG_FLIGHTMASTER) - menu->GetGossipMenu().AddMenuItem(-1, GOSSIP_ICON_INTERACT_1, GetSession()->GetTrinityString(LANG_TOGGLE_INSTANT_FLIGHT), 0, GOSSIP_ACTION_TOGGLE_INSTANT_FLIGHT, "", 0, false); // instant flight toggle option + menu->GetGossipMenu().AddMenuItem(-1, GOSSIP_ICON_INTERACT_1, GetSession()->GetAcoreString(LANG_TOGGLE_INSTANT_FLIGHT), 0, GOSSIP_ACTION_TOGGLE_INSTANT_FLIGHT, "", 0, false); // instant flight toggle option } void Player::SendPreparedGossip(WorldObject* source) @@ -18026,7 +18026,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) m_movementInfo.transport.pos.Relocate(x, y, z, o); m_transport->CalculatePassengerPosition(x, y, z, &o); - if (!Trinity::IsValidMapCoord(x, y, z, o) || std::fabs(m_movementInfo.transport.pos.GetPositionX()) > 75.0f || std::fabs(m_movementInfo.transport.pos.GetPositionY()) > 75.0f || std::fabs(m_movementInfo.transport.pos.GetPositionZ()) > 75.0f) + if (!acore::IsValidMapCoord(x, y, z, o) || std::fabs(m_movementInfo.transport.pos.GetPositionX()) > 75.0f || std::fabs(m_movementInfo.transport.pos.GetPositionY()) > 75.0f || std::fabs(m_movementInfo.transport.pos.GetPositionZ()) > 75.0f) { m_transport = NULL; m_movementInfo.transport.Reset(); @@ -18757,7 +18757,7 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff) // Send problematic items by mail while (!problematicItems.empty()) { - std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM); + std::string subject = GetSession()->GetAcoreString(LANG_NOT_EQUIPPED_ITEM); MailDraft draft(subject, "There were problems with equipping item(s)."); for (uint8 i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i) @@ -19543,7 +19543,7 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report if (DisableMgr::IsDisabledFor(DISABLE_TYPE_MAP, target_map, this)) { - GetSession()->SendAreaTriggerMessage("%s", GetSession()->GetTrinityString(LANG_INSTANCE_CLOSED)); + GetSession()->SendAreaTriggerMessage("%s", GetSession()->GetAcoreString(LANG_INSTANCE_CLOSED)); return false; } @@ -19574,9 +19574,9 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report else if (mapDiff->hasErrorMessage) // if (missingAchievement) covered by this case SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty); else if (missingItem) - GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1.c_str()); + GetSession()->SendAreaTriggerMessage(GetSession()->GetAcoreString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1.c_str()); else if (LevelMin) - GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin); + GetSession()->SendAreaTriggerMessage(GetSession()->GetAcoreString(LANG_LEVEL_MINREQUIRED), LevelMin); } return false; } @@ -20949,8 +20949,8 @@ void Player::TextEmote(const std::string& text) WorldPacket data; std::list<Player*> players; - Trinity::AnyPlayerInObjectRangeCheck checker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(this, players, checker); + acore::AnyPlayerInObjectRangeCheck checker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(this, players, checker); this->VisitNearbyWorldObject(sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE), searcher); for (auto const& itr : players) @@ -23040,10 +23040,10 @@ void Player::UpdateObjectVisibility(bool forced, bool fromUpdate) void Player::UpdateVisibilityForPlayer(bool mapChange) { - Trinity::VisibleNotifier notifierNoLarge(*this, mapChange, false); // visit only objects which are not large; default distance + acore::VisibleNotifier notifierNoLarge(*this, mapChange, false); // visit only objects which are not large; default distance m_seer->VisitNearbyObject(GetSightRange()+VISIBILITY_INC_FOR_GOBJECTS, notifierNoLarge); notifierNoLarge.SendToSelf(); - Trinity::VisibleNotifier notifierLarge(*this, mapChange, true); // visit only large objects; maximum distance + acore::VisibleNotifier notifierLarge(*this, mapChange, true); // visit only large objects; maximum distance m_seer->VisitNearbyObject(MAX_VISIBILITY_DISTANCE, notifierLarge); notifierLarge.SendToSelf(); @@ -23926,7 +23926,7 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/) offItem->DeleteFromInventoryDB(trans); // deletes item from character's inventory offItem->SaveToDB(trans); // recursive and not have transaction guard into self, item not in inventory and can be save standalone - std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM); + std::string subject = GetSession()->GetAcoreString(LANG_NOT_EQUIPPED_ITEM); MailDraft(subject, "There were problems with equipping one or several items").AddItem(offItem).SendMailTo(trans, this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED); CharacterDatabase.CommitTransaction(trans); @@ -24079,7 +24079,7 @@ uint32 Player::GetResurrectionSpellId() bool Player::isHonorOrXPTarget(Unit* victim) const { uint8 v_level = victim->getLevel(); - uint8 k_grey = Trinity::XP::GetGrayLevel(getLevel()); + uint8 k_grey = acore::XP::GetGrayLevel(getLevel()); // Victim level less gray level if (v_level <= k_grey) diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 2bfaee56c1..bc226ccf63 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_SOCIALMGR_H -#define __TRINITY_SOCIALMGR_H +#ifndef __ACORE_SOCIALMGR_H +#define __ACORE_SOCIALMGR_H #include <ace/Singleton.h> #include "DatabaseEnv.h" diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 7001d2bad5..ea17fc906b 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -250,7 +250,7 @@ void MotionTransport::UpdatePosition(float x, float y, float z, float o) void MotionTransport::AddPassenger(WorldObject* passenger, bool withAll) { - TRINITY_GUARD(ACE_Thread_Mutex, Lock); + ACORE_GUARD(ACE_Thread_Mutex, Lock); if (_passengers.insert(passenger).second) { if (Player* plr = passenger->ToPlayer()) @@ -275,7 +275,7 @@ void MotionTransport::AddPassenger(WorldObject* passenger, bool withAll) void MotionTransport::RemovePassenger(WorldObject* passenger, bool withAll) { - TRINITY_GUARD(ACE_Thread_Mutex, Lock); + ACORE_GUARD(ACE_Thread_Mutex, Lock); if (_passengers.erase(passenger) || _staticPassengers.erase(passenger)) { if (Player* plr = passenger->ToPlayer()) @@ -599,7 +599,7 @@ void MotionTransport::UpdatePassengerPositions(PassengerSet& passengers) CalculatePassengerPosition(x, y, z, &o); // check if position is valid - if (!Trinity::IsValidMapCoord(x, y, z)) + if (!acore::IsValidMapCoord(x, y, z)) continue; switch (passenger->GetTypeId()) @@ -865,7 +865,7 @@ void StaticTransport::RelocateToProgress(uint32 progress) float oriRotAngle = oriRotAngleCurr + percRot * (oriRotAngleNext - oriRotAngleCurr); // check if position is valid - if (!Trinity::IsValidMapCoord(pos.x, pos.y, pos.z)) + if (!acore::IsValidMapCoord(pos.x, pos.y, pos.z)) return; // update position to new one @@ -900,7 +900,7 @@ void StaticTransport::UpdatePassengerPositions() CalculatePassengerPosition(x, y, z, &o); // check if position is valid - if (!Trinity::IsValidMapCoord(x, y, z)) + if (!acore::IsValidMapCoord(x, y, z)) continue; switch (passenger->GetTypeId()) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1f4ab8341c..7e37feb746 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1835,7 +1835,7 @@ void Unit::CalcAbsorbResist(Unit* attacker, Unit* victim, SpellSchoolMask school // We're going to call functions which can modify content of the list during iteration over it's elements // Let's copy the list so we can prevent iterator invalidation AuraEffectList vSchoolAbsorbCopy(victim->GetAuraEffectsByType(SPELL_AURA_SCHOOL_ABSORB)); - vSchoolAbsorbCopy.sort(Trinity::AbsorbAuraOrderPred()); + vSchoolAbsorbCopy.sort(acore::AbsorbAuraOrderPred()); // absorb without mana cost for (AuraEffectList::iterator itr = vSchoolAbsorbCopy.begin(); (itr != vSchoolAbsorbCopy.end()) && (dmgInfo.GetDamage() > 0); ++itr) @@ -15672,8 +15672,8 @@ void Unit::UpdateReactives(uint32 p_time) Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const { std::list<Unit*> targets; - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, dist); - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(this, targets, u_check); + acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, dist); + acore::UnitListSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(this, targets, u_check); VisitNearbyObject(dist, searcher); // remove current target @@ -15701,14 +15701,14 @@ Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const return NULL; // select random - return Trinity::Containers::SelectRandomContainerElement(targets); + return acore::Containers::SelectRandomContainerElement(targets); } Unit* Unit::SelectNearbyNoTotemTarget(Unit* exclude, float dist) const { std::list<Unit*> targets; - Trinity::AnyUnfriendlyNoTotemUnitInObjectRangeCheck u_check(this, this, dist); - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyNoTotemUnitInObjectRangeCheck> searcher(this, targets, u_check); + acore::AnyUnfriendlyNoTotemUnitInObjectRangeCheck u_check(this, this, dist); + acore::UnitListSearcher<acore::AnyUnfriendlyNoTotemUnitInObjectRangeCheck> searcher(this, targets, u_check); VisitNearbyObject(dist, searcher); // remove current target @@ -15736,7 +15736,7 @@ Unit* Unit::SelectNearbyNoTotemTarget(Unit* exclude, float dist) const return NULL; // select random - return Trinity::Containers::SelectRandomContainerElement(targets); + return acore::Containers::SelectRandomContainerElement(targets); } void Unit::ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply) @@ -16282,7 +16282,7 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura) if (!nearMembers.empty()) { - nearMembers.sort(Trinity::HealthPctOrderPred()); + nearMembers.sort(acore::HealthPctOrderPred()); if (Unit* target = nearMembers.front()) { CastSpell(target, 41637 /*Dummy visual effect triggered by main spell cast*/, true); @@ -17706,7 +17706,7 @@ void Unit::UpdateObjectVisibility(bool forced, bool /*fromUpdate*/) // pussywizard: generally this is not needed here, delayed notifier will handle this, call only for pets if ((IsGuardian() || IsPet()) && IS_PLAYER_GUID(GetOwnerGUID())) { - Trinity::AIRelocationNotifier notifier(*this); + acore::AIRelocationNotifier notifier(*this); float radius = 60.0f; VisitNearbyObject(radius, notifier); } @@ -18517,7 +18517,7 @@ void Unit::SendTeleportPacket(Position& pos) bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool teleport) { - if (!Trinity::IsValidMapCoord(x, y, z, orientation)) + if (!acore::IsValidMapCoord(x, y, z, orientation)) return false; float old_orientation = GetOrientation(); @@ -19040,10 +19040,10 @@ void Unit::ExecuteDelayedUnitRelocationEvent() //active->m_last_notify_position.Relocate(active->GetPositionX(), active->GetPositionY(), active->GetPositionZ()); } - Trinity::PlayerRelocationNotifier relocateNoLarge(*player, false); // visit only objects which are not large; default distance + acore::PlayerRelocationNotifier relocateNoLarge(*player, false); // visit only objects which are not large; default distance viewPoint->VisitNearbyObject(player->GetSightRange()+VISIBILITY_INC_FOR_GOBJECTS, relocateNoLarge); relocateNoLarge.SendToSelf(); - Trinity::PlayerRelocationNotifier relocateLarge(*player, true); // visit only large objects; maximum distance + acore::PlayerRelocationNotifier relocateLarge(*player, true); // visit only large objects; maximum distance viewPoint->VisitNearbyObject(MAX_VISIBILITY_DISTANCE, relocateLarge); relocateLarge.SendToSelf(); } @@ -19074,10 +19074,10 @@ void Unit::ExecuteDelayedUnitRelocationEvent() active->m_last_notify_position.Relocate(active->GetPositionX(), active->GetPositionY(), active->GetPositionZ()); } - Trinity::PlayerRelocationNotifier relocateNoLarge(*player, false); // visit only objects which are not large; default distance + acore::PlayerRelocationNotifier relocateNoLarge(*player, false); // visit only objects which are not large; default distance viewPoint->VisitNearbyObject(player->GetSightRange()+VISIBILITY_INC_FOR_GOBJECTS, relocateNoLarge); relocateNoLarge.SendToSelf(); - Trinity::PlayerRelocationNotifier relocateLarge(*player, true); // visit only large objects; maximum distance + acore::PlayerRelocationNotifier relocateLarge(*player, true); // visit only large objects; maximum distance viewPoint->VisitNearbyObject(MAX_VISIBILITY_DISTANCE, relocateLarge); relocateLarge.SendToSelf(); @@ -19098,7 +19098,7 @@ void Unit::ExecuteDelayedUnitRelocationEvent() unit->m_last_notify_position.Relocate(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ()); - Trinity::CreatureRelocationNotifier relocate(*unit); + acore::CreatureRelocationNotifier relocate(*unit); unit->VisitNearbyObject(unit->GetVisibilityRange()+VISIBILITY_COMPENSATION, relocate); this->AddToNotify(NOTIFY_AI_RELOCATION); @@ -19111,7 +19111,7 @@ void Unit::ExecuteDelayedUnitAINotifyEvent() if (!this->IsInWorld() || this->IsDuringRemoveFromWorld()) return; - Trinity::AIRelocationNotifier notifier(*this); + acore::AIRelocationNotifier notifier(*this); float radius = 60.0f; this->VisitNearbyObject(radius, notifier); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 6ef86f3719..09bfa2342e 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -2564,7 +2564,7 @@ class Unit : public WorldObject bool m_petCatchUp; }; -namespace Trinity +namespace acore { // Binary predicate for sorting Units based on percent value of a power class PowerPctOrderPred diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 7b7a058f51..04e96f979d 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_VEHICLE_H -#define __TRINITY_VEHICLE_H +#ifndef __ACORE_VEHICLE_H +#define __ACORE_VEHICLE_H #include "ObjectDefines.h" #include "VehicleDefines.h" diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h index 171a367eb7..3b9ad1bb4c 100644 --- a/src/server/game/Entities/Vehicle/VehicleDefines.h +++ b/src/server/game/Entities/Vehicle/VehicleDefines.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_VEHICLEDEFINES_H -#define __TRINITY_VEHICLEDEFINES_H +#ifndef __ACORE_VEHICLEDEFINES_H +#define __ACORE_VEHICLEDEFINES_H #include "Define.h" #include "Map.h" diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index f31be9029d..4d35948a0f 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1709,14 +1709,14 @@ void GameEventMgr::RunSmartAIScripts(uint16 event_id, bool activate) //! Iterate over every supported source type (creature and gameobject) //! Not entirely sure how this will affect units in non-loaded grids. { - TRINITY_READ_GUARD(HashMapHolder<Creature>::LockType, *HashMapHolder<Creature>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Creature>::LockType, *HashMapHolder<Creature>::GetLock()); HashMapHolder<Creature>::MapType const& m = ObjectAccessor::GetCreatures(); for (HashMapHolder<Creature>::MapType::const_iterator iter = m.begin(); iter != m.end(); ++iter) if (iter->second->IsInWorld() && !iter->second->IsDuringRemoveFromWorld() && iter->second->FindMap() && iter->second->IsAIEnabled && iter->second->AI()) iter->second->AI()->sOnGameEvent(activate, event_id); } { - TRINITY_READ_GUARD(HashMapHolder<GameObject>::LockType, *HashMapHolder<GameObject>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<GameObject>::LockType, *HashMapHolder<GameObject>::GetLock()); HashMapHolder<GameObject>::MapType const& m = ObjectAccessor::GetGameObjects(); for (HashMapHolder<GameObject>::MapType::const_iterator iter = m.begin(); iter != m.end(); ++iter) if (iter->second->IsInWorld() && iter->second->FindMap() && iter->second->AI()) diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 77d70f0de5..e893edd7bc 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GAMEEVENT_MGR_H -#define TRINITY_GAMEEVENT_MGR_H +#ifndef ACORE_GAMEEVENT_MGR_H +#define ACORE_GAMEEVENT_MGR_H #include "Common.h" #include "SharedDefines.h" diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index a33054fe6f..2844b82ce8 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -173,7 +173,7 @@ Unit* ObjectAccessor::FindUnit(uint64 guid) Player* ObjectAccessor::FindPlayerByName(std::string const& name, bool checkInWorld) { - /*TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + /*ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); std::string nameStr = name; std::transform(nameStr.begin(), nameStr.end(), nameStr.begin(), ::tolower); HashMapHolder<Player>::MapType const& m = GetPlayers(); @@ -200,7 +200,7 @@ Player* ObjectAccessor::FindPlayerByName(std::string const& name, bool checkInWo void ObjectAccessor::SaveAllPlayers() { - TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& m = GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) itr->second->SaveToDB(false, false); @@ -208,7 +208,7 @@ void ObjectAccessor::SaveAllPlayers() Corpse* ObjectAccessor::GetCorpseForPlayerGUID(uint64 guid) { - TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_READ_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid); if (iter == i_player2corpse.end()) @@ -225,7 +225,7 @@ void ObjectAccessor::RemoveCorpse(Corpse* corpse, bool final) if (!final) { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGUID()); if (iter == i_player2corpse.end()) return; @@ -252,10 +252,10 @@ void ObjectAccessor::RemoveCorpse(Corpse* corpse, bool final) // Critical section { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); // build mapid*cellid -> guid_set map - CellCoord cellCoord = Trinity::ComputeCellCoord(corpse->GetPositionX(), corpse->GetPositionY()); + CellCoord cellCoord = acore::ComputeCellCoord(corpse->GetPositionX(), corpse->GetPositionY()); sObjectMgr->DeleteCorpseCellData(corpse->GetMapId(), cellCoord.GetId(), GUID_LOPART(corpse->GetOwnerGUID())); } @@ -268,20 +268,20 @@ void ObjectAccessor::AddCorpse(Corpse* corpse) // Critical section { - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); ASSERT(i_player2corpse.find(corpse->GetOwnerGUID()) == i_player2corpse.end()); i_player2corpse[corpse->GetOwnerGUID()] = corpse; // build mapid*cellid -> guid_set map - CellCoord cellCoord = Trinity::ComputeCellCoord(corpse->GetPositionX(), corpse->GetPositionY()); + CellCoord cellCoord = acore::ComputeCellCoord(corpse->GetPositionX(), corpse->GetPositionY()); sObjectMgr->AddCorpseCellData(corpse->GetMapId(), cellCoord.GetId(), GUID_LOPART(corpse->GetOwnerGUID()), corpse->GetInstanceId()); } } void ObjectAccessor::AddCorpsesToGrid(GridCoord const& gridpair, GridType& grid, Map* map) { - TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_READ_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter) { @@ -369,7 +369,7 @@ Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia } // pussywizard: for deleting bones - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); i_playerBones.push_back(bones->GetGUID()); } @@ -396,7 +396,7 @@ void ObjectAccessor::RemoveOldCorpses() // pussywizard: for deleting bones std::list<uint64>::iterator next2; - TRINITY_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); + ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, i_corpseLock); for (std::list<uint64>::iterator itr = i_playerBones.begin(); itr != i_playerBones.end(); itr = next2) { next2 = itr; @@ -429,13 +429,13 @@ void ObjectAccessor::RemoveOldCorpses() void ObjectAccessor::AddDelayedCorpseAction(Corpse* corpse, uint8 action, uint32 mapId, uint32 instanceId) { - TRINITY_GUARD(ACE_Thread_Mutex, DelayedCorpseLock); + ACORE_GUARD(ACE_Thread_Mutex, DelayedCorpseLock); i_delayedCorpseActions.push_back(DelayedCorpseAction(corpse, action, mapId, instanceId)); } void ObjectAccessor::ProcessDelayedCorpseActions() { - TRINITY_GUARD(ACE_Thread_Mutex, DelayedCorpseLock); + ACORE_GUARD(ACE_Thread_Mutex, DelayedCorpseLock); for (std::list<DelayedCorpseAction>::iterator itr = i_delayedCorpseActions.begin(); itr != i_delayedCorpseActions.end(); ++itr) { DelayedCorpseAction a = (*itr); diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 63894b6cb5..b06a72abe4 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_OBJECTACCESSOR_H -#define TRINITY_OBJECTACCESSOR_H +#ifndef ACORE_OBJECTACCESSOR_H +#define ACORE_OBJECTACCESSOR_H #include "Define.h" #include "UpdateData.h" @@ -39,19 +39,19 @@ class HashMapHolder static void Insert(T* o) { - TRINITY_WRITE_GUARD(LockType, i_lock); + ACORE_WRITE_GUARD(LockType, i_lock); m_objectMap[o->GetGUID()] = o; } static void Remove(T* o) { - TRINITY_WRITE_GUARD(LockType, i_lock); + ACORE_WRITE_GUARD(LockType, i_lock); m_objectMap.erase(o->GetGUID()); } static T* Find(uint64 guid) { - TRINITY_READ_GUARD(LockType, i_lock); + ACORE_READ_GUARD(LockType, i_lock); typename MapType::iterator itr = m_objectMap.find(guid); return (itr != m_objectMap.end()) ? itr->second : NULL; } @@ -149,14 +149,14 @@ class ObjectAccessor if (!obj || obj->GetMapId() != mapid) return NULL; - CellCoord p = Trinity::ComputeCellCoord(x, y); + CellCoord p = acore::ComputeCellCoord(x, y); if (!p.IsCoordValid()) { sLog->outError("ObjectAccessor::GetObjectInWorld: invalid coordinates supplied X:%f Y:%f grid cell [%u:%u]", x, y, p.x_coord, p.y_coord); return NULL; } - CellCoord q = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); + CellCoord q = acore::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); if (!q.IsCoordValid()) { sLog->outError("ObjectAccessor::GetObjecInWorld: object (GUID: %u TypeId: %u) has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), q.x_coord, q.y_coord); @@ -227,7 +227,7 @@ class ObjectAccessor //non-static functions void AddUpdateObject(Object* obj) { - TRINITY_GUARD(ACE_Thread_Mutex, i_objectLock); + ACORE_GUARD(ACE_Thread_Mutex, i_objectLock); if (obj->GetTypeId() < TYPEID_UNIT) // these are not in map: TYPEID_OBJECT, TYPEID_ITEM, TYPEID_CONTAINER i_objects.insert(obj); else @@ -236,7 +236,7 @@ class ObjectAccessor void RemoveUpdateObject(Object* obj) { - TRINITY_GUARD(ACE_Thread_Mutex, i_objectLock); + ACORE_GUARD(ACE_Thread_Mutex, i_objectLock); if (obj->GetTypeId() < TYPEID_UNIT) // these are not in map: TYPEID_OBJECT, TYPEID_ITEM, TYPEID_CONTAINER i_objects.erase(obj); else diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index e64a543919..21c5986ece 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1807,7 +1807,7 @@ void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data) { if (mask & 1) { - CellCoord cellCoord = Trinity::ComputeCellCoord(data->posX, data->posY); + CellCoord cellCoord = acore::ComputeCellCoord(data->posX, data->posY); CellObjectGuids& cell_guids = _mapObjectGuidsStore[MAKE_PAIR32(data->mapid, i)][cellCoord.GetId()]; cell_guids.creatures.insert(guid); } @@ -1821,7 +1821,7 @@ void ObjectMgr::RemoveCreatureFromGrid(uint32 guid, CreatureData const* data) { if (mask & 1) { - CellCoord cellCoord = Trinity::ComputeCellCoord(data->posX, data->posY); + CellCoord cellCoord = acore::ComputeCellCoord(data->posX, data->posY); CellObjectGuids& cell_guids = _mapObjectGuidsStore[MAKE_PAIR32(data->mapid, i)][cellCoord.GetId()]; cell_guids.creatures.erase(guid); } @@ -2140,7 +2140,7 @@ void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data) { if (mask & 1) { - CellCoord cellCoord = Trinity::ComputeCellCoord(data->posX, data->posY); + CellCoord cellCoord = acore::ComputeCellCoord(data->posX, data->posY); CellObjectGuids& cell_guids = _mapObjectGuidsStore[MAKE_PAIR32(data->mapid, i)][cellCoord.GetId()]; cell_guids.gameobjects.insert(guid); } @@ -2154,7 +2154,7 @@ void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data { if (mask & 1) { - CellCoord cellCoord = Trinity::ComputeCellCoord(data->posX, data->posY); + CellCoord cellCoord = acore::ComputeCellCoord(data->posX, data->posY); CellObjectGuids& cell_guids = _mapObjectGuidsStore[MAKE_PAIR32(data->mapid, i)][cellCoord.GetId()]; cell_guids.gameobjects.erase(guid); } @@ -4701,7 +4701,7 @@ void ObjectMgr::LoadScripts(ScriptsType type) continue; } - if (!Trinity::IsValidMapCoord(tmp.TeleportTo.DestX, tmp.TeleportTo.DestY, tmp.TeleportTo.DestZ, tmp.TeleportTo.Orientation)) + if (!acore::IsValidMapCoord(tmp.TeleportTo.DestX, tmp.TeleportTo.DestY, tmp.TeleportTo.DestZ, tmp.TeleportTo.Orientation)) { sLog->outErrorDb("Table `%s` has invalid coordinates (X: %f Y: %f Z: %f O: %f) in SCRIPT_COMMAND_TELEPORT_TO for script id %u", tableName.c_str(), tmp.TeleportTo.DestX, tmp.TeleportTo.DestY, tmp.TeleportTo.DestZ, tmp.TeleportTo.Orientation, tmp.id); @@ -4799,7 +4799,7 @@ void ObjectMgr::LoadScripts(ScriptsType type) case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE: { - if (!Trinity::IsValidMapCoord(tmp.TempSummonCreature.PosX, tmp.TempSummonCreature.PosY, tmp.TempSummonCreature.PosZ, tmp.TempSummonCreature.Orientation)) + if (!acore::IsValidMapCoord(tmp.TempSummonCreature.PosX, tmp.TempSummonCreature.PosY, tmp.TempSummonCreature.PosZ, tmp.TempSummonCreature.Orientation)) { sLog->outErrorDb("Table `%s` has invalid coordinates (X: %f Y: %f Z: %f O: %f) in SCRIPT_COMMAND_TEMP_SUMMON_CREATURE for script id %u", tableName.c_str(), tmp.TempSummonCreature.PosX, tmp.TempSummonCreature.PosY, tmp.TempSummonCreature.PosZ, tmp.TempSummonCreature.Orientation, tmp.id); @@ -6277,7 +6277,7 @@ uint32 ObjectMgr::GenerateMailID() sLog->outError("Mail ids overflow!! Can't continue, shutting down server. "); World::StopNow(ERROR_EXIT_CODE); } - TRINITY_GUARD(ACE_Thread_Mutex, _mailIdMutex); + ACORE_GUARD(ACE_Thread_Mutex, _mailIdMutex); return _mailId++; } @@ -6288,25 +6288,25 @@ uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh) case HIGHGUID_ITEM: { ASSERT(_hiItemGuid < 0xFFFFFFFE && "Item guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiItemGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiItemGuidMutex); return _hiItemGuid++; } case HIGHGUID_UNIT: { ASSERT(_hiCreatureGuid < 0x00FFFFFE && "Creature guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiCreatureGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiCreatureGuidMutex); return _hiCreatureGuid++; } case HIGHGUID_PET: { ASSERT(_hiPetGuid < 0x00FFFFFE && "Pet guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiPetGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiPetGuidMutex); return _hiPetGuid++; } case HIGHGUID_VEHICLE: { ASSERT(_hiVehicleGuid < 0x00FFFFFF && "Vehicle guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiVehicleGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiVehicleGuidMutex); return _hiVehicleGuid++; } case HIGHGUID_PLAYER: @@ -6317,25 +6317,25 @@ uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh) case HIGHGUID_GAMEOBJECT: { ASSERT(_hiGoGuid < 0x00FFFFFE && "Gameobject guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiGoGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiGoGuidMutex); return _hiGoGuid++; } case HIGHGUID_CORPSE: { ASSERT(_hiCorpseGuid < 0xFFFFFFFE && "Corpse guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiCorpseGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiCorpseGuidMutex); return _hiCorpseGuid++; } case HIGHGUID_DYNAMICOBJECT: { ASSERT(_hiDoGuid < 0xFFFFFFFE && "DynamicObject guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiDoGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiDoGuidMutex); return _hiDoGuid++; } case HIGHGUID_MO_TRANSPORT: { ASSERT(_hiMoTransGuid < 0xFFFFFFFE && "MO Transport guid overflow!"); - TRINITY_GUARD(ACE_Thread_Mutex, _hiMoTransGuidMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiMoTransGuidMutex); return _hiMoTransGuid++; } default: @@ -6821,7 +6821,7 @@ std::string ObjectMgr::GeneratePetName(uint32 entry) uint32 ObjectMgr::GeneratePetNumber() { - TRINITY_GUARD(ACE_Thread_Mutex, _hiPetNumberMutex); + ACORE_GUARD(ACE_Thread_Mutex, _hiPetNumberMutex); return ++_hiPetNumber; } @@ -7172,7 +7172,7 @@ void ObjectMgr::LoadPointsOfInterest() POI.Importance = fields[5].GetUInt32(); POI.Name = fields[6].GetString(); - if (!Trinity::IsValidMapCoord(POI.PositionX, POI.PositionY)) + if (!acore::IsValidMapCoord(POI.PositionX, POI.PositionY)) { sLog->outErrorDb("Table `points_of_interest` (ID: %u) have invalid coordinates (X: %f Y: %f), ignored.", point_id, POI.PositionX, POI.PositionY); continue; @@ -7745,15 +7745,15 @@ void ObjectMgr::LoadGameObjectForQuests() sLog->outString(); } -bool ObjectMgr::LoadTrinityStrings() +bool ObjectMgr::LoadAcoreStrings() { uint32 oldMSTime = getMSTime(); - _trinityStringStore.clear(); // for reload case - QueryResult result = WorldDatabase.PQuery("SELECT entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8 FROM trinity_string"); + _acoreStringStore.clear(); // for reload case + QueryResult result = WorldDatabase.PQuery("SELECT entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8 FROM acore_string"); if (!result) { - sLog->outString(">> Loaded 0 trinity strings. DB table `trinity_strings` is empty."); + sLog->outString(">> Loaded 0 trinity strings. DB table `acore_strings` is empty."); sLog->outString(); return false; } @@ -7764,7 +7764,7 @@ bool ObjectMgr::LoadTrinityStrings() uint32 entry = fields[0].GetUInt32(); - TrinityString& data = _trinityStringStore[entry]; + AcoreString& data = _acoreStringStore[entry]; data.Content.resize(DEFAULT_LOCALE + 1); @@ -7773,15 +7773,15 @@ bool ObjectMgr::LoadTrinityStrings() } while (result->NextRow()); - sLog->outString(">> Loaded %u trinity strings in %u ms", (uint32)_trinityStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(">> Loaded %u trinity strings in %u ms", (uint32)_acoreStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); return true; } -char const* ObjectMgr::GetTrinityString(uint32 entry, LocaleConstant locale) const +char const* ObjectMgr::GetAcoreString(uint32 entry, LocaleConstant locale) const { - if (TrinityString const* ts = GetTrinityString(entry)) + if (AcoreString const* ts = GetAcoreString(entry)) { if (ts->Content.size() > size_t(locale) && !ts->Content[locale].empty()) return ts->Content[locale].c_str(); @@ -8143,7 +8143,7 @@ void ObjectMgr::LoadMailLevelRewards() void ObjectMgr::AddSpellToTrainer(uint32 entry, uint32 spell, uint32 spellCost, uint32 reqSkill, uint32 reqSkillValue, uint32 reqLevel) { - if (entry >= TRINITY_TRAINER_START_REF) + if (entry >= ACORE_TRAINER_START_REF) return; CreatureTemplate const* cInfo = GetCreatureTemplate(entry); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index daa79b8c24..2e0de88234 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -474,16 +474,16 @@ struct CellObjectGuids typedef std::unordered_map<uint32/*cell_id*/, CellObjectGuids> CellObjectGuidsMap; typedef std::unordered_map<uint32/*(mapid, spawnMode) pair*/, CellObjectGuidsMap> MapObjectGuids; -// Trinity string ranges -#define MIN_TRINITY_STRING_ID 1 // 'trinity_string' -#define MAX_TRINITY_STRING_ID 2000000000 +// Acore string ranges +#define MIN_ACORE_STRING_ID 1 // 'acore_string' +#define MAX_ACORE_STRING_ID 2000000000 #define MIN_CREATURE_AI_TEXT_STRING_ID (-1) // 'creature_ai_texts' #define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000) -// Trinity Trainer Reference start range -#define TRINITY_TRAINER_START_REF 200000 +// Acore Trainer Reference start range +#define ACORE_TRAINER_START_REF 200000 -struct TrinityString +struct AcoreString { StringVector Content; }; @@ -501,7 +501,7 @@ typedef std::unordered_map<uint32, QuestOfferRewardLocale> QuestOfferRewardLocal typedef std::unordered_map<uint32, QuestRequestItemsLocale> QuestRequestItemsLocaleContainer; typedef std::unordered_map<uint32, NpcTextLocale> NpcTextLocaleContainer; typedef std::unordered_map<uint32, PageTextLocale> PageTextLocaleContainer; -typedef std::unordered_map<int32, TrinityString> TrinityStringContainer; +typedef std::unordered_map<int32, AcoreString> AcoreStringContainer; typedef std::unordered_map<uint32, GossipMenuItemsLocale> GossipMenuItemsLocaleContainer; typedef std::unordered_map<uint32, PointOfInterestLocale> PointOfInterestLocaleContainer; @@ -964,7 +964,7 @@ class ObjectMgr void ValidateSpellScripts(); void InitializeSpellInfoPrecomputedData(); - bool LoadTrinityStrings(); + bool LoadAcoreStrings(); void LoadBroadcastTexts(); void LoadBroadcastTextLocales(); void LoadCreatureClassLevelStats(); @@ -1216,16 +1216,16 @@ class ObjectMgr GameObjectData& NewGOData(uint32 guid) { return _gameObjectDataStore[guid]; } void DeleteGOData(uint32 guid); - TrinityString const* GetTrinityString(uint32 entry) const + AcoreString const* GetAcoreString(uint32 entry) const { - TrinityStringContainer::const_iterator itr = _trinityStringStore.find(entry); - if (itr == _trinityStringStore.end()) + AcoreStringContainer::const_iterator itr = _acoreStringStore.find(entry); + if (itr == _acoreStringStore.end()) return NULL; return &itr->second; } - char const* GetTrinityString(uint32 entry, LocaleConstant locale) const; - char const* GetTrinityStringForDBCLocale(uint32 entry) const { return GetTrinityString(entry, DBCLocaleIndex); } + char const* GetAcoreString(uint32 entry, LocaleConstant locale) const; + char const* GetAcoreStringForDBCLocale(uint32 entry) const { return GetAcoreString(entry, DBCLocaleIndex); } LocaleConstant GetDBCLocaleIndex() const { return DBCLocaleIndex; } void SetDBCLocaleIndex(LocaleConstant locale) { DBCLocaleIndex = locale; } @@ -1478,7 +1478,7 @@ class ObjectMgr QuestRequestItemsLocaleContainer _questRequestItemsLocaleStore; NpcTextLocaleContainer _npcTextLocaleStore; PageTextLocaleContainer _pageTextLocaleStore; - TrinityStringContainer _trinityStringStore; + AcoreStringContainer _acoreStringStore; GossipMenuItemsLocaleContainer _gossipMenuItemsLocaleStore; PointOfInterestLocaleContainer _pointOfInterestLocaleStore; diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index 53a309d97f..1fc8edd521 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CELL_H -#define TRINITY_CELL_H +#ifndef ACORE_CELL_H +#define ACORE_CELL_H #include "TypeContainer.h" #include "TypeContainerVisitor.h" diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index 5dcbf9c304..920b5340e2 100644 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CELLIMPL_H -#define TRINITY_CELLIMPL_H +#ifndef ACORE_CELLIMPL_H +#define ACORE_CELLIMPL_H #include <cmath> @@ -25,7 +25,7 @@ inline Cell::Cell(CellCoord const& p) inline Cell::Cell(float x, float y) { - CellCoord p = Trinity::ComputeCellCoord(x, y); + CellCoord p = acore::ComputeCellCoord(x, y); data.Part.grid_x = p.x_coord / MAX_NUMBER_OF_CELLS; data.Part.grid_y = p.y_coord / MAX_NUMBER_OF_CELLS; data.Part.cell_x = p.x_coord % MAX_NUMBER_OF_CELLS; @@ -38,12 +38,12 @@ inline CellArea Cell::CalculateCellArea(float x, float y, float radius) { if (radius <= 0.0f) { - CellCoord center = Trinity::ComputeCellCoord(x, y).normalize(); + CellCoord center = acore::ComputeCellCoord(x, y).normalize(); return CellArea(center, center); } - CellCoord centerX = Trinity::ComputeCellCoord(x - radius, y - radius).normalize(); - CellCoord centerY = Trinity::ComputeCellCoord(x + radius, y + radius).normalize(); + CellCoord centerX = acore::ComputeCellCoord(x - radius, y - radius).normalize(); + CellCoord centerY = acore::ComputeCellCoord(x + radius, y + radius).normalize(); return CellArea(centerX, centerY); } diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index df05fa4c16..da232c87f2 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GRID_H -#define TRINITY_GRID_H +#ifndef ACORE_GRID_H +#define ACORE_GRID_H /* @class Grid diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index ca7964604e..0e428e2bd1 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GRIDDEFINES_H -#define TRINITY_GRIDDEFINES_H +#ifndef ACORE_GRIDDEFINES_H +#define ACORE_GRIDDEFINES_H #include "Common.h" #include "NGrid.h" @@ -157,7 +157,7 @@ bool operator!=(const CoordPair<LIMIT> &p1, const CoordPair<LIMIT> &p2) typedef CoordPair<MAX_NUMBER_OF_GRIDS> GridCoord; typedef CoordPair<TOTAL_NUMBER_OF_CELLS_PER_MAP> CellCoord; -namespace Trinity +namespace acore { template<class RET_TYPE, int CENTER_VAL> inline RET_TYPE Compute(float x, float y, float center_offset, float size) diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h index 7c53582c3a..affc0722ab 100644 --- a/src/server/game/Grids/GridLoader.h +++ b/src/server/game/Grids/GridLoader.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GRIDLOADER_H -#define TRINITY_GRIDLOADER_H +#ifndef ACORE_GRIDLOADER_H +#define ACORE_GRIDLOADER_H /** @class GridLoader diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 9453dff4ac..89fabb0c85 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_NGRID_H -#define TRINITY_NGRID_H +#ifndef ACORE_NGRID_H +#define ACORE_NGRID_H /** NGrid is nothing more than a wrapper of the Grid with an NxN cells */ diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 63b2542724..834f4d62cb 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -16,7 +16,7 @@ #include "CellImpl.h" #include "SpellInfo.h" -using namespace Trinity; +using namespace acore; void VisibleNotifier::Visit(GameObjectMapType &m) diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index f5bb9c7a0b..0e83193139 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GRIDNOTIFIERS_H -#define TRINITY_GRIDNOTIFIERS_H +#ifndef ACORE_GRIDNOTIFIERS_H +#define ACORE_GRIDNOTIFIERS_H #include "ObjectGridLoader.h" #include "UpdateData.h" @@ -24,7 +24,7 @@ class Player; //class Map; -namespace Trinity +namespace acore { struct VisibleNotifier { diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 711adaa070..b16b1ba1fd 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_GRIDNOTIFIERSIMPL_H -#define TRINITY_GRIDNOTIFIERSIMPL_H +#ifndef ACORE_GRIDNOTIFIERSIMPL_H +#define ACORE_GRIDNOTIFIERSIMPL_H #include "GridNotifiers.h" #include "WorldPacket.h" @@ -17,7 +17,7 @@ #include "Opcodes.h" template<class T> -inline void Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) +inline void acore::VisibleNotifier::Visit(GridRefManager<T> &m) { // Xinef: Update gameobjects only if (i_gobjOnly) @@ -37,7 +37,7 @@ inline void Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) // WorldObject searchers & workers template<class Check> -void Trinity::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m) +void acore::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_GAMEOBJECT)) return; @@ -60,7 +60,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m) } template<class Check> -void Trinity::WorldObjectSearcher<Check>::Visit(PlayerMapType &m) +void acore::WorldObjectSearcher<Check>::Visit(PlayerMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_PLAYER)) return; @@ -83,7 +83,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::WorldObjectSearcher<Check>::Visit(CreatureMapType &m) +void acore::WorldObjectSearcher<Check>::Visit(CreatureMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CREATURE)) return; @@ -106,7 +106,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::WorldObjectSearcher<Check>::Visit(CorpseMapType &m) +void acore::WorldObjectSearcher<Check>::Visit(CorpseMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CORPSE)) return; @@ -129,7 +129,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CorpseMapType &m) } template<class Check> -void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) +void acore::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_DYNAMICOBJECT)) return; @@ -153,7 +153,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) template<class Check> -void Trinity::WorldObjectLastSearcher<Check>::Visit(GameObjectMapType &m) +void acore::WorldObjectLastSearcher<Check>::Visit(GameObjectMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_GAMEOBJECT)) return; @@ -169,7 +169,7 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(GameObjectMapType &m) } template<class Check> -void Trinity::WorldObjectLastSearcher<Check>::Visit(PlayerMapType &m) +void acore::WorldObjectLastSearcher<Check>::Visit(PlayerMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_PLAYER)) return; @@ -185,7 +185,7 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::WorldObjectLastSearcher<Check>::Visit(CreatureMapType &m) +void acore::WorldObjectLastSearcher<Check>::Visit(CreatureMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CREATURE)) return; @@ -201,7 +201,7 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::WorldObjectLastSearcher<Check>::Visit(CorpseMapType &m) +void acore::WorldObjectLastSearcher<Check>::Visit(CorpseMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CORPSE)) return; @@ -217,7 +217,7 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(CorpseMapType &m) } template<class Check> -void Trinity::WorldObjectLastSearcher<Check>::Visit(DynamicObjectMapType &m) +void acore::WorldObjectLastSearcher<Check>::Visit(DynamicObjectMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_DYNAMICOBJECT)) return; @@ -233,7 +233,7 @@ void Trinity::WorldObjectLastSearcher<Check>::Visit(DynamicObjectMapType &m) } template<class Check> -void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) +void acore::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_PLAYER)) return; @@ -244,7 +244,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) +void acore::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CREATURE)) return; @@ -255,7 +255,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) +void acore::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_CORPSE)) return; @@ -266,7 +266,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) } template<class Check> -void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) +void acore::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_GAMEOBJECT)) return; @@ -277,7 +277,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) } template<class Check> -void Trinity::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m) +void acore::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m) { if (!(i_mapTypeMask & GRID_MAP_TYPE_MASK_DYNAMICOBJECT)) return; @@ -290,7 +290,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m) // Gameobject searchers template<class Check> -void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) +void acore::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) { // already found if (i_object) @@ -310,7 +310,7 @@ void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) } template<class Check> -void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) +void acore::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) { for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -323,7 +323,7 @@ void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) } template<class Check> -void Trinity::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m) +void acore::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m) { for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask)) @@ -334,7 +334,7 @@ void Trinity::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m) // Unit searchers template<class Check> -void Trinity::UnitSearcher<Check>::Visit(CreatureMapType &m) +void acore::UnitSearcher<Check>::Visit(CreatureMapType &m) { // already found if (i_object) @@ -354,7 +354,7 @@ void Trinity::UnitSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m) +void acore::UnitSearcher<Check>::Visit(PlayerMapType &m) { // already found if (i_object) @@ -374,7 +374,7 @@ void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m) +void acore::UnitLastSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -387,7 +387,7 @@ void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m) +void acore::UnitLastSearcher<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -400,7 +400,7 @@ void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m) +void acore::UnitListSearcher<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask)) @@ -409,7 +409,7 @@ void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::UnitListSearcher<Check>::Visit(CreatureMapType &m) +void acore::UnitListSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask)) @@ -420,7 +420,7 @@ void Trinity::UnitListSearcher<Check>::Visit(CreatureMapType &m) // Creature searchers template<class Check> -void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m) +void acore::CreatureSearcher<Check>::Visit(CreatureMapType &m) { // already found if (i_object) @@ -440,7 +440,7 @@ void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) +void acore::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -453,7 +453,7 @@ void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m) +void acore::CreatureListSearcher<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask)) @@ -462,7 +462,7 @@ void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m) } template<class Check> -void Trinity::PlayerListSearcher<Check>::Visit(PlayerMapType &m) +void acore::PlayerListSearcher<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask)) @@ -471,7 +471,7 @@ void Trinity::PlayerListSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::PlayerListSearcherWithSharedVision<Check>::Visit(PlayerMapType &m) +void acore::PlayerListSearcherWithSharedVision<Check>::Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask)) @@ -480,7 +480,7 @@ void Trinity::PlayerListSearcherWithSharedVision<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::PlayerListSearcherWithSharedVision<Check>::Visit(CreatureMapType &m) +void acore::PlayerListSearcherWithSharedVision<Check>::Visit(CreatureMapType &m) { for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->GetSource()->InSamePhase(i_phaseMask) && itr->GetSource()->HasSharedVision()) @@ -490,7 +490,7 @@ void Trinity::PlayerListSearcherWithSharedVision<Check>::Visit(CreatureMapType & } template<class Check> -void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m) +void acore::PlayerSearcher<Check>::Visit(PlayerMapType &m) { // already found if (i_object) @@ -510,7 +510,7 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m) } template<class Check> -void Trinity::PlayerLastSearcher<Check>::Visit(PlayerMapType& m) +void acore::PlayerLastSearcher<Check>::Visit(PlayerMapType& m) { for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr) { @@ -523,7 +523,7 @@ void Trinity::PlayerLastSearcher<Check>::Visit(PlayerMapType& m) } template<class Builder> -void Trinity::LocalizedPacketDo<Builder>::operator()(Player* p) +void acore::LocalizedPacketDo<Builder>::operator()(Player* p) { LocaleConstant loc_idx = p->GetSession()->GetSessionDbLocaleIndex(); uint32 cache_idx = loc_idx+1; @@ -550,7 +550,7 @@ void Trinity::LocalizedPacketDo<Builder>::operator()(Player* p) } template<class Builder> -void Trinity::LocalizedPacketListDo<Builder>::operator()(Player* p) +void acore::LocalizedPacketListDo<Builder>::operator()(Player* p) { LocaleConstant loc_idx = p->GetSession()->GetSessionDbLocaleIndex(); uint32 cache_idx = loc_idx+1; @@ -573,4 +573,4 @@ void Trinity::LocalizedPacketListDo<Builder>::operator()(Player* p) p->SendDirectMessage((*data_list)[i]); } -#endif // TRINITY_GRIDNOTIFIERSIMPL_H +#endif // ACORE_GRIDNOTIFIERSIMPL_H diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index 9f44fbfc25..c00e66ebd0 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_OBJECTGRIDLOADER_H -#define TRINITY_OBJECTGRIDLOADER_H +#ifndef ACORE_OBJECTGRIDLOADER_H +#define ACORE_OBJECTGRIDLOADER_H #include "TypeList.h" #include "Define.h" diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 0bc5b990be..3f4139ac04 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2429,11 +2429,11 @@ void Guild::_CreateDefaultGuildRanks(LocaleConstant loc) stmt->setUInt32(0, m_id); CharacterDatabase.Execute(stmt); - _CreateRank(sObjectMgr->GetTrinityString(LANG_GUILD_MASTER, loc), GR_RIGHT_ALL); - _CreateRank(sObjectMgr->GetTrinityString(LANG_GUILD_OFFICER, loc), GR_RIGHT_ALL); - _CreateRank(sObjectMgr->GetTrinityString(LANG_GUILD_VETERAN, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); - _CreateRank(sObjectMgr->GetTrinityString(LANG_GUILD_MEMBER, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); - _CreateRank(sObjectMgr->GetTrinityString(LANG_GUILD_INITIATE, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); + _CreateRank(sObjectMgr->GetAcoreString(LANG_GUILD_MASTER, loc), GR_RIGHT_ALL); + _CreateRank(sObjectMgr->GetAcoreString(LANG_GUILD_OFFICER, loc), GR_RIGHT_ALL); + _CreateRank(sObjectMgr->GetAcoreString(LANG_GUILD_VETERAN, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); + _CreateRank(sObjectMgr->GetAcoreString(LANG_GUILD_MEMBER, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); + _CreateRank(sObjectMgr->GetAcoreString(LANG_GUILD_INITIATE, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); } bool Guild::_CreateRank(std::string const& name, uint32 rights) diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 7f19408422..80cb3feb58 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -47,7 +47,7 @@ void WorldSession::SendAuctionHello(uint64 guid, Creature* unit) { if (GetPlayer()->getLevel() < sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_AUCTION_REQ), sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_AUCTION_REQ), sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ)); return; } @@ -745,7 +745,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recvData) if (diff > delay) diff = delay; _lastAuctionListItemsMSTime = now + delay - diff; - TRINITY_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetTempLock()); + ACORE_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetTempLock()); AsyncAuctionListingMgr::GetTempList().push_back( AuctionListItemsDelayEvent(delay-diff, _player->GetGUID(), guid, searchedname, listfrom, levelmin, levelmax, usable, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, getAll) ); } diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 2517709526..3d4207ed09 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -243,7 +243,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) // pussywizard: optimization /*if (sender->HasAura(1852) && type != CHAT_MSG_WHISPER) { - SendNotification(GetTrinityString(LANG_GM_SILENCE), sender->GetName().c_str()); + SendNotification(GetAcoreString(LANG_GM_SILENCE), sender->GetName().c_str()); recvData.rfinish(); return; }*/ @@ -300,7 +300,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) if (!_player->CanSpeak()) { std::string timeStr = secsToTimeString(m_muteTime - time(NULL)); - SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); + SendNotification(GetAcoreString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); return; } @@ -348,7 +348,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_SAY_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_SAY_REQ), sWorld->getIntConfig(CONFIG_CHAT_SAY_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_SAY_REQ), sWorld->getIntConfig(CONFIG_CHAT_SAY_LEVEL_REQ)); return; } @@ -363,7 +363,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) { if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_WHISPER_REQ), sWorld->getIntConfig(CONFIG_CHAT_WHISPER_LEVEL_REQ)); return; } @@ -392,7 +392,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) // pussywizard: optimization /*if (GetPlayer()->HasAura(1852) && !receiver->IsGameMaster()) { - SendNotification(GetTrinityString(LANG_GM_SILENCE), GetPlayer()->GetName().c_str()); + SendNotification(GetAcoreString(LANG_GM_SILENCE), GetPlayer()->GetName().c_str()); return; }*/ @@ -552,7 +552,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) { if (sender->getLevel() < sWorld->getIntConfig(CONFIG_CHAT_CHANNEL_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_CHANNEL_REQ), sWorld->getIntConfig(CONFIG_CHAT_CHANNEL_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_CHANNEL_REQ), sWorld->getIntConfig(CONFIG_CHAT_CHANNEL_LEVEL_REQ)); return; } } @@ -584,7 +584,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) } else // New AFK mode { - sender->autoReplyMsg = msg.empty() ? GetTrinityString(LANG_PLAYER_AFK_DEFAULT) : msg; + sender->autoReplyMsg = msg.empty() ? GetAcoreString(LANG_PLAYER_AFK_DEFAULT) : msg; if (sender->isDND()) sender->ToggleDND(); @@ -611,7 +611,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recvData) } else // New DND mode { - sender->autoReplyMsg = msg.empty() ? GetTrinityString(LANG_PLAYER_DND_DEFAULT) : msg; + sender->autoReplyMsg = msg.empty() ? GetAcoreString(LANG_PLAYER_DND_DEFAULT) : msg; if (sender->isAFK()) sender->ToggleAFK(); @@ -651,7 +651,7 @@ void WorldSession::HandleEmoteOpcode(WorldPacket & recvData) GetPlayer()->HandleEmoteCommand(emote); } -namespace Trinity +namespace acore { class EmoteChatBuilder { @@ -681,7 +681,7 @@ namespace Trinity uint32 i_emote_num; Unit const* i_target; }; -} // namespace Trinity +} // namespace acore void WorldSession::HandleTextEmoteOpcode(WorldPacket & recvData) { @@ -693,7 +693,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket & recvData) if (!GetPlayer()->CanSpeak()) { std::string timeStr = secsToTimeString(m_muteTime - time(NULL)); - SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); + SendNotification(GetAcoreString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); return; } @@ -732,15 +732,15 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket & recvData) Unit* unit = ObjectAccessor::GetUnit(*_player, guid); - CellCoord p = Trinity::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY()); + CellCoord p = acore::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY()); Cell cell(p); cell.SetNoCreate(); - Trinity::EmoteChatBuilder emote_builder(*GetPlayer(), text_emote, emoteNum, unit); - Trinity::LocalizedPacketDo<Trinity::EmoteChatBuilder > emote_do(emote_builder); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::EmoteChatBuilder > > emote_worker(GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE), emote_do); - TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::EmoteChatBuilder> >, WorldTypeMapContainer> message(emote_worker); + acore::EmoteChatBuilder emote_builder(*GetPlayer(), text_emote, emoteNum, unit); + acore::LocalizedPacketDo<acore::EmoteChatBuilder > emote_do(emote_builder); + acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::EmoteChatBuilder > > emote_worker(GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE), emote_do); + TypeContainerVisitor<acore::PlayerDistWorker<acore::LocalizedPacketDo<acore::EmoteChatBuilder> >, WorldTypeMapContainer> message(emote_worker); cell.Visit(p, message, *GetPlayer()->GetMap(), *GetPlayer(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)); GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE, text_emote, 0, unit); diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 2e74a29181..8eeb5e04c3 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -91,7 +91,7 @@ void WorldSession::HandleSendMail(WorldPacket & recvData) if (player->getLevel() < sWorld->getIntConfig(CONFIG_MAIL_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_MAIL_SENDER_REQ), sWorld->getIntConfig(CONFIG_MAIL_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_MAIL_SENDER_REQ), sWorld->getIntConfig(CONFIG_MAIL_LEVEL_REQ)); return; } @@ -488,7 +488,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recvData) { std::string senderName; if (!sObjectMgr->GetPlayerNameByGUID(sender_guid, senderName)) - senderName = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN); + senderName = sObjectMgr->GetAcoreStringForDBCLocale(LANG_UNKNOWN); std::string subj = m->subject; CleanStringForMysqlQuery(subj); CharacterDatabase.PExecute("INSERT INTO log_money VALUES(%u, %u, \"%s\", \"%s\", %u, \"%s\", %u, \"<COD> %s\", NOW())", GetAccountId(), player->GetGUIDLow(), player->GetName().c_str(), player->GetSession()->GetRemoteAddress().c_str(), sender_accId, senderName.c_str(), m->COD, subj.c_str()); diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index fc9ed955e1..48e2ab4681 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -293,7 +293,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData) data << uint32(matchcount); // placeholder, count of players matching criteria data << uint32(displaycount); // placeholder, count of players displayed - TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& m = sObjectAccessor->GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { @@ -582,7 +582,7 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ADD_FRIEND"); #endif - std::string friendName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN); + std::string friendName = GetAcoreString(LANG_FRIEND_IGNORE_UNKNOWN); std::string friendNote; recv_data >> friendName; @@ -671,7 +671,7 @@ void WorldSession::HandleAddIgnoreOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ADD_IGNORE"); #endif - std::string ignoreName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN); + std::string ignoreName = GetAcoreString(LANG_FRIEND_IGNORE_UNKNOWN); recv_data >> ignoreName; diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index ed7b504d99..d4f063f1a6 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -115,7 +115,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() if (!_player->getHostileRefManager().isEmpty()) _player->getHostileRefManager().deleteReferences(); // pussywizard: multithreading crashfix - CellCoord pair(Trinity::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY())); Cell cell(pair); if (!GridCoord(cell.GridX(), cell.GridY()).IsCoordValid()) { @@ -163,7 +163,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() } // xinef: do this again, player can be teleported inside bg->AddPlayer(_player)!!!! - CellCoord pair2(Trinity::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY())); + CellCoord pair2(acore::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY())); Cell cell2(pair2); if (!GridCoord(cell2.GridX(), cell2.GridY()).IsCoordValid()) { @@ -358,7 +358,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData) return; } - if (!Trinity::IsValidMapCoord(movementInfo.pos.GetPositionX() + movementInfo.transport.pos.GetPositionX(), movementInfo.pos.GetPositionY() + movementInfo.transport.pos.GetPositionY(), + if (!acore::IsValidMapCoord(movementInfo.pos.GetPositionX() + movementInfo.transport.pos.GetPositionX(), movementInfo.pos.GetPositionY() + movementInfo.transport.pos.GetPositionY(), movementInfo.pos.GetPositionZ() + movementInfo.transport.pos.GetPositionZ(), movementInfo.pos.GetOrientation() + movementInfo.transport.pos.GetOrientation())) { recvData.rfinish(); // prevent warnings spam diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 6e48727c24..f634aed5c6 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -116,7 +116,7 @@ void WorldSession::HandleTrainerListOpcode(WorldPacket & recvData) void WorldSession::SendTrainerList(uint64 guid) { - std::string str = GetTrinityString(LANG_NPC_TAINER_HELLO); + std::string str = GetAcoreString(LANG_NPC_TAINER_HELLO); SendTrainerList(guid, str); } diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp index ec9aa9c1a7..9308c319ed 100644 --- a/src/server/game/Handlers/TicketHandler.cpp +++ b/src/server/game/Handlers/TicketHandler.cpp @@ -25,7 +25,7 @@ void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recvData) if (GetPlayer()->getLevel() < sWorld->getIntConfig(CONFIG_TICKET_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_TICKET_REQ), sWorld->getIntConfig(CONFIG_TICKET_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_TICKET_REQ), sWorld->getIntConfig(CONFIG_TICKET_LEVEL_REQ)); return; } diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index febaee1a92..c9659a4383 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -571,7 +571,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) if (GetPlayer()->getLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_TRADE_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_TRADE_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); return; } @@ -636,7 +636,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) if (pOther->getLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) { - SendNotification(GetTrinityString(LANG_TRADE_OTHER_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); + SendNotification(GetAcoreString(LANG_TRADE_OTHER_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); return; } diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index dc4af75ced..bd016b717c 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -188,13 +188,13 @@ MapEntry const* InstanceSave::GetMapEntry() void InstanceSave::AddPlayer(uint32 guidLow) { - TRINITY_GUARD(ACE_Thread_Mutex, _lock); + ACORE_GUARD(ACE_Thread_Mutex, _lock); m_playerList.push_back(guidLow); } bool InstanceSave::RemovePlayer(uint32 guidLow, InstanceSaveManager* ism) { - TRINITY_GUARD(ACE_Thread_Mutex, _lock); + ACORE_GUARD(ACE_Thread_Mutex, _lock); m_playerList.remove(guidLow); // ism passed as an argument to avoid calling via singleton (might result in a deadlock) diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index bdd287f034..70dde15d41 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_INSTANCE_DATA_H -#define TRINITY_INSTANCE_DATA_H +#ifndef ACORE_INSTANCE_DATA_H +#define ACORE_INSTANCE_DATA_H #include "ZoneScript.h" #include "World.h" diff --git a/src/server/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h index a561b699c9..ddca0b2dbc 100644 --- a/src/server/game/Loot/LootItemStorage.h +++ b/src/server/game/Loot/LootItemStorage.h @@ -2,8 +2,8 @@ Xinef */ -#ifndef TRINITY_LOOTITEMSTORAGE_H -#define TRINITY_LOOTITEMSTORAGE_H +#ifndef ACORE_LOOTITEMSTORAGE_H +#define ACORE_LOOTITEMSTORAGE_H #include "Common.h" #include <map> diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 735cdb1a3f..8b1a833df3 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -42,7 +42,7 @@ LootStore LootTemplates_Skinning("skinning_loot_template", "creature s LootStore LootTemplates_Spell("spell_loot_template", "spell id (random item creating)", false); // Selects invalid loot items to be removed from group possible entries (before rolling) -struct LootGroupInvalidSelector : public ACORE::unary_function<LootStoreItem*, bool> +struct LootGroupInvalidSelector : public acore::unary_function<LootStoreItem*, bool> { explicit LootGroupInvalidSelector(Loot const& loot, uint16 lootMode) : _loot(loot), _lootMode(lootMode) { } @@ -1141,7 +1141,7 @@ LootStoreItem const* LootTemplate::LootGroup::Roll(Loot& loot, Player const *pla possibleLoot = EqualChanced; possibleLoot.remove_if(LootGroupInvalidSelector(loot, lootMode)); if (!possibleLoot.empty()) // If nothing selected yet - an item is taken from equal-chanced part - return Trinity::Containers::SelectRandomContainerElement(possibleLoot); + return acore::Containers::SelectRandomContainerElement(possibleLoot); return NULL; // Empty drop from the group } diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index e9aa96035c..9fccb5b59f 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_LOOTMGR_H -#define TRINITY_LOOTMGR_H +#ifndef ACORE_LOOTMGR_H +#define ACORE_LOOTMGR_H #include "ItemEnchantmentMgr.h" #include "ByteBuffer.h" diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 15f8284593..5bfcbb9c5d 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MAIL_H -#define TRINITY_MAIL_H +#ifndef ACORE_MAIL_H +#define ACORE_MAIL_H #include "Common.h" #include <map> diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 0511b602de..6f039bd1f0 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -308,7 +308,7 @@ template<> void Map::SwitchGridContainers(Creature* obj, bool on) { ASSERT(!obj->IsPermanentWorldObject()); - CellCoord p = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); + CellCoord p = acore::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); if (!p.IsCoordValid()) { sLog->outError("Map::SwitchGridContainers: Object " UI64FMTD " has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); @@ -347,7 +347,7 @@ template<> void Map::SwitchGridContainers(GameObject* obj, bool on) { ASSERT(!obj->IsPermanentWorldObject()); - CellCoord p = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); + CellCoord p = acore::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); if (!p.IsCoordValid()) { sLog->outError("Map::SwitchGridContainers: Object " UI64FMTD " has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); @@ -404,7 +404,7 @@ void Map::EnsureGridCreated(const GridCoord &p) { if (getNGrid(p.x_coord, p.y_coord)) // pussywizard return; - TRINITY_GUARD(ACE_Thread_Mutex, GridLock); + ACORE_GUARD(ACE_Thread_Mutex, GridLock); EnsureGridCreated_i(p); } @@ -478,7 +478,7 @@ void Map::LoadAllCells() bool Map::AddPlayerToMap(Player* player) { - CellCoord cellCoord = Trinity::ComputeCellCoord(player->GetPositionX(), player->GetPositionY()); + CellCoord cellCoord = acore::ComputeCellCoord(player->GetPositionX(), player->GetPositionY()); if (!cellCoord.IsCoordValid()) { sLog->outError("Map::Add: Player (GUID: %u) has invalid coordinates X:%f Y:%f grid cell [%u:%u]", player->GetGUIDLow(), player->GetPositionX(), player->GetPositionY(), cellCoord.x_coord, cellCoord.y_coord); @@ -533,7 +533,7 @@ bool Map::AddToMap(T* obj, bool checkTransport) return true; } - CellCoord cellCoord = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); + CellCoord cellCoord = acore::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); //It will create many problems (including crashes) if an object is not added to grid after creation //The correct way to fix it is to make AddToMap return false and delete the object if it is not added to grid //But now AddToMap is used in too many places, I will just see how many ASSERT failures it will cause @@ -585,7 +585,7 @@ bool Map::AddToMap(MotionTransport* obj, bool /*checkTransport*/) if (obj->IsInWorld()) return true; - CellCoord cellCoord = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); + CellCoord cellCoord = acore::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); if (!cellCoord.IsCoordValid()) { sLog->outError("Map::Add: Object " UI64FMTD " has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), cellCoord.x_coord, cellCoord.y_coord); @@ -627,10 +627,11 @@ bool Map::IsGridLoaded(const GridCoord &p) const return (getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord)); } -void Map::VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &gridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor) + +void Map::VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &gridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, + TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor) { // check for valid position if (!player->IsPositionValid()) @@ -662,10 +663,10 @@ void Map::VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor<Trinity: } } -void Map::VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &gridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor) +void Map::VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &gridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, + TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor) { // Check for valid position if (!obj->IsPositionValid()) @@ -746,16 +747,17 @@ void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/) resetMarkedCells(); resetMarkedCellsLarge(); - Trinity::ObjectUpdater updater(t_diff, false); + acore::ObjectUpdater updater(t_diff, false); + // for creature - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer > grid_object_update(updater); + TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer > grid_object_update(updater); // for pets - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater); + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater); // for large creatures - Trinity::ObjectUpdater largeObjectUpdater(t_diff, true); - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer > grid_large_object_update(largeObjectUpdater); - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer > world_large_object_update(largeObjectUpdater); + acore::ObjectUpdater largeObjectUpdater(t_diff, true); + TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer > grid_large_object_update(largeObjectUpdater); + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer > world_large_object_update(largeObjectUpdater); // pussywizard: container for far creatures in combat with players std::vector<Creature*> updateList; updateList.reserve(10); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 2ee050e718..d516d8c3a8 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MAP_H -#define TRINITY_MAP_H +#ifndef ACORE_MAP_H +#define ACORE_MAP_H // Pathfinding #include "DetourAlloc.h" @@ -51,7 +51,7 @@ class BattlegroundMap; class Transport; class StaticTransport; class MotionTransport; -namespace Trinity +namespace acore { struct ObjectUpdater; struct LargeObjectUpdater; @@ -296,14 +296,15 @@ class Map : public GridRefManager<NGridType> template<class T> bool AddToMap(T *, bool checkTransport = false); template<class T> void RemoveFromMap(T *, bool); - void VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &gridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor); - void VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &gridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor); + void VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &gridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, + TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor); + void VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &gridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &worldVisitor, + TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer> &largeGridVisitor, + TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer> &largeWorldVisitor); + virtual void Update(const uint32, const uint32, bool thread = true); float GetVisibilityRange() const { return m_VisibleDistance; } @@ -320,13 +321,13 @@ class Map : public GridRefManager<NGridType> bool IsRemovalGrid(float x, float y) const { - GridCoord p = Trinity::ComputeGridCoord(x, y); + GridCoord p = acore::ComputeGridCoord(x, y); return !getNGrid(p.x_coord, p.y_coord); } bool IsGridLoaded(float x, float y) const { - return IsGridLoaded(Trinity::ComputeGridCoord(x, y)); + return IsGridLoaded(acore::ComputeGridCoord(x, y)); } void LoadGrid(float x, float y); @@ -737,7 +738,7 @@ inline void Map::Visit(Cell const& cell, TypeContainerVisitor<T, CONTAINER>& vis template<class NOTIFIER> inline void Map::VisitAll(float const& x, float const& y, float radius, NOTIFIER& notifier) { - CellCoord p(Trinity::ComputeCellCoord(x, y)); + CellCoord p(acore::ComputeCellCoord(x, y)); Cell cell(p); cell.SetNoCreate(); @@ -751,7 +752,7 @@ inline void Map::VisitAll(float const& x, float const& y, float radius, NOTIFIER template<class NOTIFIER> inline void Map::VisitFirstFound(const float &x, const float &y, float radius, NOTIFIER ¬ifier) { - CellCoord p(Trinity::ComputeCellCoord(x, y)); + CellCoord p(acore::ComputeCellCoord(x, y)); Cell cell(p); cell.SetNoCreate(); @@ -767,7 +768,7 @@ inline void Map::VisitFirstFound(const float &x, const float &y, float radius, N template<class NOTIFIER> inline void Map::VisitWorld(const float &x, const float &y, float radius, NOTIFIER ¬ifier) { - CellCoord p(Trinity::ComputeCellCoord(x, y)); + CellCoord p(acore::ComputeCellCoord(x, y)); Cell cell(p); cell.SetNoCreate(); @@ -778,7 +779,7 @@ inline void Map::VisitWorld(const float &x, const float &y, float radius, NOTIFI template<class NOTIFIER> inline void Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER ¬ifier) { - CellCoord p(Trinity::ComputeCellCoord(x, y)); + CellCoord p(acore::ComputeCellCoord(x, y)); Cell cell(p); cell.SetNoCreate(); diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index e9ec5a6e9b..720981bb52 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -175,7 +175,7 @@ Map* MapInstanced::CreateInstanceForPlayer(const uint32 mapId, Player* player) InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave* save, Difficulty difficulty) { // load/create a map - TRINITY_GUARD(ACE_Thread_Mutex, Lock); + ACORE_GUARD(ACE_Thread_Mutex, Lock); // make sure we have a valid map id const MapEntry* entry = sMapStore.LookupEntry(GetId()); @@ -218,7 +218,7 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave* save, BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battleground* bg) { // load/create a map - TRINITY_GUARD(ACE_Thread_Mutex, Lock); + ACORE_GUARD(ACE_Thread_Mutex, Lock); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateBattleground: map bg %d for %d created.", InstanceId, GetId()); diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index d7d77681e0..c50a656dcd 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MAP_INSTANCED_H -#define TRINITY_MAP_INSTANCED_H +#ifndef ACORE_MAP_INSTANCED_H +#define ACORE_MAP_INSTANCED_H #include "Map.h" #include "InstanceSaveMgr.h" diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 7be80cda93..4fc8596413 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -63,7 +63,7 @@ Map* MapManager::CreateBaseMap(uint32 id) if (map == NULL) { - TRINITY_GUARD(ACE_Thread_Mutex, Lock); + ACORE_GUARD(ACE_Thread_Mutex, Lock); map = FindBaseMap(id); if (map == NULL) // pussywizard: check again after acquiring mutex @@ -154,7 +154,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) { // probably there must be special opcode, because client has this string constant in GlobalStrings.lua // TODO: this is not a good place to send the message - player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); + player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetAcoreString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' must be in a raid group to enter instance '%s'", player->GetName().c_str(), mapName); #endif @@ -299,7 +299,7 @@ void MapManager::DoDelayedMovesAndRemoves() bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) { - GridCoord p = Trinity::ComputeGridCoord(x, y); + GridCoord p = acore::ComputeGridCoord(x, y); int gx=63-p.x_coord; int gy=63-p.y_coord; diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 01eb26cf71..09b176eb4f 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MAPMANAGER_H -#define TRINITY_MAPMANAGER_H +#ifndef ACORE_MAPMANAGER_H +#define ACORE_MAPMANAGER_H #include "Define.h" #include <ace/Singleton.h> @@ -72,17 +72,17 @@ class MapManager static bool IsValidMapCoord(uint32 mapid, float x, float y) { - return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y); + return IsValidMAP(mapid, false) && acore::IsValidMapCoord(x, y); } static bool IsValidMapCoord(uint32 mapid, float x, float y, float z) { - return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z); + return IsValidMAP(mapid, false) && acore::IsValidMapCoord(x, y, z); } static bool IsValidMapCoord(uint32 mapid, float x, float y, float z, float o) { - return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z, o); + return IsValidMAP(mapid, false) && acore::IsValidMapCoord(x, y, z, o); } static bool IsValidMapCoord(WorldLocation const& loc) diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 3d1a074818..a54b0a6772 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -105,7 +105,7 @@ int MapUpdater::deactivate() int MapUpdater::wait() { - TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); + ACORE_GUARD(ACE_Thread_Mutex, m_mutex); while (pending_requests > 0) m_condition.wait(); @@ -115,7 +115,7 @@ int MapUpdater::wait() int MapUpdater::schedule_update(Map& map, uint32 diff, uint32 s_diff) { - TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); + ACORE_GUARD(ACE_Thread_Mutex, m_mutex); ++pending_requests; @@ -132,7 +132,7 @@ int MapUpdater::schedule_update(Map& map, uint32 diff, uint32 s_diff) int MapUpdater::schedule_lfg_update(uint32 diff) { - TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); + ACORE_GUARD(ACE_Thread_Mutex, m_mutex); ++pending_requests; @@ -154,7 +154,7 @@ bool MapUpdater::activated() void MapUpdater::update_finished() { - TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); + ACORE_GUARD(ACE_Thread_Mutex, m_mutex); if (pending_requests == 0) { diff --git a/src/server/game/Misc/SavingSystem.h b/src/server/game/Misc/SavingSystem.h index f53153f957..da1f7a892a 100644 --- a/src/server/game/Misc/SavingSystem.h +++ b/src/server/game/Misc/SavingSystem.h @@ -13,8 +13,8 @@ public: static uint32 GetSavingCurrentValue() { return m_savingCurrentValue; } // modified only during single thread static uint32 GetSavingMaxValue() { return m_savingMaxValueAssigned; } // modified only during single thread static void IncreaseSavingCurrentValue(uint32 inc) { m_savingCurrentValue += inc; } // used and modified only during single thread - static uint32 IncreaseSavingMaxValue(uint32 inc) { TRINITY_GUARD(ACE_Thread_Mutex, _savingLock); return (m_savingMaxValueAssigned += inc); } - static void InsertToSavingSkipListIfNeeded(uint32 id) { if (id > m_savingCurrentValue) { TRINITY_GUARD(ACE_Thread_Mutex, _savingLock); m_savingSkipList.push_back(id); } } + static uint32 IncreaseSavingMaxValue(uint32 inc) { ACORE_GUARD(ACE_Thread_Mutex, _savingLock); return (m_savingMaxValueAssigned += inc); } + static void InsertToSavingSkipListIfNeeded(uint32 id) { if (id > m_savingCurrentValue) { ACORE_GUARD(ACE_Thread_Mutex, _savingLock); m_savingSkipList.push_back(id); } } protected: static uint32 m_savingCurrentValue; diff --git a/src/server/game/Misc/WhoListCache.cpp b/src/server/game/Misc/WhoListCache.cpp index 7b6873f1c7..154ba3d319 100644 --- a/src/server/game/Misc/WhoListCache.cpp +++ b/src/server/game/Misc/WhoListCache.cpp @@ -12,7 +12,7 @@ void WhoListCacheMgr::Update() m_whoOpcodeList.clear(); m_whoOpcodeList.reserve(sWorld->GetPlayerCount()+1); - TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& m = sObjectAccessor->GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index c0cf307acc..f7a45f5a01 100644 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_FORMULAS_H -#define TRINITY_FORMULAS_H +#ifndef ACORE_FORMULAS_H +#define ACORE_FORMULAS_H #include "World.h" #include "SharedDefines.h" @@ -13,7 +13,7 @@ #include "Player.h" #include "Creature.h" -namespace Trinity +namespace acore { namespace Honor { diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 3b44387396..415d16b4a9 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -5,10 +5,10 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_LANGUAGE_H -#define __TRINITY_LANGUAGE_H +#ifndef __ACORE_LANGUAGE_H +#define __ACORE_LANGUAGE_H -enum TrinityStrings +enum AcoreStrings { // for chat commands LANG_SELECT_CHAR_OR_CREATURE = 1, diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index ada4396aa4..123e48449a 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SHAREDDEFINES_H -#define TRINITY_SHAREDDEFINES_H +#ifndef ACORE_SHAREDDEFINES_H +#define ACORE_SHAREDDEFINES_H #include "Define.h" #include "DetourNavMesh.h" diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index e9a8336900..8fc1c71f2c 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MOTIONMASTER_H -#define TRINITY_MOTIONMASTER_H +#ifndef ACORE_MOTIONMASTER_H +#define ACORE_MOTIONMASTER_H #include "Common.h" #include <vector> diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index dad2392005..a2f104502d 100644 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MOVEMENTGENERATOR_H -#define TRINITY_MOVEMENTGENERATOR_H +#ifndef ACORE_MOVEMENTGENERATOR_H +#define ACORE_MOVEMENTGENERATOR_H #include "Define.h" #include <ace/Singleton.h> diff --git a/src/server/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h index 14d20a6e16..e0d5fa11f2 100644 --- a/src/server/game/Movement/MovementGeneratorImpl.h +++ b/src/server/game/Movement/MovementGeneratorImpl.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_MOVEMENTGENERATOR_IMPL_H -#define TRINITY_MOVEMENTGENERATOR_IMPL_H +#ifndef ACORE_MOVEMENTGENERATOR_IMPL_H +#define ACORE_MOVEMENTGENERATOR_IMPL_H #include "MovementGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index ea333f6313..360ca6abfd 100644 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -37,8 +37,8 @@ void ConfusedMovementGenerator<T>::DoInitialize(T* unit) float wanderY = y + (wander_distance * (float)rand_norm() - wander_distance/2); // prevent invalid coordinates generation - Trinity::NormalizeMapCoord(wanderX); - Trinity::NormalizeMapCoord(wanderY); + acore::NormalizeMapCoord(wanderX); + acore::NormalizeMapCoord(wanderY); float new_z = map->GetHeight(unit->GetPhaseMask(), wanderX, wanderY, z, true); if (new_z <= INVALID_HEIGHT || fabs(z-new_z) > 3.0f) // pussywizard diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h index ec04c3e5b9..c1c6372772 100644 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CONFUSEDGENERATOR_H -#define TRINITY_CONFUSEDGENERATOR_H +#ifndef ACORE_CONFUSEDGENERATOR_H +#define ACORE_CONFUSEDGENERATOR_H #include "MovementGenerator.h" #include "Timer.h" diff --git a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h index a3495e44eb..0c9cdd4931 100644 --- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h @@ -2,8 +2,8 @@ Written by Xinef */ -#ifndef TRINITY_ESCORTMOVEMENTGENERATOR_H -#define TRINITY_ESCORTMOVEMENTGENERATOR_H +#ifndef ACORE_ESCORTMOVEMENTGENERATOR_H +#define ACORE_ESCORTMOVEMENTGENERATOR_H #include "MovementGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 7bdb9dc021..888dfb1a8c 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -151,8 +151,8 @@ bool FleeingMovementGenerator<T>::_getPoint(T* owner, float &x, float &y, float temp_x = x + distance * cos(angle); temp_y = y + distance * sin(angle); - Trinity::NormalizeMapCoord(temp_x); - Trinity::NormalizeMapCoord(temp_y); + acore::NormalizeMapCoord(temp_x); + acore::NormalizeMapCoord(temp_y); if (owner->IsWithinLOS(temp_x, temp_y, z)) { bool is_water_now = _map->IsInWater(x,y,z); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h index 23384fcb3a..429b9c7c77 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_FLEEINGMOVEMENTGENERATOR_H -#define TRINITY_FLEEINGMOVEMENTGENERATOR_H +#ifndef ACORE_FLEEINGMOVEMENTGENERATOR_H +#define ACORE_FLEEINGMOVEMENTGENERATOR_H #include "MovementGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h index 6aa889454f..7750a85ea1 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_HOMEMOVEMENTGENERATOR_H -#define TRINITY_HOMEMOVEMENTGENERATOR_H +#ifndef ACORE_HOMEMOVEMENTGENERATOR_H +#define ACORE_HOMEMOVEMENTGENERATOR_H #include "MovementGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h index 3e322d8210..6968e2dc54 100644 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_IDLEMOVEMENTGENERATOR_H -#define TRINITY_IDLEMOVEMENTGENERATOR_H +#ifndef ACORE_IDLEMOVEMENTGENERATOR_H +#define ACORE_IDLEMOVEMENTGENERATOR_H #include "MovementGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp index 6562968aa4..3ff05c690c 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp @@ -39,7 +39,7 @@ PathGenerator::PathGenerator(const Unit* owner) : { MMAP::MMapManager* mmap = MMAP::MMapFactory::createOrGetMMapManager(); - TRINITY_READ_GUARD(ACE_RW_Thread_Mutex, mmap->GetManagerLock()); + ACORE_READ_GUARD(ACE_RW_Thread_Mutex, mmap->GetManagerLock()); _navMesh = mmap->GetNavMesh(mapId); _navMeshQuery = mmap->GetNavMeshQuery(mapId, _sourceUnit->GetInstanceId()); } @@ -62,7 +62,7 @@ bool PathGenerator::CalculatePath(float destX, float destY, float destZ, bool fo else _sourceUnit->GetPosition(x, y, z); - if (!Trinity::IsValidMapCoord(destX, destY, destZ) || !Trinity::IsValidMapCoord(x, y, z)) + if (!acore::IsValidMapCoord(destX, destY, destZ) || !acore::IsValidMapCoord(x, y, z)) return false; G3D::Vector3 dest(destX, destY, destZ); diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 4a30f07b6b..d806d95e82 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_POINTMOVEMENTGENERATOR_H -#define TRINITY_POINTMOVEMENTGENERATOR_H +#ifndef ACORE_POINTMOVEMENTGENERATOR_H +#define ACORE_POINTMOVEMENTGENERATOR_H #include "MovementGenerator.h" #include "FollowerReference.h" diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index b1a1868d2e..4fd224ab55 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -54,7 +54,7 @@ void RandomMovementGenerator<Creature>::_setRandomLocation(Creature* creature) Map* map = creature->GetMap(); float x = _destinationPoints[newPoint].x, y = _destinationPoints[newPoint].y, z = _destinationPoints[newPoint].z; // invalid coordinates - if (!Trinity::IsValidMapCoord(x, y)) + if (!acore::IsValidMapCoord(x, y)) { _validPointsVector[_currentPoint].erase(randomIter); _preComputedPaths.erase(pathIdx); diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index 124378d8b1..59cc020c35 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#ifndef TRINITY_RANDOMMOTIONGENERATOR_H -#define TRINITY_RANDOMMOTIONGENERATOR_H +#ifndef ACORE_RANDOMMOTIONGENERATOR_H +#define ACORE_RANDOMMOTIONGENERATOR_H #include "MovementGenerator.h" #include "PathGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 613e3c0934..2a8bb12559 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_TARGETEDMOVEMENTGENERATOR_H -#define TRINITY_TARGETEDMOVEMENTGENERATOR_H +#ifndef ACORE_TARGETEDMOVEMENTGENERATOR_H +#define ACORE_TARGETEDMOVEMENTGENERATOR_H #include "MovementGenerator.h" #include "FollowerReference.h" diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 4ca92f48c6..80954f6e67 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_WAYPOINTMOVEMENTGENERATOR_H -#define TRINITY_WAYPOINTMOVEMENTGENERATOR_H +#ifndef ACORE_WAYPOINTMOVEMENTGENERATOR_H +#define ACORE_WAYPOINTMOVEMENTGENERATOR_H /** @page PathMovementGenerator is used to generate movements * of waypoints and flight paths. Each serves the purpose diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index d8faaf101a..4b39f53342 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -56,8 +56,8 @@ void WaypointMgr::Load() float z = fields[4].GetFloat(); float o = fields[5].GetFloat(); - Trinity::NormalizeMapCoord(x); - Trinity::NormalizeMapCoord(y); + acore::NormalizeMapCoord(x); + acore::NormalizeMapCoord(y); wp->id = fields[1].GetUInt32(); wp->x = x; @@ -118,8 +118,8 @@ void WaypointMgr::ReloadPath(uint32 id) float z = fields[3].GetFloat(); float o = fields[4].GetFloat(); - Trinity::NormalizeMapCoord(x); - Trinity::NormalizeMapCoord(y); + acore::NormalizeMapCoord(x); + acore::NormalizeMapCoord(y); wp->id = fields[0].GetUInt32(); wp->x = x; diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h index dbe40aa130..f467f790d3 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.h +++ b/src/server/game/Movement/Waypoints/WaypointManager.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_WAYPOINTMANAGER_H -#define TRINITY_WAYPOINTMANAGER_H +#ifndef ACORE_WAYPOINTMANAGER_H +#define ACORE_WAYPOINTMANAGER_H #include <ace/Singleton.h> #include <ace/Null_Mutex.h> diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 9dd44789d4..8e7a1fafcf 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -288,8 +288,8 @@ bool OPvPCapturePoint::Update(uint32 diff) } std::list<Player*> players; - Trinity::AnyPlayerInObjectRangeCheck checker(m_capturePoint, radius); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(m_capturePoint, players, checker); + acore::AnyPlayerInObjectRangeCheck checker(m_capturePoint, radius); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(m_capturePoint, players, checker); m_capturePoint->VisitNearbyWorldObject(radius, searcher); for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index b376ac3588..1cac258bf9 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -110,7 +110,7 @@ void OutdoorPvPMgr::HandlePlayerEnterZone(Player* player, uint32 zoneid) if (itr == m_OutdoorPvPMap.end()) return; - TRINITY_GUARD(ACE_Thread_Mutex, _lock); // pussywizard + ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard if (itr->second->HasPlayer(player)) return; @@ -127,7 +127,7 @@ void OutdoorPvPMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneid) if (itr == m_OutdoorPvPMap.end()) return; - TRINITY_GUARD(ACE_Thread_Mutex, _lock); // pussywizard + ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard // teleport: remove once in removefromworld, once in updatezone if (!itr->second->HasPlayer(player)) @@ -183,7 +183,7 @@ ZoneScript* OutdoorPvPMgr::GetZoneScript(uint32 zoneId) bool OutdoorPvPMgr::HandleOpenGo(Player* player, uint64 guid) { - TRINITY_GUARD(ACE_Thread_Mutex, _lock); // pussywizard + ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if ((*itr)->HandleOpenGo(player, guid)) @@ -194,7 +194,7 @@ bool OutdoorPvPMgr::HandleOpenGo(Player* player, uint64 guid) void OutdoorPvPMgr::HandleGossipOption(Player* player, uint64 guid, uint32 gossipid) { - TRINITY_GUARD(ACE_Thread_Mutex, _lock); // pussywizard + ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if ((*itr)->HandleGossipOption(player, guid, gossipid)) diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index ee15379ff8..e19a21edb1 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -475,7 +475,7 @@ void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 { do { - uint32 questId = Trinity::Containers::SelectRandomContainerElement(currentQuests); + uint32 questId = acore::Containers::SelectRandomContainerElement(currentQuests); newQuests.insert(questId); currentQuests.erase(questId); } while (newQuests.size() < limit && !currentQuests.empty()); // failsafe @@ -487,7 +487,7 @@ void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 // activate <limit> random quests do { - uint32 questId = Trinity::Containers::SelectRandomContainerElement(newQuests); + uint32 questId = acore::Containers::SelectRandomContainerElement(newQuests); spawns.ActivateObject<Quest>(questId, poolId); PoolObject tempObj(questId, 0.0f); Spawn1Object(&tempObj); diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index 546a08d226..b784dca249 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_POOLHANDLER_H -#define TRINITY_POOLHANDLER_H +#ifndef ACORE_POOLHANDLER_H +#define ACORE_POOLHANDLER_H #include "Define.h" #include <ace/Singleton.h> diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 1f2a9d75d4..1c27071185 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -270,7 +270,7 @@ uint32 Quest::CalculateHonorGain(uint8 level) const honor = uint32(tc->value * GetRewHonorMultiplier() * 0.1000000014901161); // Xinef: exactly this is calculated above, however with higher precision... - //honor += Trinity::Honor::hk_honor_at_level(level, GetRewHonorMultiplier()); + //honor += acore::Honor::hk_honor_at_level(level, GetRewHonorMultiplier()); honor += GetRewHonorAddition(); } diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index d218b00c99..c7672f2551 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef __TRINITY_REPUTATION_MGR_H -#define __TRINITY_REPUTATION_MGR_H +#ifndef __ACORE_REPUTATION_MGR_H +#define __ACORE_REPUTATION_MGR_H #include "Common.h" #include "SharedDefines.h" diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index ea51fbb990..fbc109167c 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -259,13 +259,13 @@ inline GameObject* Map::_FindGameObject(WorldObject* searchObject, uint32 guid) { GameObject* gameobject = NULL; - CellCoord p(Trinity::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); Cell cell(p); - Trinity::GameObjectWithDbGUIDCheck goCheck(guid); - Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(searchObject, gameobject, goCheck); + acore::GameObjectWithDbGUIDCheck goCheck(guid); + acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck> checker(searchObject, gameobject, goCheck); - TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > objectChecker(checker); + TypeContainerVisitor<acore::GameObjectSearcher<acore::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > objectChecker(checker); cell.Visit(p, objectChecker, *searchObject->GetMap(), *searchObject, searchObject->GetGridActivationRange()); return gameobject; @@ -823,13 +823,13 @@ void Map::ScriptsProcess() WorldObject* wSource = dynamic_cast <WorldObject*> (source); if (wSource) //using grid searcher { - CellCoord p(Trinity::ComputeCellCoord(wSource->GetPositionX(), wSource->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(wSource->GetPositionX(), wSource->GetPositionY())); Cell cell(p); - Trinity::CreatureWithDbGUIDCheck target_check(step.script->CallScript.CreatureEntry); - Trinity::CreatureSearcher<Trinity::CreatureWithDbGUIDCheck> checker(wSource, cTarget, target_check); + acore::CreatureWithDbGUIDCheck target_check(step.script->CallScript.CreatureEntry); + acore::CreatureSearcher<acore::CreatureWithDbGUIDCheck> checker(wSource, cTarget, target_check); - TypeContainerVisitor<Trinity::CreatureSearcher <Trinity::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker); + TypeContainerVisitor<acore::CreatureSearcher <acore::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker); cell.Visit(p, unit_checker, *wSource->GetMap(), *wSource, wSource->GetGridActivationRange()); } else //check hashmap holders diff --git a/src/server/game/Server/Protocol/PacketLog.h b/src/server/game/Server/Protocol/PacketLog.h index 5e0b26af30..68983010c9 100644 --- a/src/server/game/Server/Protocol/PacketLog.h +++ b/src/server/game/Server/Protocol/PacketLog.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_PACKETLOG_H -#define TRINITY_PACKETLOG_H +#ifndef ACORE_PACKETLOG_H +#define ACORE_PACKETLOG_H #include "Common.h" #include <ace/Singleton.h> diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 35eaab7dea..d09face2e5 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -192,7 +192,7 @@ void WorldSession::SendPacket(WorldPacket const* packet) if (!m_Socket) return; -#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) && defined(TRINITY_DEBUG) +#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) && defined(ACORE_DEBUG) // Code for network use statistic static uint64 sendPacketCount = 0; static uint64 sendPacketBytes = 0; @@ -226,7 +226,7 @@ void WorldSession::SendPacket(WorldPacket const* packet) sendLastPacketCount = 1; sendLastPacketBytes = packet->wpos(); // wpos is real written size } -#endif // !TRINITY_DEBUG +#endif // !ACORE_DEBUG sScriptMgr->OnPacketSend(this, *packet); @@ -639,7 +639,7 @@ void WorldSession::SendNotification(const char *format, ...) void WorldSession::SendNotification(uint32 string_id, ...) { - char const* format = GetTrinityString(string_id); + char const* format = GetAcoreString(string_id); if (format) { va_list ap; @@ -655,9 +655,9 @@ void WorldSession::SendNotification(uint32 string_id, ...) } } -char const* WorldSession::GetTrinityString(uint32 entry) const +char const* WorldSession::GetAcoreString(uint32 entry) const { - return sObjectMgr->GetTrinityString(entry, GetSessionDbLocaleIndex()); + return sObjectMgr->GetAcoreString(entry, GetSessionDbLocaleIndex()); } void WorldSession::Handle_NULL(WorldPacket& recvPacket) @@ -855,7 +855,7 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi) //! Anti-cheat checks. Please keep them in seperate if() blocks to maintain a clear overview. //! Might be subject to latency, so just remove improper flags. - #ifdef TRINITY_DEBUG + #ifdef ACORE_DEBUG #define REMOVE_VIOLATING_FLAGS(check, maskToRemove) \ { \ if (check) \ diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 2350addd92..58183c2eee 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -342,7 +342,7 @@ class WorldSession // Locales LocaleConstant GetSessionDbcLocale() const { return m_sessionDbcLocale; } LocaleConstant GetSessionDbLocaleIndex() const { return m_sessionDbLocaleIndex; } - char const* GetTrinityString(uint32 entry) const; + char const* GetAcoreString(uint32 entry) const; uint32 GetLatency() const { return m_latency; } void SetLatency(uint32 latency) { m_latency = latency; } diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index b8a1b9fa7f..a53da89cfa 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -97,7 +97,7 @@ class ReactorRunnable : protected ACE_Task_Base int AddSocket (WorldSocket* sock) { - TRINITY_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); + ACORE_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); ++m_Connections; sock->AddReference(); @@ -118,7 +118,7 @@ class ReactorRunnable : protected ACE_Task_Base void AddNewSockets() { - TRINITY_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); + ACORE_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); if (m_NewSockets.empty()) return; diff --git a/src/server/game/Skills/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h index 5f38733e8d..9d358ae2b9 100644 --- a/src/server/game/Skills/SkillDiscovery.h +++ b/src/server/game/Skills/SkillDiscovery.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SKILLDISCOVERY_H -#define TRINITY_SKILLDISCOVERY_H +#ifndef ACORE_SKILLDISCOVERY_H +#define ACORE_SKILLDISCOVERY_H #include "Common.h" diff --git a/src/server/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h index 0dace5a49b..7820ce0e0d 100644 --- a/src/server/game/Skills/SkillExtraItems.h +++ b/src/server/game/Skills/SkillExtraItems.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SKILL_EXTRA_ITEMS_H -#define TRINITY_SKILL_EXTRA_ITEMS_H +#ifndef ACORE_SKILL_EXTRA_ITEMS_H +#define ACORE_SKILL_EXTRA_ITEMS_H #include "Common.h" diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index 3699264bd3..eabf05e691 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -3,8 +3,8 @@ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SPELLAURADEFINES_H -#define TRINITY_SPELLAURADEFINES_H +#ifndef ACORE_SPELLAURADEFINES_H +#define ACORE_SPELLAURADEFINES_H #define MAX_AURAS 64 // client support up to 255, but it will cause problems with group auras updating diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 7e100844ff..1d27d1d8f0 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2333,8 +2333,8 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo */ UnitList targets; - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(target, target, target->GetVisibilityRange()); // no VISIBILITY_COMPENSATION, distance is enough - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(target, targets, u_check); + acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(target, target, target->GetVisibilityRange()); // no VISIBILITY_COMPENSATION, distance is enough + acore::UnitListSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(target, targets, u_check); target->VisitNearbyObject(target->GetVisibilityRange(), searcher); // no VISIBILITY_COMPENSATION, distance is enough for (UnitList::iterator iter = targets.begin(); iter != targets.end(); ++iter) { @@ -5061,8 +5061,8 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool return; Player* player = NULL; - Trinity::AnyPlayerInObjectRangeCheck checker(target, 10.0f); - Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(target, player, checker); + acore::AnyPlayerInObjectRangeCheck checker(target, 10.0f); + acore::PlayerSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(target, player, checker); target->VisitNearbyWorldObject(10.0f, searcher); if( player && player->GetGUID() != target->GetGUID() ) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h index 2f7742cd20..cc8a8725a6 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.h +++ b/src/server/game/Spells/Auras/SpellAuraEffects.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SPELLAURAEFFECTS_H -#define TRINITY_SPELLAURAEFFECTS_H +#ifndef ACORE_SPELLAURAEFFECTS_H +#define ACORE_SPELLAURAEFFECTS_H class Unit; class AuraEffect; @@ -321,7 +321,7 @@ class AuraEffect void HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo); }; -namespace Trinity +namespace acore { // Binary predicate for sorting the priority of absorption aura effects class AbsorbAuraOrderPred diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index bfd94e77a7..e4cdcf9552 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -2603,23 +2603,23 @@ void UnitAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster) case SPELL_EFFECT_APPLY_AREA_AURA_RAID: { targetList.push_back(GetUnitOwner()); - Trinity::AnyGroupedUnitInObjectRangeCheck u_check(GetUnitOwner(), GetUnitOwner(), radius, GetSpellInfo()->Effects[effIndex].Effect == SPELL_EFFECT_APPLY_AREA_AURA_RAID); - Trinity::UnitListSearcher<Trinity::AnyGroupedUnitInObjectRangeCheck> searcher(GetUnitOwner(), targetList, u_check); + acore::AnyGroupedUnitInObjectRangeCheck u_check(GetUnitOwner(), GetUnitOwner(), radius, GetSpellInfo()->Effects[effIndex].Effect == SPELL_EFFECT_APPLY_AREA_AURA_RAID); + acore::UnitListSearcher<acore::AnyGroupedUnitInObjectRangeCheck> searcher(GetUnitOwner(), targetList, u_check); GetUnitOwner()->VisitNearbyObject(radius, searcher); break; } case SPELL_EFFECT_APPLY_AREA_AURA_FRIEND: { targetList.push_back(GetUnitOwner()); - Trinity::AnyFriendlyUnitInObjectRangeCheck u_check(GetUnitOwner(), GetUnitOwner(), radius); - Trinity::UnitListSearcher<Trinity::AnyFriendlyUnitInObjectRangeCheck> searcher(GetUnitOwner(), targetList, u_check); + acore::AnyFriendlyUnitInObjectRangeCheck u_check(GetUnitOwner(), GetUnitOwner(), radius); + acore::UnitListSearcher<acore::AnyFriendlyUnitInObjectRangeCheck> searcher(GetUnitOwner(), targetList, u_check); GetUnitOwner()->VisitNearbyObject(radius, searcher); break; } case SPELL_EFFECT_APPLY_AREA_AURA_ENEMY: { - Trinity::AnyAoETargetUnitInObjectRangeCheck u_check(GetUnitOwner(), GetUnitOwner(), radius); // No GetCharmer in searcher - Trinity::UnitListSearcher<Trinity::AnyAoETargetUnitInObjectRangeCheck> searcher(GetUnitOwner(), targetList, u_check); + acore::AnyAoETargetUnitInObjectRangeCheck u_check(GetUnitOwner(), GetUnitOwner(), radius); // No GetCharmer in searcher + acore::UnitListSearcher<acore::AnyAoETargetUnitInObjectRangeCheck> searcher(GetUnitOwner(), targetList, u_check); GetUnitOwner()->VisitNearbyObject(radius, searcher); break; } @@ -2678,22 +2678,22 @@ void DynObjAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* /*caster* if (GetSpellInfo()->Effects[effIndex].TargetB.GetTarget() == TARGET_DEST_DYNOBJ_ALLY || GetSpellInfo()->Effects[effIndex].TargetB.GetTarget() == TARGET_UNIT_DEST_AREA_ALLY) { - Trinity::AnyFriendlyUnitInObjectRangeCheck u_check(GetDynobjOwner(), dynObjOwnerCaster, radius); - Trinity::UnitListSearcher<Trinity::AnyFriendlyUnitInObjectRangeCheck> searcher(GetDynobjOwner(), targetList, u_check); + acore::AnyFriendlyUnitInObjectRangeCheck u_check(GetDynobjOwner(), dynObjOwnerCaster, radius); + acore::UnitListSearcher<acore::AnyFriendlyUnitInObjectRangeCheck> searcher(GetDynobjOwner(), targetList, u_check); GetDynobjOwner()->VisitNearbyObject(radius, searcher); } // pussywizard: TARGET_DEST_DYNOBJ_NONE is supposed to search for both friendly and unfriendly targets, so for any unit // what about EffectImplicitTargetA? else if (GetSpellInfo()->Effects[effIndex].TargetB.GetTarget() == TARGET_DEST_DYNOBJ_NONE) { - Trinity::AnyAttackableUnitExceptForOriginalCasterInObjectRangeCheck u_check(GetDynobjOwner(), dynObjOwnerCaster, radius); - Trinity::UnitListSearcher<Trinity::AnyAttackableUnitExceptForOriginalCasterInObjectRangeCheck> searcher(GetDynobjOwner(), targetList, u_check); + acore::AnyAttackableUnitExceptForOriginalCasterInObjectRangeCheck u_check(GetDynobjOwner(), dynObjOwnerCaster, radius); + acore::UnitListSearcher<acore::AnyAttackableUnitExceptForOriginalCasterInObjectRangeCheck> searcher(GetDynobjOwner(), targetList, u_check); GetDynobjOwner()->VisitNearbyObject(radius, searcher); } else { - Trinity::AnyAoETargetUnitInObjectRangeCheck u_check(GetDynobjOwner(), dynObjOwnerCaster, radius); - Trinity::UnitListSearcher<Trinity::AnyAoETargetUnitInObjectRangeCheck> searcher(GetDynobjOwner(), targetList, u_check); + acore::AnyAoETargetUnitInObjectRangeCheck u_check(GetDynobjOwner(), dynObjOwnerCaster, radius); + acore::UnitListSearcher<acore::AnyAoETargetUnitInObjectRangeCheck> searcher(GetDynobjOwner(), targetList, u_check); GetDynobjOwner()->VisitNearbyObject(radius, searcher); } diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index d464b9a6d3..ed3cfeae03 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_SPELLAURAS_H -#define TRINITY_SPELLAURAS_H +#ifndef ACORE_SPELLAURAS_H +#define ACORE_SPELLAURAS_H #include "SpellAuraDefines.h" #include "SpellInfo.h" diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index c8b5a02654..46a679631e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1182,9 +1182,9 @@ void Spell::SelectImplicitConeTargets(SpellEffIndex effIndex, SpellImplicitTarge if (uint32 containerTypeMask = GetSearcherTypeMask(objectType, condList)) { - Trinity::WorldObjectSpellConeTargetCheck check(coneAngle, radius, m_caster, m_spellInfo, selectionType, condList); - Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellConeTargetCheck> searcher(m_caster, targets, check, containerTypeMask); - SearchTargets<Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellConeTargetCheck> >(searcher, containerTypeMask, m_caster, m_caster, radius); + acore::WorldObjectSpellConeTargetCheck check(coneAngle, radius, m_caster, m_spellInfo, selectionType, condList); + acore::WorldObjectListSearcher<acore::WorldObjectSpellConeTargetCheck> searcher(m_caster, targets, check, containerTypeMask); + SearchTargets<acore::WorldObjectListSearcher<acore::WorldObjectSpellConeTargetCheck> >(searcher, containerTypeMask, m_caster, m_caster, radius); CallScriptObjectAreaTargetSelectHandlers(targets, effIndex, targetType); @@ -1198,7 +1198,7 @@ void Spell::SelectImplicitConeTargets(SpellEffIndex effIndex, SpellImplicitTarge if ((*j)->IsAffectedOnSpell(m_spellInfo)) maxTargets += (*j)->GetAmount(); - Trinity::Containers::RandomResizeList(targets, maxTargets); + acore::Containers::RandomResizeList(targets, maxTargets); } for (std::list<WorldObject*>::iterator itr = targets.begin(); itr != targets.end(); ++itr) @@ -1281,7 +1281,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge if ((*j)->IsAffectedOnSpell(m_spellInfo)) maxTargets += (*j)->GetAmount(); - Trinity::Containers::RandomResizeList(targets, maxTargets); + acore::Containers::RandomResizeList(targets, maxTargets); } for (std::list<WorldObject*>::iterator itr = targets.begin(); itr != targets.end(); ++itr) @@ -1821,13 +1821,13 @@ void Spell::SelectImplicitTrajTargets(SpellEffIndex effIndex, SpellImplicitTarge // xinef: supply correct target type, DEST_DEST and similar are ALWAYS undefined // xinef: correct target is stored in TRIGGERED SPELL, however as far as i noticed, all checks are ENTRY, ENEMY std::list<WorldObject*> targets; - Trinity::WorldObjectSpellTrajTargetCheck check(dist2d, m_targets.GetSrcPos(), m_caster, m_spellInfo, TARGET_CHECK_ENEMY /*targetCheckType*/, m_spellInfo->Effects[effIndex].ImplicitTargetConditions); - Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellTrajTargetCheck> searcher(m_caster, targets, check, GRID_MAP_TYPE_MASK_ALL); - SearchTargets<Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellTrajTargetCheck> > (searcher, GRID_MAP_TYPE_MASK_ALL, m_caster, m_targets.GetSrcPos(), dist2d); + acore::WorldObjectSpellTrajTargetCheck check(dist2d, m_targets.GetSrcPos(), m_caster, m_spellInfo, TARGET_CHECK_ENEMY /*targetCheckType*/, m_spellInfo->Effects[effIndex].ImplicitTargetConditions); + acore::WorldObjectListSearcher<acore::WorldObjectSpellTrajTargetCheck> searcher(m_caster, targets, check, GRID_MAP_TYPE_MASK_ALL); + SearchTargets<acore::WorldObjectListSearcher<acore::WorldObjectSpellTrajTargetCheck> > (searcher, GRID_MAP_TYPE_MASK_ALL, m_caster, m_targets.GetSrcPos(), dist2d); if (targets.empty()) return; - targets.sort(Trinity::ObjectDistanceOrderPred(m_caster)); + targets.sort(acore::ObjectDistanceOrderPred(m_caster)); float b = tangent(m_targets.GetElevation()); float a = (srcToDestDelta - dist2d * b) / (dist2d * dist2d); @@ -2096,7 +2096,7 @@ void Spell::SearchTargets(SEARCHER& searcher, uint32 containerMask, Unit* refere x = pos->GetPositionX(); y = pos->GetPositionY(); - CellCoord p(Trinity::ComputeCellCoord(x, y)); + CellCoord p(acore::ComputeCellCoord(x, y)); Cell cell(p); cell.SetNoCreate(); @@ -2121,9 +2121,9 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargetObjectTypes objec uint32 containerTypeMask = GetSearcherTypeMask(objectType, condList); if (!containerTypeMask) return NULL; - Trinity::WorldObjectSpellNearbyTargetCheck check(range, m_caster, m_spellInfo, selectionType, condList); - Trinity::WorldObjectLastSearcher<Trinity::WorldObjectSpellNearbyTargetCheck> searcher(m_caster, target, check, containerTypeMask); - SearchTargets<Trinity::WorldObjectLastSearcher<Trinity::WorldObjectSpellNearbyTargetCheck> > (searcher, containerTypeMask, m_caster, m_caster, range); + acore::WorldObjectSpellNearbyTargetCheck check(range, m_caster, m_spellInfo, selectionType, condList); + acore::WorldObjectLastSearcher<acore::WorldObjectSpellNearbyTargetCheck> searcher(m_caster, target, check, containerTypeMask); + SearchTargets<acore::WorldObjectLastSearcher<acore::WorldObjectSpellNearbyTargetCheck> > (searcher, containerTypeMask, m_caster, m_caster, range); return target; } @@ -2132,9 +2132,9 @@ void Spell::SearchAreaTargets(std::list<WorldObject*>& targets, float range, Pos uint32 containerTypeMask = GetSearcherTypeMask(objectType, condList); if (!containerTypeMask) return; - Trinity::WorldObjectSpellAreaTargetCheck check(range, position, m_caster, referer, m_spellInfo, selectionType, condList); - Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck> searcher(m_caster, targets, check, containerTypeMask); - SearchTargets<Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck> > (searcher, containerTypeMask, m_caster, position, range); + acore::WorldObjectSpellAreaTargetCheck check(range, position, m_caster, referer, m_spellInfo, selectionType, condList); + acore::WorldObjectListSearcher<acore::WorldObjectSpellAreaTargetCheck> searcher(m_caster, targets, check, containerTypeMask); + SearchTargets<acore::WorldObjectListSearcher<acore::WorldObjectSpellAreaTargetCheck> > (searcher, containerTypeMask, m_caster, position, range); } void Spell::SearchChainTargets(std::list<WorldObject*>& targets, uint32 chainTargets, WorldObject* target, SpellTargetObjectTypes objectType, SpellTargetCheckTypes selectType, SpellTargetSelectionCategories /*selectCategory*/, ConditionList* condList, bool isChainHeal) @@ -7239,14 +7239,14 @@ SpellCastResult Spell::CheckSpellFocus() // check spell focus object if (m_spellInfo->RequiresSpellFocus) { - CellCoord p(Trinity::ComputeCellCoord(m_caster->GetPositionX(), m_caster->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(m_caster->GetPositionX(), m_caster->GetPositionY())); Cell cell(p); GameObject* ok = NULL; - Trinity::GameObjectFocusCheck go_check(m_caster, m_spellInfo->RequiresSpellFocus); - Trinity::GameObjectSearcher<Trinity::GameObjectFocusCheck> checker(m_caster, ok, go_check); + acore::GameObjectFocusCheck go_check(m_caster, m_spellInfo->RequiresSpellFocus); + acore::GameObjectSearcher<acore::GameObjectFocusCheck> checker(m_caster, ok, go_check); - TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectFocusCheck>, GridTypeMapContainer > object_checker(checker); + TypeContainerVisitor<acore::GameObjectSearcher<acore::GameObjectFocusCheck>, GridTypeMapContainer > object_checker(checker); Map& map = *m_caster->GetMap(); cell.Visit(p, object_checker, map, *m_caster, m_caster->GetVisibilityRange()); @@ -8398,7 +8398,7 @@ void Spell::OnSpellLaunch() } } -namespace Trinity +namespace acore { WorldObjectSpellTargetCheck::WorldObjectSpellTargetCheck(Unit* caster, Unit* referer, SpellInfo const* spellInfo, @@ -8557,5 +8557,5 @@ bool WorldObjectSpellTrajTargetCheck::operator()(WorldObject* target) return WorldObjectSpellAreaTargetCheck::operator ()(target); } -} //namespace Trinity +} //namespace acore diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index d3e3165b08..020e6a78c1 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -730,7 +730,7 @@ class Spell #endif }; -namespace Trinity +namespace acore { struct WorldObjectSpellTargetCheck { diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 0bb43bb427..4fe4399384 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1125,7 +1125,7 @@ void Spell::EffectJumpDest(SpellEffIndex effIndex) float x, y, z; destTarget->GetPosition(x, y, z); // xinef: this can happen if MovePositionToFirstCollision detects that X, Y cords are invalid and returns prematurely - if (!Trinity::IsValidMapCoord(x, y, z) || z <= INVALID_HEIGHT) + if (!acore::IsValidMapCoord(x, y, z) || z <= INVALID_HEIGHT) return; float speedXY, speedZ; @@ -1981,7 +1981,7 @@ void Spell::EffectEnergize(SpellEffIndex effIndex) if (!availableElixirs.empty()) { // cast random elixir on target - m_caster->CastSpell(unitTarget, Trinity::Containers::SelectRandomContainerElement(availableElixirs), true, m_CastItem); + m_caster->CastSpell(unitTarget, acore::Containers::SelectRandomContainerElement(availableElixirs), true, m_CastItem); } } } @@ -2809,7 +2809,7 @@ void Spell::EffectAddHonor(SpellEffIndex /*effIndex*/) // do not allow to add too many honor for player (50 * 21) = 1040 at level 70, or (50 * 31) = 1550 at level 80 if (damage <= 50) { - uint32 honor_reward = Trinity::Honor::hk_honor_at_level(unitTarget->getLevel(), float(damage)); + uint32 honor_reward = acore::Honor::hk_honor_at_level(unitTarget->getLevel(), float(damage)); unitTarget->ToPlayer()->RewardHonor(NULL, 1, honor_reward, false); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %u honor points (scale) to player: %u", m_spellInfo->Id, honor_reward, unitTarget->ToPlayer()->GetGUIDLow()); @@ -4196,8 +4196,8 @@ void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/) } UnitList targets; - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(unitTarget, unitTarget, unitTarget->GetVisibilityRange()); // no VISIBILITY_COMPENSATION, distance is enough - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(unitTarget, targets, u_check); + acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(unitTarget, unitTarget, unitTarget->GetVisibilityRange()); // no VISIBILITY_COMPENSATION, distance is enough + acore::UnitListSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(unitTarget, targets, u_check); unitTarget->VisitNearbyObject(unitTarget->GetVisibilityRange(), searcher); // no VISIBILITY_COMPENSATION, distance is enough for (UnitList::iterator iter = targets.begin(); iter != targets.end(); ++iter) { @@ -4825,7 +4825,7 @@ void Spell::EffectForceDeselect(SpellEffIndex /*effIndex*/) data << uint64(m_caster->GetGUID()); float dist = m_caster->GetVisibilityRange()+VISIBILITY_COMPENSATION; - Trinity::MessageDistDelivererToHostile notifier(m_caster, &data, dist); + acore::MessageDistDelivererToHostile notifier(m_caster, &data, dist); m_caster->VisitNearbyWorldObject(dist, notifier); // xinef: we should also force pets to remove us from current target @@ -4849,8 +4849,8 @@ void Spell::EffectForceDeselect(SpellEffIndex /*effIndex*/) return; UnitList targets; - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_caster, m_caster, m_caster->GetVisibilityRange()); // no VISIBILITY_COMPENSATION, distance is enough - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_caster, targets, u_check); + acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_caster, m_caster, m_caster->GetVisibilityRange()); // no VISIBILITY_COMPENSATION, distance is enough + acore::UnitListSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_caster, targets, u_check); m_caster->VisitNearbyObject(m_caster->GetVisibilityRange(), searcher); // no VISIBILITY_COMPENSATION, distance is enough for (UnitList::iterator iter = targets.begin(); iter != targets.end(); ++iter) { diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 65c6e339eb..5605b3732a 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ -#ifndef TRINITY_CREATURE_TEXT_MGR_H -#define TRINITY_CREATURE_TEXT_MGR_H +#ifndef ACORE_CREATURE_TEXT_MGR_H +#define ACORE_CREATURE_TEXT_MGR_H #include "Creature.h" #include "GridNotifiers.h" @@ -238,7 +238,7 @@ void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder if (msgType == CHAT_MSG_RAID_BOSS_EMOTE && source->GetMap()->IsDungeon()) dist = 250.0f; - Trinity::PlayerDistWorker<CreatureTextLocalizer<Builder> > worker(source, dist, localizer); + acore::PlayerDistWorker<CreatureTextLocalizer<Builder> > worker(source, dist, localizer); source->VisitNearbyWorldObject(dist, worker); } diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index 6957ffc687..d3215e74d6 100644 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -22,7 +22,7 @@ namespace WeatherMgr namespace { - typedef std::unordered_map<uint32, Trinity::AutoPtr<Weather, ACE_Null_Mutex> > WeatherMap; + typedef std::unordered_map<uint32, acore::AutoPtr<Weather, ACE_Null_Mutex> > WeatherMap; typedef std::unordered_map<uint32, WeatherData> WeatherZoneMap; WeatherMap m_weathers; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d6ccdd7af3..007974db87 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1396,7 +1396,7 @@ void World::SetInitialWorldSettings() ///- Loading strings. Getting no records means core load has to be canceled because no error message can be output. sLog->outString(); sLog->outString("Loading Trinity strings..."); - if (!sObjectMgr->LoadTrinityStrings()) + if (!sObjectMgr->LoadAcoreStrings()) exit(1); // Error message displayed in function already ///- Update the realm entry in the database with the realm type from the config file @@ -2148,7 +2148,7 @@ void World::Update(uint32 diff) // so we don't have to do it in every packet that modifies auctions AsyncAuctionListingMgr::SetAuctionListingAllowed(false); { - TRINITY_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetLock()); + ACORE_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetLock()); // pussywizard: handle auctions when the timer has passed if (m_timers[WUPDATE_AUCTIONS].Passed()) @@ -2319,7 +2319,7 @@ void World::SendGlobalGMMessage(WorldPacket* packet, WorldSession* self, TeamId } } -namespace Trinity +namespace acore { class WorldWorldTextBuilder { @@ -2328,7 +2328,7 @@ namespace Trinity explicit WorldWorldTextBuilder(uint32 textId, va_list* args = NULL) : i_textId(textId), i_args(args) {} void operator()(WorldPacketList& data_list, LocaleConstant loc_idx) { - char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); + char const* text = sObjectMgr->GetAcoreString(i_textId, loc_idx); if (i_args) { @@ -2362,7 +2362,7 @@ namespace Trinity uint32 i_textId; va_list* i_args; }; -} // namespace Trinity +} // namespace acore /// Send a System Message to all players (except self if mentioned) void World::SendWorldText(uint32 string_id, ...) @@ -2370,8 +2370,8 @@ void World::SendWorldText(uint32 string_id, ...) va_list ap; va_start(ap, string_id); - Trinity::WorldWorldTextBuilder wt_builder(string_id, &ap); - Trinity::LocalizedPacketListDo<Trinity::WorldWorldTextBuilder> wt_do(wt_builder); + acore::WorldWorldTextBuilder wt_builder(string_id, &ap); + acore::LocalizedPacketListDo<acore::WorldWorldTextBuilder> wt_do(wt_builder); for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) { if (!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld()) @@ -2389,8 +2389,8 @@ void World::SendGMText(uint32 string_id, ...) va_list ap; va_start(ap, string_id); - Trinity::WorldWorldTextBuilder wt_builder(string_id, &ap); - Trinity::LocalizedPacketListDo<Trinity::WorldWorldTextBuilder> wt_do(wt_builder); + acore::WorldWorldTextBuilder wt_builder(string_id, &ap); + acore::LocalizedPacketListDo<acore::WorldWorldTextBuilder> wt_do(wt_builder); for (SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) { if (!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld()) diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 4d972d352a..bc6d407d68 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -289,9 +289,9 @@ public: if (fields[2].GetBool() && (fields[1].GetUInt64() == uint64(0) || unbanDate >= time(nullptr))) active = true; bool permanent = (fields[1].GetUInt64() == uint64(0)); - std::string banTime = permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true); + std::string banTime = permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true); handler->PSendSysMessage(LANG_BANINFO_HISTORYENTRY, - fields[0].GetCString(), banTime.c_str(), active ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO), fields[4].GetCString(), fields[5].GetCString()); + fields[0].GetCString(), banTime.c_str(), active ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO), fields[4].GetCString(), fields[5].GetCString()); } while (result->NextRow()); @@ -337,9 +337,9 @@ public: if (fields[2].GetUInt8() && (!fields[1].GetUInt32() || unbanDate >= time(nullptr))) active = true; bool permanent = (fields[1].GetUInt32() == uint32(0)); - std::string banTime = permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true); + std::string banTime = permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true); handler->PSendSysMessage(LANG_BANINFO_HISTORYENTRY, - fields[0].GetCString(), banTime.c_str(), active ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO), fields[4].GetCString(), fields[5].GetCString()); + fields[0].GetCString(), banTime.c_str(), active ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO), fields[4].GetCString(), fields[5].GetCString()); } while (result->NextRow()); @@ -371,8 +371,8 @@ public: Field* fields = result->Fetch(); bool permanent = !fields[6].GetUInt64(); handler->PSendSysMessage(LANG_BANINFO_IPENTRY, - fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_NEVER) : fields[2].GetCString(), - permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetCString(), fields[5].GetCString()); + fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetAcoreString(LANG_BANINFO_NEVER) : fields[2].GetCString(), + permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetCString(), fields[5].GetCString()); return true; diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 9f7145add9..43f2c86e36 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -259,7 +259,7 @@ public: LocaleConstant loc = handler->GetSessionDbcLocale(); char const* targetName = target->GetName().c_str(); - char const* knownStr = handler->GetTrinityString(LANG_KNOWN); + char const* knownStr = handler->GetAcoreString(LANG_KNOWN); // Search in CharTitles.dbc for (uint32 id = 0; id < sCharTitlesStore.GetNumRows(); id++) @@ -273,7 +273,7 @@ public: continue; char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index - ? handler->GetTrinityString(LANG_ACTIVE) + ? handler->GetAcoreString(LANG_ACTIVE) : ""; char titleNameStr[80]; @@ -466,7 +466,7 @@ public: FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction.ID); char const* factionName = factionEntry ? factionEntry->name[loc] : "#Not found#"; ReputationRank rank = target->GetReputationMgr().GetRank(factionEntry); - std::string rankName = handler->GetTrinityString(ReputationRankStrIndex[rank]); + std::string rankName = handler->GetAcoreString(ReputationRankStrIndex[rank]); std::ostringstream ss; if (handler->GetSession()) ss << faction.ID << " - |cffffffff|Hfaction:" << faction.ID << "|h[" << factionName << ' ' << localeNames[loc] << "]|h|r"; @@ -476,17 +476,17 @@ public: ss << ' ' << rankName << " (" << target->GetReputationMgr().GetReputation(factionEntry) << ')'; if (faction.Flags & FACTION_FLAG_VISIBLE) - ss << handler->GetTrinityString(LANG_FACTION_VISIBLE); + ss << handler->GetAcoreString(LANG_FACTION_VISIBLE); if (faction.Flags & FACTION_FLAG_AT_WAR) - ss << handler->GetTrinityString(LANG_FACTION_ATWAR); + ss << handler->GetAcoreString(LANG_FACTION_ATWAR); if (faction.Flags & FACTION_FLAG_PEACE_FORCED) - ss << handler->GetTrinityString(LANG_FACTION_PEACE_FORCED); + ss << handler->GetAcoreString(LANG_FACTION_PEACE_FORCED); if (faction.Flags & FACTION_FLAG_HIDDEN) - ss << handler->GetTrinityString(LANG_FACTION_HIDDEN); + ss << handler->GetAcoreString(LANG_FACTION_HIDDEN); if (faction.Flags & FACTION_FLAG_INVISIBLE_FORCED) - ss << handler->GetTrinityString(LANG_FACTION_INVISIBLE_FORCED); + ss << handler->GetAcoreString(LANG_FACTION_INVISIBLE_FORCED); if (faction.Flags & FACTION_FLAG_INACTIVE) - ss << handler->GetTrinityString(LANG_FACTION_INACTIVE); + ss << handler->GetAcoreString(LANG_FACTION_INACTIVE); handler->SendSysMessage(ss.str().c_str()); } diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 4e3e013f7c..0390b57d18 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -879,8 +879,8 @@ public: else { Creature* passenger = nullptr; - Trinity::AllCreaturesOfEntryInRange check(handler->GetSession()->GetPlayer(), entry, 20.0f); - Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(handler->GetSession()->GetPlayer(), passenger, check); + acore::AllCreaturesOfEntryInRange check(handler->GetSession()->GetPlayer(), entry, 20.0f); + acore::CreatureSearcher<acore::AllCreaturesOfEntryInRange> searcher(handler->GetSession()->GetPlayer(), passenger, check); handler->GetSession()->GetPlayer()->VisitNearbyObject(30.0f, searcher); if (!passenger || passenger == target) return false; diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index d80d3b878e..97da2f6bfa 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -45,7 +45,7 @@ public: GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap(); GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); - char const* active = handler->GetTrinityString(LANG_ACTIVE); + char const* active = handler->GetAcoreString(LANG_ACTIVE); for (GameEventMgr::ActiveEvents::const_iterator itr = activeEvents.begin(); itr != activeEvents.end(); ++itr) { @@ -98,7 +98,7 @@ public: GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); bool active = activeEvents.find(eventId) != activeEvents.end(); - char const* activeStr = active ? handler->GetTrinityString(LANG_ACTIVE) : ""; + char const* activeStr = active ? handler->GetAcoreString(LANG_ACTIVE) : ""; std::string startTimeStr = TimeToTimestampStr(eventData.start); std::string endTimeStr = TimeToTimestampStr(eventData.end); diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index aeee59e0e1..6ca2f8b583 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -109,7 +109,7 @@ public: bool first = true; bool footer = false; - TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& m = sObjectAccessor->GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { @@ -186,7 +186,7 @@ public: if (!*args) { - handler->PSendSysMessage(LANG_YOU_ARE, _player->isGMVisible() ? handler->GetTrinityString(LANG_VISIBLE) : handler->GetTrinityString(LANG_INVISIBLE)); + handler->PSendSysMessage(LANG_YOU_ARE, _player->isGMVisible() ? handler->GetAcoreString(LANG_VISIBLE) : handler->GetAcoreString(LANG_INVISIBLE)); handler->SetSentErrorMessage(true); return false; } diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 5685570876..54b6fdb9b2 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -414,8 +414,8 @@ public: return false; } - char const* talentStr = handler->GetTrinityString(LANG_TALENT); - char const* passiveStr = handler->GetTrinityString(LANG_PASSIVE); + char const* talentStr = handler->GetAcoreString(LANG_TALENT); + char const* passiveStr = handler->GetAcoreString(LANG_PASSIVE); Unit::AuraApplicationMap const& auras = unit->GetAppliedAuras(); handler->PSendSysMessage(LANG_COMMAND_TARGET_LISTAURAS, auras.size()); diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index f92c0fae9a..d34fa65c23 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -258,7 +258,7 @@ public: return true; } - char const* active = activeEvents.find(id) != activeEvents.end() ? handler->GetTrinityString(LANG_ACTIVE) : ""; + char const* active = activeEvents.find(id) != activeEvents.end() ? handler->GetAcoreString(LANG_ACTIVE) : ""; if (handler->GetSession()) handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, id, id, eventData.description.c_str(), active); @@ -345,25 +345,25 @@ public: if (factionState) // and then target != nullptr also { uint32 index = target->GetReputationMgr().GetReputationRankStrIndex(factionEntry); - std::string rankName = handler->GetTrinityString(index); + std::string rankName = handler->GetAcoreString(index); ss << ' ' << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ')'; if (factionState->Flags & FACTION_FLAG_VISIBLE) - ss << handler->GetTrinityString(LANG_FACTION_VISIBLE); + ss << handler->GetAcoreString(LANG_FACTION_VISIBLE); if (factionState->Flags & FACTION_FLAG_AT_WAR) - ss << handler->GetTrinityString(LANG_FACTION_ATWAR); + ss << handler->GetAcoreString(LANG_FACTION_ATWAR); if (factionState->Flags & FACTION_FLAG_PEACE_FORCED) - ss << handler->GetTrinityString(LANG_FACTION_PEACE_FORCED); + ss << handler->GetAcoreString(LANG_FACTION_PEACE_FORCED); if (factionState->Flags & FACTION_FLAG_HIDDEN) - ss << handler->GetTrinityString(LANG_FACTION_HIDDEN); + ss << handler->GetAcoreString(LANG_FACTION_HIDDEN); if (factionState->Flags & FACTION_FLAG_INVISIBLE_FORCED) - ss << handler->GetTrinityString(LANG_FACTION_INVISIBLE_FORCED); + ss << handler->GetAcoreString(LANG_FACTION_INVISIBLE_FORCED); if (factionState->Flags & FACTION_FLAG_INACTIVE) - ss << handler->GetTrinityString(LANG_FACTION_INACTIVE); + ss << handler->GetAcoreString(LANG_FACTION_INACTIVE); } else - ss << handler->GetTrinityString(LANG_FACTION_NOREPUTATION); + ss << handler->GetAcoreString(LANG_FACTION_NOREPUTATION); handler->SendSysMessage(ss.str().c_str()); @@ -655,13 +655,13 @@ public: switch (status) { case QUEST_STATUS_COMPLETE: - statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_COMPLETE); + statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE); break; case QUEST_STATUS_INCOMPLETE: - statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_ACTIVE); + statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE); break; case QUEST_STATUS_REWARDED: - statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_REWARDED); + statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED); break; default: break; @@ -745,13 +745,13 @@ public: char const* knownStr = ""; if (target && target->HasSkill(id)) { - knownStr = handler->GetTrinityString(LANG_KNOWN); + knownStr = handler->GetAcoreString(LANG_KNOWN); uint32 curValue = target->GetPureSkillValue(id); uint32 maxValue = target->GetPureMaxSkillValue(id); uint32 permValue = target->GetSkillPermBonusValue(id); uint32 tempValue = target->GetSkillTempBonusValue(id); - char const* valFormat = handler->GetTrinityString(LANG_SKILL_VALUES); + char const* valFormat = handler->GetAcoreString(LANG_SKILL_VALUES); snprintf(valStr, 50, valFormat, curValue, maxValue, permValue, tempValue); } @@ -853,7 +853,7 @@ public: // include rank in link name if (rank) - ss << handler->GetTrinityString(LANG_SPELL_RANK) << rank; + ss << handler->GetAcoreString(LANG_SPELL_RANK) << rank; if (handler->GetSession()) ss << ' ' << localeNames[locale] << "]|h|r"; @@ -861,15 +861,15 @@ public: ss << ' ' << localeNames[locale]; if (talent) - ss << handler->GetTrinityString(LANG_TALENT); + ss << handler->GetAcoreString(LANG_TALENT); if (passive) - ss << handler->GetTrinityString(LANG_PASSIVE); + ss << handler->GetAcoreString(LANG_PASSIVE); if (learn) - ss << handler->GetTrinityString(LANG_LEARN); + ss << handler->GetAcoreString(LANG_LEARN); if (known) - ss << handler->GetTrinityString(LANG_KNOWN); + ss << handler->GetAcoreString(LANG_KNOWN); if (active) - ss << handler->GetTrinityString(LANG_ACTIVE); + ss << handler->GetAcoreString(LANG_ACTIVE); handler->SendSysMessage(ss.str().c_str()); @@ -941,7 +941,7 @@ public: // include rank in link name if (rank) - ss << handler->GetTrinityString(LANG_SPELL_RANK) << rank; + ss << handler->GetAcoreString(LANG_SPELL_RANK) << rank; if (handler->GetSession()) ss << ' ' << localeNames[locale] << "]|h|r"; @@ -949,15 +949,15 @@ public: ss << ' ' << localeNames[locale]; if (talent) - ss << handler->GetTrinityString(LANG_TALENT); + ss << handler->GetAcoreString(LANG_TALENT); if (passive) - ss << handler->GetTrinityString(LANG_PASSIVE); + ss << handler->GetAcoreString(LANG_PASSIVE); if (learn) - ss << handler->GetTrinityString(LANG_LEARN); + ss << handler->GetAcoreString(LANG_LEARN); if (known) - ss << handler->GetTrinityString(LANG_KNOWN); + ss << handler->GetAcoreString(LANG_KNOWN); if (active) - ss << handler->GetTrinityString(LANG_ACTIVE); + ss << handler->GetAcoreString(LANG_ACTIVE); handler->SendSysMessage(ss.str().c_str()); @@ -1163,10 +1163,10 @@ public: return true; } - char const* knownStr = target && target->HasTitle(titleInfo) ? handler->GetTrinityString(LANG_KNOWN) : ""; + char const* knownStr = target && target->HasTitle(titleInfo) ? handler->GetAcoreString(LANG_KNOWN) : ""; char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index - ? handler->GetTrinityString(LANG_ACTIVE) + ? handler->GetAcoreString(LANG_ACTIVE) : ""; char titleNameStr[80]; @@ -1226,21 +1226,21 @@ public: ss << id << " - [" << name << ']'; if (mapInfo->IsContinent()) - ss << handler->GetTrinityString(LANG_CONTINENT); + ss << handler->GetAcoreString(LANG_CONTINENT); switch (mapInfo->map_type) { case MAP_INSTANCE: - ss << handler->GetTrinityString(LANG_INSTANCE); + ss << handler->GetAcoreString(LANG_INSTANCE); break; case MAP_RAID: - ss << handler->GetTrinityString(LANG_RAID); + ss << handler->GetAcoreString(LANG_RAID); break; case MAP_BATTLEGROUND: - ss << handler->GetTrinityString(LANG_BATTLEGROUND); + ss << handler->GetAcoreString(LANG_BATTLEGROUND); break; case MAP_ARENA: - ss << handler->GetTrinityString(LANG_ARENA); + ss << handler->GetAcoreString(LANG_ARENA); break; } diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 0d37ed8036..7634be2182 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -69,7 +69,7 @@ public: return false; char buff[2048]; - sprintf(buff, handler->GetTrinityString(LANG_SYSTEMMESSAGE), args); + sprintf(buff, handler->GetAcoreString(LANG_SYSTEMMESSAGE), args); sWorld->SendServerMessage(SERVER_MSG_STRING, buff); return true; } @@ -88,7 +88,7 @@ public: if (!*args) return false; - std::string str = handler->GetTrinityString(LANG_GLOBAL_NOTIFY); + std::string str = handler->GetAcoreString(LANG_GLOBAL_NOTIFY); str += args; WorldPacket data(SMSG_NOTIFICATION, (str.size()+1)); @@ -103,7 +103,7 @@ public: if (!*args) return false; - std::string str = handler->GetTrinityString(LANG_GM_NOTIFY); + std::string str = handler->GetAcoreString(LANG_GM_NOTIFY); str += args; WorldPacket data(SMSG_NOTIFICATION, (str.size()+1)); @@ -117,7 +117,7 @@ public: { if (!*args) { - handler->PSendSysMessage(LANG_COMMAND_WHISPERACCEPTING, handler->GetSession()->GetPlayer()->isAcceptWhispers() ? handler->GetTrinityString(LANG_ON) : handler->GetTrinityString(LANG_OFF)); + handler->PSendSysMessage(LANG_COMMAND_WHISPERACCEPTING, handler->GetSession()->GetPlayer()->isAcceptWhispers() ? handler->GetAcoreString(LANG_ON) : handler->GetAcoreString(LANG_OFF)); return true; } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 6d33892831..d47c5b58f1 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -172,7 +172,7 @@ public: } } ASSERT(!allowedArenas.empty()); - BattlegroundTypeId randomizedArenaBgTypeId = Trinity::Containers::SelectRandomContainerElement(allowedArenas); + BattlegroundTypeId randomizedArenaBgTypeId = acore::Containers::SelectRandomContainerElement(allowedArenas); uint8 count = 0; if (i != tokens.end()) @@ -393,7 +393,7 @@ public: } } - CellCoord cellCoord = Trinity::ComputeCellCoord(object->GetPositionX(), object->GetPositionY()); + CellCoord cellCoord = acore::ComputeCellCoord(object->GetPositionX(), object->GetPositionY()); Cell cell(cellCoord); uint32 zoneId, areaId; @@ -412,7 +412,7 @@ public: float groundZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), MAX_HEIGHT); float floorZ = map->GetHeight(object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ()); - GridCoord gridCoord = Trinity::ComputeGridCoord(object->GetPositionX(), object->GetPositionY()); + GridCoord gridCoord = acore::ComputeGridCoord(object->GetPositionX(), object->GetPositionY()); // 63? WHY? int gridX = 63 - gridCoord.x_coord; @@ -745,7 +745,7 @@ public: std::string nameLink = handler->playerLink(targetName); - handler->PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE)); + handler->PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), handler->GetAcoreString(LANG_OFFLINE)); // in point where GM stay Player::SavePositionInDB(handler->GetSession()->GetPlayer()->GetMapId(), @@ -1024,13 +1024,13 @@ public: if (!sSpellMgr->GetSpellInfo(spellIid)) { - handler->PSendSysMessage(LANG_UNKNOWN_SPELL, target == handler->GetSession()->GetPlayer() ? handler->GetTrinityString(LANG_YOU) : nameLink.c_str()); + handler->PSendSysMessage(LANG_UNKNOWN_SPELL, target == handler->GetSession()->GetPlayer() ? handler->GetAcoreString(LANG_YOU) : nameLink.c_str()); handler->SetSentErrorMessage(true); return false; } target->RemoveSpellCooldown(spellIid, true); - handler->PSendSysMessage(LANG_REMOVE_COOLDOWN, spellIid, target == handler->GetSession()->GetPlayer() ? handler->GetTrinityString(LANG_YOU) : nameLink.c_str()); + handler->PSendSysMessage(LANG_REMOVE_COOLDOWN, spellIid, target == handler->GetSession()->GetPlayer() ? handler->GetAcoreString(LANG_YOU) : nameLink.c_str()); } return true; } @@ -1285,14 +1285,14 @@ public: return false; } - std::string team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_NOTEAM); + std::string team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_NOTEAM); if (data->teamId == TEAM_NEUTRAL) - team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY); + team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_ANY); else if (data->teamId == TEAM_HORDE) - team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE); + team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_HORDE); else if (data->teamId == TEAM_ALLIANCE) - team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE); + team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_ALLIANCE); handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, graveyardId, team_name.c_str(), zone_id); } @@ -1301,11 +1301,11 @@ public: std::string team_name; if (teamId == TEAM_NEUTRAL) - team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY); + team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_ANY); else if (teamId == TEAM_HORDE) - team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE); + team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_HORDE); else if (teamId == TEAM_ALLIANCE) - team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE); + team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_ALLIANCE); //if (team == ~uint32(0)) // handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id); @@ -1484,7 +1484,7 @@ public: playerTarget = player; #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outDetail(handler->GetTrinityString(LANG_ADDITEM), itemId, count); + sLog->outDetail(handler->GetAcoreString(LANG_ADDITEM), itemId, count); #endif ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId); @@ -1573,7 +1573,7 @@ public: playerTarget = player; #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outDetail(handler->GetTrinityString(LANG_ADDITEMSET), itemSetId); + sLog->outDetail(handler->GetAcoreString(LANG_ADDITEMSET), itemSetId); #endif bool found = false; @@ -1754,38 +1754,38 @@ public: return false; // Account data print variables - std::string userName = handler->GetTrinityString(LANG_ERROR); + std::string userName = handler->GetAcoreString(LANG_ERROR); uint32 lowguid = GUID_LOPART(targetGuid); uint32 accId = 0; - std::string eMail = handler->GetTrinityString(LANG_ERROR); - std::string regMail = handler->GetTrinityString(LANG_ERROR); + std::string eMail = handler->GetAcoreString(LANG_ERROR); + std::string regMail = handler->GetAcoreString(LANG_ERROR); uint32 security = 0; - std::string lastIp = handler->GetTrinityString(LANG_ERROR); + std::string lastIp = handler->GetAcoreString(LANG_ERROR); uint8 locked = 0; - std::string lastLogin = handler->GetTrinityString(LANG_ERROR); + std::string lastLogin = handler->GetAcoreString(LANG_ERROR); uint32 failedLogins = 0; uint32 latency = 0; - std::string OS = handler->GetTrinityString(LANG_UNKNOWN); + std::string OS = handler->GetAcoreString(LANG_UNKNOWN); // Mute data print variables int64 muteTime = -1; - std::string muteReason = handler->GetTrinityString(LANG_NO_REASON); - std::string muteBy = handler->GetTrinityString(LANG_UNKNOWN); + std::string muteReason = handler->GetAcoreString(LANG_NO_REASON); + std::string muteBy = handler->GetAcoreString(LANG_UNKNOWN); // Ban data print variables int64 banTime = -1; - std::string banType = handler->GetTrinityString(LANG_UNKNOWN); - std::string banReason = handler->GetTrinityString(LANG_NO_REASON); - std::string bannedBy = handler->GetTrinityString(LANG_UNKNOWN); + std::string banType = handler->GetAcoreString(LANG_UNKNOWN); + std::string banReason = handler->GetAcoreString(LANG_NO_REASON); + std::string bannedBy = handler->GetAcoreString(LANG_UNKNOWN); // Character data print variables uint8 raceid, classid = 0; //RACE_NONE, CLASS_NONE - std::string raceStr, classStr = handler->GetTrinityString(LANG_UNKNOWN); + std::string raceStr, classStr = handler->GetAcoreString(LANG_UNKNOWN); uint8 gender = 0; int8 locale = handler->GetSessionDbcLocale(); uint32 totalPlayerTime = 0; uint8 level = 0; - std::string alive = handler->GetTrinityString(LANG_ERROR); + std::string alive = handler->GetAcoreString(LANG_ERROR); uint32 money = 0; uint32 xp = 0; uint32 xptotal = 0; @@ -1822,7 +1822,7 @@ public: muteTime = target->GetSession()->m_muteTime; mapId = target->GetMapId(); areaId = target->GetAreaId(); - alive = target->IsAlive() ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO); + alive = target->IsAlive() ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO); gender = target->getGender(); phase = target->GetPhaseMask(); } @@ -1855,9 +1855,9 @@ public: uint32 playerFlags = fields[10].GetUInt32(); if (!health || playerFlags & PLAYER_FLAGS_GHOST) - alive = handler->GetTrinityString(LANG_NO); + alive = handler->GetAcoreString(LANG_NO); else - alive = handler->GetTrinityString(LANG_YES); + alive = handler->GetAcoreString(LANG_YES); } // Query the prepared statement for login data @@ -1888,7 +1888,7 @@ public: } **/ uint32 ip = inet_addr(lastIp.c_str()); -#if TRINITY_ENDIAN == BIGENDIAN +#if ACORE_ENDIAN == BIGENDIAN EndianConvertReverse(ip); #endif stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_IP2NATION_COUNTRY); @@ -1907,10 +1907,10 @@ public: } else { - eMail = handler->GetTrinityString(LANG_UNAUTHORIZED); - regMail = handler->GetTrinityString(LANG_UNAUTHORIZED); - lastIp = handler->GetTrinityString(LANG_UNAUTHORIZED); - lastLogin = handler->GetTrinityString(LANG_UNAUTHORIZED); + eMail = handler->GetAcoreString(LANG_UNAUTHORIZED); + regMail = handler->GetAcoreString(LANG_UNAUTHORIZED); + lastIp = handler->GetAcoreString(LANG_UNAUTHORIZED); + lastLogin = handler->GetAcoreString(LANG_UNAUTHORIZED); } muteTime = fields[6].GetUInt64(); muteReason = fields[7].GetString(); @@ -1929,7 +1929,7 @@ public: PreparedQueryResult accBannedResult = LoginDatabase.Query(banQuery); if (!accBannedResult) { - banType = handler->GetTrinityString(LANG_CHARACTER); + banType = handler->GetAcoreString(LANG_CHARACTER); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PINFO_BANS); stmt->setUInt32(0, GUID_LOPART(targetGuid)); accBannedResult = CharacterDatabase.Query(stmt); @@ -1984,7 +1984,7 @@ public: // Initiate output // Output I. LANG_PINFO_PLAYER - handler->PSendSysMessage(LANG_PINFO_PLAYER, target ? "" : handler->GetTrinityString(LANG_OFFLINE), nameLink.c_str(), GUID_LOPART(targetGuid)); + handler->PSendSysMessage(LANG_PINFO_PLAYER, target ? "" : handler->GetAcoreString(LANG_OFFLINE), nameLink.c_str(), GUID_LOPART(targetGuid)); // Output II. LANG_PINFO_GM_ACTIVE if character is gamemaster if (target && target->IsGameMaster()) @@ -1992,7 +1992,7 @@ public: // Output III. LANG_PINFO_BANNED if ban exists and is applied if (banTime >= 0) - handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banReason.c_str(), banTime > 0 ? secsToTimeString(banTime - time(nullptr), true).c_str() : handler->GetTrinityString(LANG_PERMANENTLY), bannedBy.c_str()); + handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banReason.c_str(), banTime > 0 ? secsToTimeString(banTime - time(nullptr), true).c_str() : handler->GetAcoreString(LANG_PERMANENTLY), bannedBy.c_str()); // Output IV. LANG_PINFO_MUTED if mute is applied if (muteTime > 0) @@ -2011,7 +2011,7 @@ public: handler->PSendSysMessage(LANG_PINFO_ACC_REGMAILS, regMail.c_str(), eMail.c_str()); // Output IX. LANG_PINFO_ACC_IP - handler->PSendSysMessage(LANG_PINFO_ACC_IP, lastIp.c_str(), locked ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO)); + handler->PSendSysMessage(LANG_PINFO_ACC_IP, lastIp.c_str(), locked ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO)); // Output X. LANG_PINFO_CHR_LEVEL if (level != sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) @@ -2089,7 +2089,7 @@ public: } - handler->PSendSysMessage(LANG_PINFO_CHR_RACE, (gender == 0 ? handler->GetTrinityString(LANG_CHARACTER_GENDER_MALE) : handler->GetTrinityString(LANG_CHARACTER_GENDER_FEMALE)), raceStr.c_str(), classStr.c_str()); + handler->PSendSysMessage(LANG_PINFO_CHR_RACE, (gender == 0 ? handler->GetAcoreString(LANG_CHARACTER_GENDER_MALE) : handler->GetAcoreString(LANG_CHARACTER_GENDER_FEMALE)), raceStr.c_str(), classStr.c_str()); // Output XII. LANG_PINFO_CHR_ALIVE handler->PSendSysMessage(LANG_PINFO_CHR_ALIVE, alive.c_str()); @@ -2120,7 +2120,7 @@ public: } if (!zoneName) - zoneName = handler->GetTrinityString(LANG_UNKNOWN); + zoneName = handler->GetAcoreString(LANG_UNKNOWN); if (areaName) handler->PSendSysMessage(LANG_PINFO_CHR_MAP_WITH_AREA, map->name[locale], zoneName, areaName); @@ -2180,14 +2180,14 @@ public: return true; } - CellCoord p(Trinity::ComputeCellCoord(player->GetPositionX(), player->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(player->GetPositionX(), player->GetPositionY())); Cell cell(p); cell.SetNoCreate(); - Trinity::RespawnDo u_do; - Trinity::WorldObjectWorker<Trinity::RespawnDo> worker(player, u_do); + acore::RespawnDo u_do; + acore::WorldObjectWorker<acore::RespawnDo> worker(player, u_do); - TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::RespawnDo>, GridTypeMapContainer > obj_worker(worker); + TypeContainerVisitor<acore::WorldObjectWorker<acore::RespawnDo>, GridTypeMapContainer > obj_worker(worker); cell.Visit(p, obj_worker, *player->GetMap(), *player, player->GetGridActivationRange()); return true; @@ -2261,7 +2261,7 @@ public: std::string nameLink = handler->playerLink(targetName); // pussywizard: notify all online GMs - TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& m = sObjectAccessor->GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) if (itr->second->GetSession()->GetSecurity()) diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index d83f37a67a..5368fec2ce 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -260,15 +260,15 @@ public: float radius = 40.0f; WorldObject* object = handler->GetSession()->GetPlayer(); - CellCoord pair(Trinity::ComputeCellCoord(object->GetPositionX(), object->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(object->GetPositionX(), object->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); std::list<Creature*> creatureList; - Trinity::AnyUnitInObjectRangeCheck go_check(object, radius); - Trinity::CreatureListSearcher<Trinity::AnyUnitInObjectRangeCheck> go_search(object, creatureList, go_check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AnyUnitInObjectRangeCheck>, GridTypeMapContainer> go_visit(go_search); + acore::AnyUnitInObjectRangeCheck go_check(object, radius); + acore::CreatureListSearcher<acore::AnyUnitInObjectRangeCheck> go_search(object, creatureList, go_check); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AnyUnitInObjectRangeCheck>, GridTypeMapContainer> go_visit(go_search); // Get Creatures cell.Visit(pair, go_visit, *(object->GetMap()), *object, radius); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 066b8c310e..a587039f01 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -191,7 +191,7 @@ public: target->SetPower(POWER_ENERGY, energy); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY)); + sLog->outDetail(handler->GetAcoreString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY)); #endif return true; @@ -1019,7 +1019,7 @@ public: int32 newmoney = int32(targetMoney) + moneyToAdd; #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outDebug(LOG_FILTER_CHATSYS, handler->GetTrinityString(LANG_CURRENT_MONEY), targetMoney, moneyToAdd, newmoney); + sLog->outDebug(LOG_FILTER_CHATSYS, handler->GetAcoreString(LANG_CURRENT_MONEY), targetMoney, moneyToAdd, newmoney); #endif if (newmoney <= 0) { @@ -1056,7 +1056,7 @@ public: } #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outDebug(LOG_FILTER_CHATSYS, handler->GetTrinityString(LANG_NEW_MONEY), targetMoney, moneyToAdd, target->GetMoney()); + sLog->outDebug(LOG_FILTER_CHATSYS, handler->GetAcoreString(LANG_NEW_MONEY), targetMoney, moneyToAdd, target->GetMoney()); #endif return true; @@ -1199,7 +1199,7 @@ public: amount = -42000; for (; r < MAX_REPUTATION_RANK; ++r) { - std::string rank = handler->GetTrinityString(ReputationRankStrIndex[r]); + std::string rank = handler->GetAcoreString(ReputationRankStrIndex[r]); if (rank.empty()) continue; diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 1554493d39..5e03872404 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -140,7 +140,7 @@ public: { "spell_target_position", SEC_ADMINISTRATOR, true, &HandleReloadSpellTargetPositionCommand, "" }, { "spell_threats", SEC_ADMINISTRATOR, true, &HandleReloadSpellThreatsCommand, "" }, { "spell_group_stack_rules", SEC_ADMINISTRATOR, true, &HandleReloadSpellGroupStackRulesCommand, "" }, - { "trinity_string", SEC_ADMINISTRATOR, true, &HandleReloadTrinityStringCommand, "" }, + { "acore_string", SEC_ADMINISTRATOR, true, &HandleReloadAcoreStringCommand, "" }, { "warden_action", SEC_ADMINISTRATOR, true, &HandleReloadWardenactionCommand, "" }, { "waypoint_scripts", SEC_ADMINISTRATOR, true, &HandleReloadWpScriptsCommand, "" }, { "waypoint_data", SEC_ADMINISTRATOR, true, &HandleReloadWpCommand, "" }, @@ -179,7 +179,7 @@ public: HandleReloadMailLevelRewardCommand(handler, ""); HandleReloadCommandCommand(handler, ""); HandleReloadReservedNameCommand(handler, ""); - HandleReloadTrinityStringCommand(handler, ""); + HandleReloadAcoreStringCommand(handler, ""); HandleReloadGameTeleCommand(handler, ""); HandleReloadVehicleAccessoryCommand(handler, ""); @@ -718,11 +718,11 @@ public: return true; } - static bool HandleReloadTrinityStringCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAcoreStringCommand(ChatHandler* handler, const char* /*args*/) { - sLog->outString("Re-Loading trinity_string Table!"); - sObjectMgr->LoadTrinityStrings(); - handler->SendGlobalGMSysMessage("DB table `trinity_string` reloaded."); + sLog->outString("Re-Loading acore_string Table!"); + sObjectMgr->LoadAcoreStrings(); + handler->SendGlobalGMSysMessage("DB table `acore_string` reloaded."); return true; } diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index fb231df129..44ce04e8f9 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -284,7 +284,7 @@ public: stmt->setUInt16(0, uint16(atLogin)); CharacterDatabase.Execute(stmt); - TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); + ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& plist = sObjectAccessor->GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) itr->second->SetAtLoginFlag(atLogin); diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 9ab09000bc..e5084f7dee 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -190,7 +190,7 @@ public: std::string nameLink = handler->playerLink(target_name); - handler->PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE), tele->name.c_str()); + handler->PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), handler->GetAcoreString(LANG_OFFLINE), tele->name.c_str()); Player::SavePositionInDB(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation, sMapMgr->GetZoneId(tele->mapId, tele->position_x, tele->position_y, tele->position_z), target_guid); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 4150a11188..fd04b96457 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -127,7 +127,7 @@ class spell_shazzrah_gate_dummy : public SpellScriptLoader if (targets.empty()) return; - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index 13f74517fb..5c51c813d2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -91,7 +91,7 @@ class boss_sulfuron : public CreatureScript { std::list<Creature*> healers = DoFindFriendlyMissingBuff(45.0f, SPELL_INSPIRE); if (!healers.empty()) - DoCast(Trinity::Containers::SelectRandomContainerElement(healers), SPELL_INSPIRE); + DoCast(acore::Containers::SelectRandomContainerElement(healers), SPELL_INSPIRE); DoCast(me, SPELL_INSPIRE); events.ScheduleEvent(EVENT_INSPIRE, urand(20000, 26000)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index d898d92077..af62cc7fd7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -165,7 +165,7 @@ class boss_moroes : public CreatureScript if (Creature* summon = ObjectAccessor::GetCreature(*me, *i)) guestList.push_back(summon); - return Trinity::Containers::SelectRandomContainerElement(guestList); + return acore::Containers::SelectRandomContainerElement(guestList); } void UpdateAI(uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index a19d25f296..2bdde22797 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -299,7 +299,7 @@ public: } else { - point = Trinity::Containers::SelectRandomContainerElement(positions); + point = acore::Containers::SelectRandomContainerElement(positions); pos.Relocate(point->x, point->y, INFERNAL_Z, frand(0.0f, float(M_PI * 2))); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 565a2b96d0..98f7550cb7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -104,7 +104,7 @@ public: std::list<uint32> helpersList; for (uint8 i = 0; i < MAX_HELPERS_COUNT; ++i) helpersList.push_back(helpersEntries[i]); - Trinity::Containers::RandomResizeList(helpersList, MAX_ACTIVE_HELPERS); + acore::Containers::RandomResizeList(helpersList, MAX_ACTIVE_HELPERS); uint8 j = 0; for (std::list<uint32>::const_iterator itr = helpersList.begin(); itr != helpersList.end(); ++itr, ++j) @@ -199,7 +199,7 @@ public: case EVENT_SPELL_PW_SHIELD: { std::list<Creature*> cList = DoFindFriendlyMissingBuff(40.0f, DUNGEON_MODE(SPELL_POWER_WORD_SHIELD_N, SPELL_POWER_WORD_SHIELD_H)); - if (Unit* target = Trinity::Containers::SelectRandomContainerElement(cList)) + if (Unit* target = acore::Containers::SelectRandomContainerElement(cList)) me->CastSpell(target, DUNGEON_MODE(SPELL_POWER_WORD_SHIELD_N, SPELL_POWER_WORD_SHIELD_H), false); events.ScheduleEvent(EVENT_SPELL_PW_SHIELD, 10000); break; @@ -211,7 +211,7 @@ public: { case 0: target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); break; case 1: target = me; break; - case 2: target = ObjectAccessor::GetCreature(*me, Trinity::Containers::SelectRandomContainerElement(summons)); break; + case 2: target = ObjectAccessor::GetCreature(*me, acore::Containers::SelectRandomContainerElement(summons)); break; } if (target) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 6759ad8063..79c4b8c7ff 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -627,7 +627,7 @@ public: void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(SpectralBlastCheck(GetCaster()->GetVictim())); - Trinity::Containers::RandomResizeList(targets, 1); + acore::Containers::RandomResizeList(targets, 1); } void HandleDummy(SpellEffIndex effIndex) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index be04973e6d..77efc40749 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -1053,7 +1053,7 @@ class spell_kiljaeden_sinister_reflection : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)); } void HandleScriptEffect(SpellEffIndex effIndex) @@ -1090,7 +1090,7 @@ class spell_kiljaeden_sinister_reflection_clone : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + targets.sort(acore::ObjectDistanceOrderPred(GetCaster())); WorldObject* target = targets.front(); targets.clear(); @@ -1300,7 +1300,7 @@ class spell_kiljaeden_dragon_breath : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)); } void Register() diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index a962d4147c..378a3aa6ba 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -394,7 +394,7 @@ class spell_entropius_negative_energy : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - Trinity::Containers::RandomResizeList(targets, GetCaster()->GetAI()->GetData(DATA_NEGATIVE_ENERGY_TARGETS)); + acore::Containers::RandomResizeList(targets, GetCaster()->GetAI()->GetData(DATA_NEGATIVE_ENERGY_TARGETS)); } void HandleScriptEffect(SpellEffIndex effIndex) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 76a25eb33a..75fc68d5fc 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -147,18 +147,18 @@ class boss_akilzon : public CreatureScript for (uint8 i = 2; i < StormCount; ++i) bp0 *= 2; - CellCoord p(Trinity::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); + CellCoord p(acore::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); Cell cell(p); cell.SetNoCreate(); std::list<Unit*> tempUnitMap; { - Trinity::AnyAoETargetUnitInObjectRangeCheck u_check(me, me, SIZE_OF_GRIDS); - Trinity::UnitListSearcher<Trinity::AnyAoETargetUnitInObjectRangeCheck> searcher(me, tempUnitMap, u_check); + acore::AnyAoETargetUnitInObjectRangeCheck u_check(me, me, SIZE_OF_GRIDS); + acore::UnitListSearcher<acore::AnyAoETargetUnitInObjectRangeCheck> searcher(me, tempUnitMap, u_check); - TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyAoETargetUnitInObjectRangeCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); - TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyAoETargetUnitInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); + TypeContainerVisitor<acore::UnitListSearcher<acore::AnyAoETargetUnitInObjectRangeCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); + TypeContainerVisitor<acore::UnitListSearcher<acore::AnyAoETargetUnitInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); cell.Visit(p, world_unit_searcher, *me->GetMap(), *me, SIZE_OF_GRIDS); cell.Visit(p, grid_unit_searcher, *me->GetMap(), *me, SIZE_OF_GRIDS); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 57f42018d0..26d131eca1 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -225,14 +225,14 @@ class boss_janalai : public CreatureScript me->GetPosition(x, y, z); { - CellCoord pair(Trinity::ComputeCellCoord(x, y)); + CellCoord pair(acore::ComputeCellCoord(x, y)); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllCreaturesOfEntryInRange check(me, NPC_EGG, 100); - Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check); + acore::AllCreaturesOfEntryInRange check(me, NPC_EGG, 100); + acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange> searcher(me, templist, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher); cell.Visit(pair, cSearcher, *me->GetMap(), *me, me->GetGridActivationRange()); } @@ -258,14 +258,14 @@ class boss_janalai : public CreatureScript me->GetPosition(x, y, z); { - CellCoord pair(Trinity::ComputeCellCoord(x, y)); + CellCoord pair(acore::ComputeCellCoord(x, y)); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllCreaturesOfEntryInRange check(me, NPC_FIRE_BOMB, 100); - Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check); + acore::AllCreaturesOfEntryInRange check(me, NPC_FIRE_BOMB, 100); + acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange> searcher(me, templist, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher); cell.Visit(pair, cSearcher, *me->GetMap(), *me, me->GetGridActivationRange()); } @@ -517,14 +517,14 @@ class npc_janalai_hatcher : public CreatureScript me->GetPosition(x, y, z); { - CellCoord pair(Trinity::ComputeCellCoord(x, y)); + CellCoord pair(acore::ComputeCellCoord(x, y)); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllCreaturesOfEntryInRange check(me, 23817, 50); - Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check); + acore::AllCreaturesOfEntryInRange check(me, 23817, 50); + acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange> searcher(me, templist, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher); cell.Visit(pair, cSearcher, *(me->GetMap()), *me, me->GetGridActivationRange()); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 7714dbfdaf..086fad73bd 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -143,14 +143,14 @@ class boss_nalorakk : public CreatureScript me->GetPosition(x, y, z); { - CellCoord pair(Trinity::ComputeCellCoord(x, y)); + CellCoord pair(acore::ComputeCellCoord(x, y)); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllFriendlyCreaturesInGrid check(me); - Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> searcher(me, templist, check); + acore::AllFriendlyCreaturesInGrid check(me); + acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid> searcher(me, templist, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> cSearcher(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> cSearcher(searcher); cell.Visit(pair, cSearcher, *(me->GetMap()), *me, me->GetGridActivationRange()); } @@ -170,14 +170,14 @@ class boss_nalorakk : public CreatureScript me->GetPosition(x, y, z); { - CellCoord pair(Trinity::ComputeCellCoord(x, y)); + CellCoord pair(acore::ComputeCellCoord(x, y)); Cell cell(pair); cell.SetNoCreate(); - Trinity::AllFriendlyCreaturesInGrid check(me); - Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> searcher(me, templist, check); + acore::AllFriendlyCreaturesInGrid check(me); + acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid> searcher(me, templist, check); - TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> cSearcher(searcher); + TypeContainerVisitor<acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> cSearcher(searcher); cell.Visit(pair, cSearcher, *(me->GetMap()), *me, me->GetGridActivationRange()); } diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 5c1b8f8c8c..b29d6a5ccc 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -1114,8 +1114,8 @@ public: { timer = 0; Player* player = NULL; - Trinity::AnyPlayerInObjectRangeCheck checker(me, 2.0f); - Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, player, checker); + acore::AnyPlayerInObjectRangeCheck checker(me, 2.0f); + acore::PlayerSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(me, player, checker); me->VisitNearbyWorldObject(2.0f, searcher); if (player) { diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 4bf10cfc08..451ad75cc2 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -760,8 +760,8 @@ class npc_hallows_end_soh : public CreatureScript { float radius = 100.0f; std::list<Player*> players; - Trinity::AnyPlayerInObjectRangeCheck checker(me, radius); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, players, checker); + acore::AnyPlayerInObjectRangeCheck checker(me, radius); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(me, players, checker); me->VisitNearbyWorldObject(radius, searcher); for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index c94936518a..64d1615d06 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -667,8 +667,8 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader // For nearby players, check if they have the same aura. If so, cast Romantic Picnic (45123) // required by achievement and "hearts" visual std::list<Player*> playerList; - Trinity::AnyPlayerInObjectRangeCheck checker(target, INTERACTION_DISTANCE*2); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(target, playerList, checker); + acore::AnyPlayerInObjectRangeCheck checker(target, INTERACTION_DISTANCE*2); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(target, playerList, checker); target->VisitNearbyWorldObject(INTERACTION_DISTANCE*2, searcher); for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index ab895742c3..1b6882ad25 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -163,7 +163,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::PowerCheck(POWER_MANA, false)); + targets.remove_if(acore::PowerCheck(POWER_MANA, false)); } void Register() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 4c88aebb68..57fb1cefcb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -880,16 +880,16 @@ void hyjalAI::JustDied(Unit* /*killer*/) void hyjalAI::HideNearPos(float x, float y) { - CellCoord pair(Trinity::ComputeCellCoord(x, y)); + CellCoord pair(acore::ComputeCellCoord(x, y)); Cell cell(pair); cell.SetNoCreate(); // First get all creatures. std::list<Creature*> creatures; - Trinity::AllFriendlyCreaturesInGrid creature_check(me); - Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check); + acore::AllFriendlyCreaturesInGrid creature_check(me); + acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check); - TypeContainerVisitor <Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> creature_visitor(creature_searcher); + TypeContainerVisitor <acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> creature_visitor(creature_searcher); cell.Visit(pair, creature_visitor, *(me->GetMap()), *me, me->GetGridActivationRange()); if (!creatures.empty()) @@ -904,13 +904,13 @@ void hyjalAI::HideNearPos(float x, float y) void hyjalAI::RespawnNearPos(float x, float y) { - CellCoord p(Trinity::ComputeCellCoord(x, y)); + CellCoord p(acore::ComputeCellCoord(x, y)); Cell cell(p); cell.SetNoCreate(); - Trinity::RespawnDo u_do; - Trinity::WorldObjectWorker<Trinity::RespawnDo> worker(me, u_do); - TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::RespawnDo>, GridTypeMapContainer > obj_worker(worker); + acore::RespawnDo u_do; + acore::WorldObjectWorker<acore::RespawnDo> worker(me, u_do); + TypeContainerVisitor<acore::WorldObjectWorker<acore::RespawnDo>, GridTypeMapContainer > obj_worker(worker); cell.Visit(p, obj_worker, *me->GetMap(), *me, me->GetGridActivationRange()); } @@ -935,16 +935,16 @@ void hyjalAI::WaypointReached(uint32 waypointId) } //do some talking //all alive guards walk near here - CellCoord pair(Trinity::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); // First get all creatures. std::list<Creature*> creatures; - Trinity::AllFriendlyCreaturesInGrid creature_check(me); - Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check); + acore::AllFriendlyCreaturesInGrid creature_check(me); + acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check); TypeContainerVisitor - <Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, + <acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> creature_visitor(creature_searcher); cell.Visit(pair, creature_visitor, *(me->GetMap()), *me, me->GetGridActivationRange()); @@ -976,15 +976,15 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) { if (TeleportTimer <= diff) { - CellCoord pair(Trinity::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); + CellCoord pair(acore::ComputeCellCoord(me->GetPositionX(), me->GetPositionY())); Cell cell(pair); cell.SetNoCreate(); std::list<Creature*> creatures; - Trinity::AllFriendlyCreaturesInGrid creature_check(me); - Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check); + acore::AllFriendlyCreaturesInGrid creature_check(me); + acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check); TypeContainerVisitor - <Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, + <acore::CreatureListSearcher<acore::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> creature_visitor(creature_searcher); cell.Visit(pair, creature_visitor, *(me->GetMap()), *me, me->GetGridActivationRange()); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 63df836501..28b0797ab9 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -180,8 +180,8 @@ class npc_belnistrasz : public CreatureScript DoCast(me, SPELL_IDOM_ROOM_CAMERA_SHAKE); me->SummonGameObject(GO_BELNISTRASZS_BRAZIER, 2577.196f, 947.0781f, 53.16757f, 2.356195f, 0, 0, 0.9238796f, 0.3826832f, 3600); std::list<WorldObject*> ClusterList; - Trinity::AllWorldObjectsInRange objects(me, 50.0f); - Trinity::WorldObjectListSearcher<Trinity::AllWorldObjectsInRange> searcher(me, ClusterList, objects); + acore::AllWorldObjectsInRange objects(me, 50.0f); + acore::WorldObjectListSearcher<acore::AllWorldObjectsInRange> searcher(me, ClusterList, objects); me->VisitNearbyObject(50.0f, searcher); for (std::list<WorldObject*>::const_iterator itr = ClusterList.begin(); itr != ClusterList.end(); ++itr) { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 12def2cf6b..130305c2ce 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -137,7 +137,7 @@ class boss_moam : public CreatureScript targetList.push_back((*itr)->getTarget()); } - Trinity::Containers::RandomResizeList(targetList, 5); + acore::Containers::RandomResizeList(targetList, 5); for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) DoCast(*itr, SPELL_DRAIN_MANA); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 31012d4826..bc0ed85a68 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -137,8 +137,8 @@ class spell_zulfarrak_unlocking : public SpellScriptLoader { GameObject* cage = GetHitGObj(); std::list<WorldObject*> cagesList; - Trinity::AllWorldObjectsInRange objects(GetCaster(), 15.0f); - Trinity::WorldObjectListSearcher<Trinity::AllWorldObjectsInRange> searcher(GetCaster(), cagesList, objects); + acore::AllWorldObjectsInRange objects(GetCaster(), 15.0f); + acore::WorldObjectListSearcher<acore::AllWorldObjectsInRange> searcher(GetCaster(), cagesList, objects); GetCaster()->VisitNearbyObject(15.0f, searcher); for (std::list<WorldObject*>::const_iterator itr = cagesList.begin(); itr != cagesList.end(); ++itr) { diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index a16ea2e29f..6dfc3d4adc 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -490,8 +490,8 @@ public: { float radius = 50.0f; std::list<Player*> players; - Trinity::AnyPlayerInObjectRangeCheck checker(me, radius); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, players, checker); + acore::AnyPlayerInObjectRangeCheck checker(me, radius); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(me, players, checker); me->VisitNearbyWorldObject(radius, searcher); for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 0d50532657..4c01c8c447 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -314,8 +314,8 @@ public: void IsSummonedBy(Unit* /*summoner*/) { std::list<Player*> playerOnQuestList; - Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, playerOnQuestList, checker); + acore::AnyPlayerInObjectRangeCheck checker(me, 5.0f); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(me, playerOnQuestList, checker); me->VisitNearbyWorldObject(5.0f, searcher); for (std::list<Player*>::const_iterator itr = playerOnQuestList.begin(); itr != playerOnQuestList.end(); ++itr) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 8fb2a6b56c..7707158ca0 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -275,7 +275,7 @@ class spell_shadow_sickle_periodic_damage : public SpellScriptLoader PlayerList.push_back(player); if (!PlayerList.empty()) - caster->CastSpell(Trinity::Containers::SelectRandomContainerElement(PlayerList), caster->GetMap()->IsHeroic() ? SPELL_SHADOW_SICKLE_H : SPELL_SHADOW_SICKLE, true); + caster->CastSpell(acore::Containers::SelectRandomContainerElement(PlayerList), caster->GetMap()->IsHeroic() ? SPELL_SHADOW_SICKLE_H : SPELL_SHADOW_SICKLE, true); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index c78d43d52b..44f2d4cc8a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -469,12 +469,12 @@ class spell_mistress_kiss_area : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { // get a list of players with mana - targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false)); - targets.remove_if(Trinity::PowerCheck(POWER_MANA, false)); + targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false)); + targets.remove_if(acore::PowerCheck(POWER_MANA, false)); if (targets.empty()) return; - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 46a900c968..3a0bcac142 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -365,7 +365,7 @@ public: void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 10.0f, false)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 10.0f, false)); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index ad24a0e226..2e154ca547 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -356,7 +356,7 @@ class boss_blood_queen_lana_thel : public CreatureScript myList.push_back(p); if (!myList.empty()) { - myList.sort(Trinity::ObjectDistanceOrderPred(me->GetVictim())); + myList.sort(acore::ObjectDistanceOrderPred(me->GetVictim())); Player* target = myList.front(); if (me->GetVictim()->GetGUID() != _tankGUID || target->GetGUID() != _offtankGUID) { @@ -424,7 +424,7 @@ class boss_blood_queen_lana_thel : public CreatureScript if (Player* p = itr->GetSource()) if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && p->GetDistance(me) < 100.0f && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) myList.push_back(p); - Trinity::Containers::RandomResizeList(myList, Is25ManRaid() ? 3 : 2); + acore::Containers::RandomResizeList(myList, Is25ManRaid() ? 3 : 2); if (myList.size() > 1) { Talk(SAY_PACT_OF_THE_DARKFALLEN); @@ -450,7 +450,7 @@ class boss_blood_queen_lana_thel : public CreatureScript if (!myList.empty()) { - Trinity::Containers::RandomResizeList(myList, 1); + acore::Containers::RandomResizeList(myList, 1); Player* target = myList.front(); Talk(EMOTE_SWARMING_SHADOWS, target); Talk(SAY_SWARMING_SHADOWS); @@ -472,7 +472,7 @@ class boss_blood_queen_lana_thel : public CreatureScript if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && !p->HasAura(SPELL_PACT_OF_THE_DARKFALLEN) && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) myList.push_back(p); - Trinity::Containers::RandomResizeList<Player*>(myList, uint32(Is25ManRaid() ? 4 : 2)); + acore::Containers::RandomResizeList<Player*>(myList, uint32(Is25ManRaid() ? 4 : 2)); for (std::list<Player*>::iterator itr = myList.begin(); itr != myList.end(); ++itr) me->CastSpell(*itr, SPELL_TWILIGHT_BLOODBOLT, false); me->CastSpell(me, SPELL_TWILIGHT_BLOODBOLT_TARGET, false); @@ -632,7 +632,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); + targets.remove_if(acore::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); bool remove = true; std::list<WorldObject*>::const_iterator itr, itr2, itrEnd = targets.end(); @@ -677,7 +677,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo void FilterTargets(std::list<WorldObject*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if(acore::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); unitList.push_back(GetCaster()); } @@ -732,7 +732,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader { uint32 targetCount = (targets.size() + 2) / 3; targets.remove_if(BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); - Trinity::Containers::RandomResizeList(targets, targetCount); + acore::Containers::RandomResizeList(targets, targetCount); // mark targets now, effect hook has missile travel time delay (might cast next in that time) for (std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) GetCaster()->GetAI()->SetGUID((*itr)->GetGUID(), GUID_BLOODBOLT); @@ -933,7 +933,7 @@ class spell_blood_queen_swarming_shadows_floor_dmg : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), GetSpellInfo()->Effects[0].CalcRadius(), true)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), GetSpellInfo()->Effects[0].CalcRadius(), true)); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 23890859d3..08ec76fe66 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -539,7 +539,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript if (_guardList.empty()) { GetCreatureListWithEntryInGrid(_guardList, me, NPC_SE_KOR_KRON_REAVER, 20.0f); - _guardList.sort(Trinity::ObjectDistanceOrderPred(me)); + _guardList.sort(acore::ObjectDistanceOrderPred(me)); } uint32 x = 1; for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr) @@ -801,7 +801,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript if (_guardList.empty()) { GetCreatureListWithEntryInGrid(_guardList, me, NPC_SE_SKYBREAKER_MARINE, 20.0f); - _guardList.sort(Trinity::ObjectDistanceOrderPred(me)); + _guardList.sort(acore::ObjectDistanceOrderPred(me)); } uint32 x = 1; for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr) @@ -1240,7 +1240,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader // select one random target, with preference of ranged targets uint32 targetsAtRange = 0; uint32 const minTargets = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 10 : 4); - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster(), false)); + targets.sort(acore::ObjectDistanceOrderPred(GetCaster(), false)); // get target count at range for (std::list<WorldObject*>::iterator itr = targets.begin(); itr != targets.end(); ++itr, ++targetsAtRange) @@ -1308,12 +1308,12 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader if (GetSpellInfo()->Id == 72385 || GetSpellInfo()->Id == 72442) // 10n, 10h { - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } else - Trinity::Containers::RandomResizeList(targets, 3); + acore::Containers::RandomResizeList(targets, 3); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 7688e105ca..25d0c43760 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -2203,7 +2203,7 @@ class spell_igb_explosion : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { targets.remove_if(IgbExplosionCheck(GetCaster())); - Trinity::Containers::RandomResizeList(targets, 1); + acore::Containers::RandomResizeList(targets, 1); } void Register() @@ -2472,7 +2472,7 @@ class spell_igb_burning_pitch_selector : public SpellScriptLoader targets.remove_if(BurningPitchFilterCheck(teamId == TEAM_HORDE ? GO_ORGRIMS_HAMMER_H : GO_THE_SKYBREAKER_A)); if (!targets.empty()) { - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } @@ -2557,7 +2557,7 @@ class spell_igb_rocket_artillery : public SpellScriptLoader if (!targets.empty()) { - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 5e3b369061..3238565ad7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -624,7 +624,7 @@ class boss_lady_deathwhisper : public CreatureScript return; // select random cultist - Creature* cultist = Trinity::Containers::SelectRandomContainerElement(temp); + Creature* cultist = acore::Containers::SelectRandomContainerElement(temp); if (!cultist) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 9bb029bed2..dabd5a3937 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -59,7 +59,7 @@ enum Events uint32 const boneSpikeSummonId[3] = {69062, 72669, 72670}; -struct BoneStormMoveTargetSelector : public ACORE::unary_function<Unit*, bool> +struct BoneStormMoveTargetSelector : public acore::unary_function<Unit*, bool> { public: BoneStormMoveTargetSelector(Creature* source) : _source(source) { } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index fc4faff42b..edeac5bdfa 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -188,7 +188,7 @@ private: }; // xinef: malleable goo selector, check for target validity -struct MalleableGooSelector : public ACORE::unary_function<Unit*, bool> +struct MalleableGooSelector : public acore::unary_function<Unit*, bool> { const Unit* me; MalleableGooSelector(Unit const* unit) : me(unit) {} @@ -873,7 +873,7 @@ class spell_putricide_slime_puddle : public SpellScriptLoader void ScaleRange(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 2.5f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 2.5f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true)); } // big hax to unlock Abomination Eat Ooze ability, requires caster aura spell from difficulty X, but unlocks clientside when got base aura @@ -1023,10 +1023,10 @@ class spell_putricide_tear_gas_effect : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { // vanish rank 1-3, mage invisibility - targets.remove_if(Trinity::UnitAuraCheck(true, 11327)); - targets.remove_if(Trinity::UnitAuraCheck(true, 11329)); - targets.remove_if(Trinity::UnitAuraCheck(true, 26888)); - targets.remove_if(Trinity::UnitAuraCheck(true, 32612)); + targets.remove_if(acore::UnitAuraCheck(true, 11327)); + targets.remove_if(acore::UnitAuraCheck(true, 11329)); + targets.remove_if(acore::UnitAuraCheck(true, 26888)); + targets.remove_if(acore::UnitAuraCheck(true, 32612)); } void Register() @@ -1101,8 +1101,8 @@ class spell_putricide_ooze_channel : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { // dbc has only 1 field for excluding, this will prevent anyone from getting both at the same time - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_VOLATILE_OOZE_PROTECTION)); - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_GASEOUS_BLOAT_PROTECTION)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_VOLATILE_OOZE_PROTECTION)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_GASEOUS_BLOAT_PROTECTION)); if (targets.empty()) { @@ -1111,7 +1111,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader return; } - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); _target = target; @@ -1264,8 +1264,8 @@ class spell_putricide_unbound_plague : public SpellScriptLoader } - targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); - Trinity::Containers::RandomResizeList(targets, 1); + targets.remove_if(acore::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); + acore::Containers::RandomResizeList(targets, 1); } void HandleScript(SpellEffIndex /*effIndex*/) @@ -1635,7 +1635,7 @@ class spell_putricide_eat_ooze : public SpellScriptLoader if (targets.empty()) return; - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + targets.sort(acore::ObjectDistanceOrderPred(GetCaster())); WorldObject* target = targets.front(); targets.clear(); targets.push_back(target); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 5d7349cac5..016e198110 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -502,12 +502,12 @@ class spell_rotface_mutated_infection : public SpellScriptLoader { // remove targets with this aura already // tank is not on this list - targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + targets.remove_if(acore::UnitAuraCheck(true, GetSpellInfo()->Id)); targets.remove(GetCaster()->GetVictim()); if (targets.empty()) return; - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); _target = target; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 9d69d35b33..935482be4a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -227,7 +227,7 @@ class IceTombSummonEvent : public BasicEvent uint64 _sindragosaGUID; }; -struct LastPhaseIceTombTargetSelector : public ACORE::unary_function<Unit*, bool> +struct LastPhaseIceTombTargetSelector : public acore::unary_function<Unit*, bool> { public: LastPhaseIceTombTargetSelector(Creature* source) : _source(source) { } @@ -914,10 +914,10 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1); healList.remove_if(UnchainedMagicTargetSelector(false)); if (healList.size() > maxSize) - Trinity::Containers::RandomResizeList(healList, maxSize); + acore::Containers::RandomResizeList(healList, maxSize); dpsList.remove_if(UnchainedMagicTargetSelector(true)); if (dpsList.size() > maxSize) - Trinity::Containers::RandomResizeList(dpsList, maxSize); + acore::Containers::RandomResizeList(dpsList, maxSize); unitList.splice(unitList.begin(), healList); unitList.splice(unitList.begin(), dpsList); } @@ -1214,7 +1214,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + unitList.remove_if(acore::UnitAuraCheck(true, GetSpellInfo()->Id)); targetList.clear(); targetList = unitList; } @@ -1933,11 +1933,11 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false)); + targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false)); if (targets.empty()) return; - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } @@ -1954,7 +1954,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader if (unitList.empty()) return; - Trinity::Containers::SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); + acore::Containers::SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index b33041dee3..8fdae96338 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -359,7 +359,7 @@ void SendPacketToPlayers(WorldPacket const* data, Unit* source) } -struct NonTankLKTargetSelector : public ACORE::unary_function<Unit*, bool> +struct NonTankLKTargetSelector : public acore::unary_function<Unit*, bool> { public: NonTankLKTargetSelector(Creature* source, bool playerOnly = true, bool reqLOS = false, float maxDist = 0.0f, uint32 exclude1 = 0, uint32 exclude2 = 0) : _source(source), _playerOnly(playerOnly), _reqLOS(reqLOS), _maxDist(maxDist), _exclude1(exclude1), _exclude2(exclude2) { } @@ -394,7 +394,7 @@ private: }; -struct DefileTargetSelector : public ACORE::unary_function<Unit*, bool> +struct DefileTargetSelector : public acore::unary_function<Unit*, bool> { public: DefileTargetSelector(Creature* source) : _source(source) { } @@ -551,7 +551,7 @@ private: Creature& _owner; }; -class NecroticPlagueTargetCheck : public ACORE::unary_function<Unit*, bool> +class NecroticPlagueTargetCheck : public acore::unary_function<Unit*, bool> { public: NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1, uint32 notAura2) : _sourceObj(obj), _notAura1(notAura1), _notAura2(notAura2) {} @@ -664,7 +664,7 @@ class boss_the_lich_king : public CreatureScript // Reset The Frozen Throne gameobjects FrozenThroneResetWorker reset; - Trinity::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset); + acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset); me->VisitNearbyGridObject(333.0f, worker); me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me); @@ -1950,7 +1950,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + targets.sort(acore::ObjectDistanceOrderPred(GetCaster())); if (targets.size() <= 1) return; @@ -2418,9 +2418,9 @@ class spell_the_lich_king_defile : public SpellScriptLoader void CorrectRange(std::list<WorldObject*>& targets) { targets.remove_if(VehicleCheck()); - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 10.0f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 10.0f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true)); uint32 strangulatedAura[4] = {68980, 74325, 74296, 74297}; - targets.remove_if(Trinity::UnitAuraCheck(true, strangulatedAura[GetCaster()->GetMap()->GetDifficulty()])); + targets.remove_if(acore::UnitAuraCheck(true, strangulatedAura[GetCaster()->GetMap()->GetDifficulty()])); } void ChangeDamageAndGrow() @@ -2562,7 +2562,7 @@ class npc_valkyr_shadowguard : public CreatureScript if (!triggers.empty()) { valid = true; - triggers.sort(Trinity::ObjectDistanceOrderPred(me)); + triggers.sort(acore::ObjectDistanceOrderPred(me)); target->GetMotionMaster()->Clear(); target->UpdatePosition(*me, true); @@ -2785,9 +2785,9 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader targets.clear(); return; } - targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_BOSS_HITTIN_YA_AURA)); // done in dbc, but just to be sure xd - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_HARVEST_SOUL_VALKYR)); + targets.remove_if(acore::UnitAuraCheck(true, GetSpellInfo()->Id)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_BOSS_HITTIN_YA_AURA)); // done in dbc, but just to be sure xd + targets.remove_if(acore::UnitAuraCheck(true, SPELL_HARVEST_SOUL_VALKYR)); if (InstanceScript* _instance = caster->GetInstanceScript()) if (Creature* lichKing = ObjectAccessor::GetCreature(*caster, _instance->GetData64(DATA_THE_LICH_KING))) if (Spell* s = lichKing->GetCurrentSpell(CURRENT_GENERIC_SPELL)) @@ -2797,7 +2797,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader if (targets.empty()) return; - _target = Trinity::Containers::SelectRandomContainerElement(targets); + _target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(_target); if (Creature* caster = GetCaster()->ToCreature()) @@ -2976,7 +2976,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa if (targets.empty()) return; - _target = Trinity::Containers::SelectRandomContainerElement(targets); + _target = acore::Containers::SelectRandomContainerElement(targets); } void HandleScript(SpellEffIndex effIndex) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 8c166ac5ea..27ef52d6f0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -144,7 +144,7 @@ class RisenArchmageCheck } }; -struct ManaVoidSelector : public ACORE::unary_function<Unit*, bool> +struct ManaVoidSelector : public acore::unary_function<Unit*, bool> { explicit ManaVoidSelector(WorldObject const* source) : _source(source) { } @@ -205,7 +205,7 @@ class ValithriaDespawner : public BasicEvent bool Execute(uint64 /*currTime*/, uint32 /*diff*/) { - Trinity::CreatureWorker<ValithriaDespawner> worker(_creature, *this); + acore::CreatureWorker<ValithriaDespawner> worker(_creature, *this); _creature->VisitNearbyGridObject(333.0f, worker); _creature->AI()->Reset(); _creature->setActive(false); @@ -525,7 +525,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript std::list<Creature*> archmages; RisenArchmageCheck check; - Trinity::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check); + acore::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check); me->VisitNearbyGridObject(100.0f, searcher); for (std::list<Creature*>::iterator itr = archmages.begin(); itr != archmages.end(); ++itr) (*itr)->AI()->DoAction(ACTION_ENTER_COMBAT); @@ -1305,9 +1305,9 @@ class spell_dreamwalker_summoner : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 250.0f, true)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 250.0f, true)); std::list<WorldObject*> list_copy = targets; - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); if (targets.empty()) { if (list_copy.empty()) @@ -1315,7 +1315,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader targets = list_copy; } - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } @@ -1361,14 +1361,14 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader std::list<Creature*> summoners; caster->GetCreaturesWithEntryInRange(summoners, 200.0f, NPC_WORLD_TRIGGER); std::list<Creature*> list_copy = summoners; - summoners.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + summoners.remove_if(acore::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); if (summoners.empty()) { if (list_copy.empty()) return; summoners = list_copy; } - Trinity::Containers::RandomResizeList(summoners, 2); + acore::Containers::RandomResizeList(summoners, 2); for (uint32 i = 0; i < 3; ++i) caster->CastSpell(summoners.front(), SPELL_SUMMON_SUPPRESSER, true); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index be1b276c6b..1288a68246 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -831,7 +831,7 @@ class npc_crok_scourgebane : public CreatureScript // get all nearby vrykul std::list<Creature*> temp; FrostwingVrykulSearcher check(me, 150.0f); - Trinity::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check); + acore::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check); me->VisitNearbyGridObject(150.0f, searcher); _aliveTrash.clear(); @@ -875,15 +875,15 @@ class npc_crok_scourgebane : public CreatureScript _wipeCheckTimer = 3000; Player* player = NULL; - Trinity::AnyPlayerInObjectRangeCheck check(me, 140.0f); - Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, player, check); + acore::AnyPlayerInObjectRangeCheck check(me, 140.0f); + acore::PlayerSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(me, player, check); me->VisitNearbyWorldObject(140.0f, searcher); // wipe if (!player || me->GetExactDist(4357.0f, 2606.0f, 350.0f) > 125.0f) { //Talk(SAY_CROK_DEATH); FrostwingGauntletRespawner respawner; - Trinity::CreatureWorker<FrostwingGauntletRespawner> worker(me, respawner); + acore::CreatureWorker<FrostwingGauntletRespawner> worker(me, respawner); me->VisitNearbyGridObject(333.0f, worker); return; } @@ -1330,7 +1330,7 @@ class npc_captain_arnath : public CreatureScript { std::list<Creature*> targets = DoFindFriendlyMissingBuff(40.0f, SPELL_POWER_WORD_SHIELD); if (!targets.empty()) - DoCast(Trinity::Containers::SelectRandomContainerElement(targets), SPELL_POWER_WORD_SHIELD); + DoCast(acore::Containers::SelectRandomContainerElement(targets), SPELL_POWER_WORD_SHIELD); Events.ScheduleEvent(EVENT_ARNATH_PW_SHIELD, urand(15000, 20000)); break; } @@ -1354,8 +1354,8 @@ class npc_captain_arnath : public CreatureScript Creature* FindFriendlyCreature() const { Creature* target = NULL; - Trinity::MostHPMissingInRange u_check(me, 60.0f, 0); - Trinity::CreatureLastSearcher<Trinity::MostHPMissingInRange> searcher(me, target, u_check); + acore::MostHPMissingInRange u_check(me, 60.0f, 0); + acore::CreatureLastSearcher<acore::MostHPMissingInRange> searcher(me, target, u_check); me->VisitNearbyGridObject(60.0f, searcher); return target; } @@ -1957,7 +1957,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader std::list<Creature*> wards; GetCaster()->GetCreatureListWithEntryInGrid(wards, NPC_DEATHBOUND_WARD, range); - wards.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + wards.sort(acore::ObjectDistanceOrderPred(GetCaster())); for (std::list<Creature*>::iterator itr = wards.begin(); itr != wards.end(); ++itr) { if ((*itr)->IsAlive() && (*itr)->HasAura(SPELL_STONEFORM)) @@ -2056,8 +2056,8 @@ class spell_frost_giant_death_plague : public SpellScriptLoader // First effect void CountTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false)); - targets.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetGUID(), true)); + targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false)); + targets.remove_if(acore::ObjectGUIDCheck(GetCaster()->GetGUID(), true)); bool kill = true; for (std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) @@ -2150,7 +2150,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader void RemoveAliveTarget(std::list<WorldObject*>& targets) { targets.remove_if(AliveCheck()); - Trinity::Containers::RandomResizeList(targets, 2); + acore::Containers::RandomResizeList(targets, 2); } void Land(SpellEffIndex /*effIndex*/) @@ -2265,7 +2265,7 @@ class at_icc_saurfang_portal : public AreaTriggerScript instance->SetData(DATA_COLDFLAME_JETS, IN_PROGRESS); std::list<Creature*> traps; GetCreatureListWithEntryInGrid(traps, player, NPC_FROST_FREEZE_TRAP, 120.0f); - traps.sort(Trinity::ObjectDistanceOrderPred(player)); + traps.sort(acore::ObjectDistanceOrderPred(player)); bool instant = false; for (std::list<Creature*>::iterator itr = traps.begin(); itr != traps.end(); ++itr) { @@ -2323,7 +2323,7 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript if (!crok->IsAlive()) { FrostwingGauntletRespawner respawner; - Trinity::CreatureWorker<FrostwingGauntletRespawner> worker(crok, respawner); + acore::CreatureWorker<FrostwingGauntletRespawner> worker(crok, respawner); crok->VisitNearbyGridObject(333.0f, worker); return true; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index d43dd4412f..d67bbfdd6c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1545,7 +1545,7 @@ class instance_icecrown_citadel : public InstanceMapScript if (stalkers.empty()) return; - stalkers.sort(Trinity::ObjectDistanceOrderPred(teleporter)); + stalkers.sort(acore::ObjectDistanceOrderPred(teleporter)); stalkers.front()->CastSpell((Unit*)NULL, SPELL_ARTHAS_TELEPORTER_CEREMONY, false); stalkers.pop_front(); for (std::list<Creature*>::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) @@ -1776,7 +1776,7 @@ class instance_icecrown_citadel : public InstanceMapScript GetCreatureListWithEntryInGrid(triggers, terenas, NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f); if (!triggers.empty()) { - triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, false)); + triggers.sort(acore::ObjectDistanceOrderPred(terenas, false)); Unit* visual = triggers.front(); visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index b145150c5f..5a1def2100 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -166,7 +166,7 @@ const Position PosPlatform = {2640.5f, -3360.6f, 285.26f, 0.0f}; #define IN_LIVE_SIDE(who) (who->GetPositionY() < POS_Y_GATE) // Predicate function to check that the r efzr unit is NOT on the same side as the source. -struct NotOnSameSide : public ACORE::unary_function<Unit *, bool> +struct NotOnSameSide : public acore::unary_function<Unit *, bool> { bool m_inLiveSide; explicit NotOnSameSide(Unit *pSource) : m_inLiveSide(IN_LIVE_SIDE(pSource)) {} @@ -673,7 +673,7 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK)); + targets.remove_if(acore::UnitAuraCheck(false, SPELL_SHADOW_MARK)); } void Register() override diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 7760b03c31..b09e9c4110 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -892,8 +892,8 @@ public: else if (me->GetEntry() == NPC_LIVING_POISON) { Unit* target = nullptr; - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 0.5f); - Trinity::UnitLastSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, target, u_check); + acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 0.5f); + acore::UnitLastSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, target, u_check); me->VisitNearbyObject(1.5f, searcher); if (target) me->CastSpell(me, SPELL_FROGGER_EXPLODE, true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 94d61bd5a3..ac18983b3e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -271,7 +271,7 @@ class spell_boss_magus_telestra_gravity_well : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::RandomCheck(50)); + targets.remove_if(acore::RandomCheck(50)); } void HandlePull(SpellEffIndex effIndex) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 390a65e96c..7c228f71f3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1983,7 +1983,7 @@ class spell_pursue : public SpellScriptLoader else { //! In the end, only one target should be selected - WorldObject* _target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* _target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); if (_target) targets.push_back(_target); @@ -2033,8 +2033,8 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader { // use 99 because it is 3d search std::list<WorldObject*> targetList; - Trinity::WorldObjectSpellAreaTargetCheck check(99, GetExplTargetDest(), GetCaster(), GetCaster(), GetSpellInfo(), TARGET_CHECK_DEFAULT, nullptr); - Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck> searcher(GetCaster(), targetList, check); + acore::WorldObjectSpellAreaTargetCheck check(99, GetExplTargetDest(), GetCaster(), GetCaster(), GetSpellInfo(), TARGET_CHECK_DEFAULT, nullptr); + acore::WorldObjectListSearcher<acore::WorldObjectSpellAreaTargetCheck> searcher(GetCaster(), targetList, check); GetCaster()->GetMap()->VisitAll(GetCaster()->m_positionX, GetCaster()->m_positionY, 99, searcher); float minDist = 99 * 99; Unit* target = nullptr; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 67eba6a034..73995370f9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -398,9 +398,9 @@ public: Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) targets.push_back(itr->GetSource()); - targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false)); - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER)); - Trinity::Containers::RandomResizeList(targets, 2); + targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER)); + acore::Containers::RandomResizeList(targets, 2); for (std::list<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) { float prevZ = (*itr)->GetPositionZ(); @@ -1232,9 +1232,9 @@ public: void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false)); - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER)); - Trinity::Containers::RandomResizeList(targets, 1); + targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER)); + acore::Containers::RandomResizeList(targets, 1); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index c8f83f0d87..bbe490892c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -639,7 +639,7 @@ public: // predicate function to select non main tank target -class StoneGripTargetSelector : public ACORE::unary_function<Unit*, bool> +class StoneGripTargetSelector : public acore::unary_function<Unit*, bool> { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {} diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index d61ce06db3..1c8d7483f2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -952,7 +952,7 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { if (Unit* victim = GetCaster()->GetVictim()) - targets.remove_if(Trinity::ObjectGUIDCheck(victim->GetGUID(), true)); + targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true)); } void Register() @@ -1034,7 +1034,7 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { if (Unit* victim = GetCaster()->GetVictim()) - targets.remove_if(Trinity::ObjectGUIDCheck(victim->GetGUID(), true)); + targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true)); } void Register() diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 4cc3737e32..dfb5802fc9 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -546,7 +546,7 @@ class npc_minigob_manabonk : public CreatureScript if (PlayerInDalaranList.empty()) return NULL; - return Trinity::Containers::SelectRandomContainerElement(PlayerInDalaranList); + return acore::Containers::SelectRandomContainerElement(PlayerInDalaranList); } void SendMailToPlayer(Player* player) diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index b30ec3eb0c..6c31e48a39 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -765,7 +765,7 @@ public: if (GameObject* go = me->FindNearestGameObject(GO_SAC_LIGHTS_VENGEANCE_2, 150.0f)) go->Delete(); WretchedGhoulCleaner cleaner; - Trinity::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner); + acore::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner); me->VisitNearbyGridObject(150.0f, worker); } @@ -978,7 +978,7 @@ public: case 17: // kill vegard { WretchedGhoulCleaner cleaner; - Trinity::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner); + acore::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner); me->VisitNearbyGridObject(150.0f, worker); if (Creature* c = me->FindNearestCreature(NPC_SAC_LIGHTS_VENGEANCE, 150.0f, true)) @@ -1185,7 +1185,7 @@ class spell_q24545_aod_special : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(GhoulTargetCheck(GetSpellInfo()->Id == 70790)); - Trinity::Containers::RandomResizeList(targets, 2); + acore::Containers::RandomResizeList(targets, 2); } void HandleScript(SpellEffIndex effIndex) diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index f6d2865b3e..34ffe4f719 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -1454,10 +1454,10 @@ public: switch (GetSpellInfo()->Id) { case SPELL_CORRECT_TRACKS: - player->MonsterSay(sObjectMgr->GetTrinityStringForDBCLocale(SAY_CORRECT_TRACKS), LANG_UNIVERSAL, player); + player->MonsterSay(sObjectMgr->GetAcoreStringForDBCLocale(SAY_CORRECT_TRACKS), LANG_UNIVERSAL, player); break; case SPELL_INCORRECT_TRACKS: - player->MonsterSay(sObjectMgr->GetTrinityStringForDBCLocale(SAY_INCORRECT_TRACKS), LANG_UNIVERSAL, player); + player->MonsterSay(sObjectMgr->GetAcoreStringForDBCLocale(SAY_INCORRECT_TRACKS), LANG_UNIVERSAL, player); break; default: break; diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 1400c6c3dd..1ec46a6c9a 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -212,7 +212,7 @@ class npc_wg_spirit_guide : public CreatureScript GraveyardVect graveyard = wintergrasp->GetGraveyardVector(); for (uint8 i = 0; i < graveyard.size(); i++) if (graveyard[i]->GetControlTeamId() == player->GetTeamId()) - AddGossipItemFor(player, GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(((BfGraveyardWG*)graveyard[i])->GetTextId()), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + i); + AddGossipItemFor(player, GOSSIP_ICON_CHAT, sObjectMgr->GetAcoreStringForDBCLocale(((BfGraveyardWG*)graveyard[i])->GetTextId()), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + i); SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID()); return true; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 47c1772396..48988b3269 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -30,12 +30,12 @@ void OPvPCapturePointEP_EWT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_EWT, TEAM_NEUTRAL); } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_EWT, TEAM_NEUTRAL); } @@ -48,14 +48,14 @@ void OPvPCapturePointEP_EWT::ChangeState() artkit = 2; SummonSupportUnitAtNorthpassTower(TEAM_ALLIANCE); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_EWT, TEAM_ALLIANCE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; SummonSupportUnitAtNorthpassTower(TEAM_HORDE); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_EWT, TEAM_HORDE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -168,12 +168,12 @@ void OPvPCapturePointEP_NPT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_NPT, TEAM_NEUTRAL); } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_NPT, TEAM_NEUTRAL); } @@ -186,14 +186,14 @@ void OPvPCapturePointEP_NPT::ChangeState() artkit = 2; SummonGO(TEAM_ALLIANCE); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_NPT, TEAM_ALLIANCE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; SummonGO(TEAM_HORDE); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_NPT, TEAM_HORDE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -310,12 +310,12 @@ void OPvPCapturePointEP_CGT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, TEAM_NEUTRAL); } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, TEAM_NEUTRAL); } @@ -328,14 +328,14 @@ void OPvPCapturePointEP_CGT::ChangeState() artkit = 2; LinkGraveyard(TEAM_ALLIANCE); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, TEAM_ALLIANCE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; LinkGraveyard(TEAM_HORDE); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, TEAM_HORDE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -439,12 +439,12 @@ void OPvPCapturePointEP_PWT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_PWT, TEAM_NEUTRAL); } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_PWT, TEAM_NEUTRAL); } @@ -457,14 +457,14 @@ void OPvPCapturePointEP_PWT::ChangeState() SummonFlightMaster(TEAM_ALLIANCE); artkit = 2; ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_PWT, TEAM_ALLIANCE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; SummonFlightMaster(TEAM_HORDE); artkit = 1; ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_PWT, TEAM_HORDE); - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -573,7 +573,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(TeamId teamId) GossipOption gso; gso.Action = GOSSIP_OPTION_OUTDOORPVP; gso.GossipId = 0; - gso.OptionText.assign(sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_NPT)); + gso.OptionText.assign(sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_FLIGHT_NPT)); gso.Id = 50; gso.Icon = 0; gso.NpcFlag = 0; @@ -583,7 +583,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(TeamId teamId) gso.Action = GOSSIP_OPTION_OUTDOORPVP; gso.GossipId = 0; - gso.OptionText.assign(sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_EWT)); + gso.OptionText.assign(sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_FLIGHT_EWT)); gso.Id = 50; gso.Icon = 0; gso.NpcFlag = 0; @@ -593,7 +593,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(TeamId teamId) gso.Action = GOSSIP_OPTION_OUTDOORPVP; gso.GossipId = 0; - gso.OptionText.assign(sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_CGT)); + gso.OptionText.assign(sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_FLIGHT_CGT)); gso.Id = 50; gso.Icon = 0; gso.NpcFlag = 0; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 47d61b42d6..38e1ddc967 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -166,13 +166,13 @@ void OPvPCapturePointHP::ChangeState() field = HP_MAP_A[m_TowerType]; if (uint32 alliance_towers = ((OutdoorPvPHP*)m_PvP)->GetAllianceTowersControlled()) ((OutdoorPvPHP*)m_PvP)->SetAllianceTowersControlled(--alliance_towers); - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType])); break; case OBJECTIVESTATE_HORDE: field = HP_MAP_H[m_TowerType]; if (uint32 horde_towers = ((OutdoorPvPHP*)m_PvP)->GetHordeTowersControlled()) ((OutdoorPvPHP*)m_PvP)->SetHordeTowersControlled(--horde_towers); - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: field = HP_MAP_N[m_TowerType]; @@ -209,7 +209,7 @@ void OPvPCapturePointHP::ChangeState() uint32 alliance_towers = ((OutdoorPvPHP*)m_PvP)->GetAllianceTowersControlled(); if (alliance_towers < 3) ((OutdoorPvPHP*)m_PvP)->SetAllianceTowersControlled(++alliance_towers); - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType])); break; } case OBJECTIVESTATE_HORDE: @@ -220,7 +220,7 @@ void OPvPCapturePointHP::ChangeState() uint32 horde_towers = ((OutdoorPvPHP*)m_PvP)->GetHordeTowersControlled(); if (horde_towers < 3) ((OutdoorPvPHP*)m_PvP)->SetHordeTowersControlled(++horde_towers); - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType])); break; } case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 7e4b035469..845c1f1c42 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -123,9 +123,9 @@ void OPvPCapturePointNA::FactionTakeOver(TeamId teamId) if (m_ControllingFaction != TEAM_NEUTRAL) sGraveyard->RemoveGraveyardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); if (m_ControllingFaction == TEAM_ALLIANCE) - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); else if (m_ControllingFaction == TEAM_HORDE) - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); m_ControllingFaction = teamId; if (m_ControllingFaction != TEAM_NEUTRAL) @@ -147,7 +147,7 @@ void OPvPCapturePointNA::FactionTakeOver(TeamId teamId) m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0); m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 1); m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A)); } else { @@ -159,7 +159,7 @@ void OPvPCapturePointNA::FactionTakeOver(TeamId teamId) m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 1); m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0); m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H)); } UpdateWyvernRoostWorldState(NA_ROOST_S); UpdateWyvernRoostWorldState(NA_ROOST_N); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index acf698c38f..2b5e339b19 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -74,7 +74,7 @@ void OutdoorPvPSI::HandlePlayerLeaveZone(Player* player, uint32 zone) bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger) { - TRINITY_GUARD(ACE_Thread_Mutex, sOutdoorPvPMgr->_lock); + ACORE_GUARD(ACE_Thread_Mutex, sOutdoorPvPMgr->_lock); switch (trigger) { @@ -87,7 +87,7 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger) if (m_Gathered_A >= SI_MAX_RESOURCES) { TeamApplyBuff(TEAM_ALLIANCE, SI_CENARION_FAVOR, 0, player); - sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A)); + sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A)); m_LastController = TEAM_ALLIANCE; m_Gathered_A = 0; m_Gathered_H = 0; @@ -113,7 +113,7 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger) if (m_Gathered_H >= SI_MAX_RESOURCES) { TeamApplyBuff(TEAM_HORDE, SI_CENARION_FAVOR, 0, player); - sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H)); + sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H)); m_LastController = TEAM_HORDE; m_Gathered_A = 0; m_Gathered_H = 0; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 6d08777ccf..5e1aa939c3 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -275,14 +275,14 @@ void OPvPCapturePointTF::ChangeState() { if (uint32 alliance_towers = ((OutdoorPvPTF*)m_PvP)->GetAllianceTowersControlled()) ((OutdoorPvPTF*)m_PvP)->SetAllianceTowersControlled(--alliance_towers); - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_TF_LOSE_A)); } // if changing from controlling horde to alliance else if (m_OldState == OBJECTIVESTATE_HORDE) { if (uint32 horde_towers = ((OutdoorPvPTF*)m_PvP)->GetHordeTowersControlled()) ((OutdoorPvPTF*)m_PvP)->SetHordeTowersControlled(--horde_towers); - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_TF_LOSE_H)); } uint32 artkit = 21; @@ -297,7 +297,7 @@ void OPvPCapturePointTF::ChangeState() if (alliance_towers < TF_TOWER_NUM) ((OutdoorPvPTF*)m_PvP)->SetAllianceTowersControlled(++alliance_towers); - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A)); for (PlayerSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) @@ -312,7 +312,7 @@ void OPvPCapturePointTF::ChangeState() if (horde_towers < TF_TOWER_NUM) ((OutdoorPvPTF*)m_PvP)->SetHordeTowersControlled(++horde_towers); - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H)); for (PlayerSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 199f1c6a7d..76ce924ff0 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -68,14 +68,14 @@ void OPvPCapturePointZM_Beacon::ChangeState() { if (uint32 alliance_towers = ((OutdoorPvPZM*)m_PvP)->GetAllianceTowersControlled()) ((OutdoorPvPZM*)m_PvP)->SetAllianceTowersControlled(--alliance_towers); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(ZMBeaconLoseA[m_TowerType])); } // if changing from controlling horde to alliance else if (m_OldState == OBJECTIVESTATE_HORDE) { if (uint32 horde_towers = ((OutdoorPvPZM*)m_PvP)->GetHordeTowersControlled()) ((OutdoorPvPZM*)m_PvP)->SetHordeTowersControlled(--horde_towers); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); } switch (m_State) @@ -86,7 +86,7 @@ void OPvPCapturePointZM_Beacon::ChangeState() uint32 alliance_towers = ((OutdoorPvPZM*)m_PvP)->GetAllianceTowersControlled(); if (alliance_towers < ZM_NUM_BEACONS) ((OutdoorPvPZM*)m_PvP)->SetAllianceTowersControlled(++alliance_towers); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(ZMBeaconCaptureA[m_TowerType])); break; } case OBJECTIVESTATE_HORDE: @@ -95,7 +95,7 @@ void OPvPCapturePointZM_Beacon::ChangeState() uint32 horde_towers = ((OutdoorPvPZM*)m_PvP)->GetHordeTowersControlled(); if (horde_towers < ZM_NUM_BEACONS) ((OutdoorPvPZM*)m_PvP)->SetHordeTowersControlled(++horde_towers); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(ZMBeaconCaptureH[m_TowerType])); break; } case OBJECTIVESTATE_NEUTRAL: @@ -211,7 +211,7 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* player, uint64 guid) if (player->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A) { if (m_GraveYardState == ZM_GRAVEYARD_H) - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H)); m_GraveYardState = ZM_GRAVEYARD_A; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant AddObject(0, ZM_Banner_A.entry, ZM_Banner_A.map, ZM_Banner_A.x, ZM_Banner_A.y, ZM_Banner_A.z, ZM_Banner_A.o, ZM_Banner_A.rot0, ZM_Banner_A.rot1, ZM_Banner_A.rot2, ZM_Banner_A.rot3); @@ -219,12 +219,12 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* player, uint64 guid) sGraveyard->AddGraveyardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, TEAM_ALLIANCE, false); // add gy m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF, 0, player); player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A)); } else if (player->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H) { if (m_GraveYardState == ZM_GRAVEYARD_A) - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A)); m_GraveYardState = ZM_GRAVEYARD_H; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant AddObject(0, ZM_Banner_H.entry, ZM_Banner_H.map, ZM_Banner_H.x, ZM_Banner_H.y, ZM_Banner_H.z, ZM_Banner_H.o, ZM_Banner_H.rot0, ZM_Banner_H.rot1, ZM_Banner_H.rot2, ZM_Banner_H.rot3); @@ -232,7 +232,7 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* player, uint64 guid) sGraveyard->AddGraveyardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, TEAM_HORDE, false); // add gy m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF, 0, player); player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H)); } UpdateTowerState(); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index cda0db5d1d..1cc0c9a4fa 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -193,8 +193,8 @@ class spell_murmur_thundering_storm : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 100.0f, true)); - targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 25.0f, false)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 100.0f, true)); + targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 25.0f, false)); } void Register() diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 2ffb806415..7e74274ad0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -200,7 +200,7 @@ class spell_gurtogg_bloodboil : public SpellScriptLoader if (targets.empty()) return; - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster(), false)); + targets.sort(acore::ObjectDistanceOrderPred(GetCaster(), false)); if (targets.size() > GetSpellValue()->MaxAffectedTargets) { std::list<WorldObject*>::iterator itr = targets.begin(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index a361ac1e1c..318968d585 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -258,7 +258,7 @@ class spell_mother_shahraz_fatal_attraction : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SABER_LASH_IMMUNITY)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_SABER_LASH_IMMUNITY)); if (targets.size() <= 1) FinishCast(SPELL_FAILED_DONT_REPORT); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 29adcc52a5..322954c00a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -612,7 +612,7 @@ class spell_reliquary_of_souls_fixate : public SpellScriptLoader if (targets.empty()) return; - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + targets.sort(acore::ObjectDistanceOrderPred(GetCaster())); WorldObject* target = targets.front(); targets.clear(); targets.push_back(target); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index f2e28245cb..0646304760 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -49,7 +49,7 @@ enum Misc EVENT_TALK_KILL = 10 }; -struct ShadowOfDeathSelector : public ACORE::unary_function<Unit*, bool> +struct ShadowOfDeathSelector : public acore::unary_function<Unit*, bool> { bool operator()(Unit const* target) const { diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index aa2324085d..fc8842403c 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -86,7 +86,7 @@ enum Misc EVENT_KILL_TALK = 100 }; -struct HammerOfJusticeSelector : public ACORE::unary_function<Unit*, bool> +struct HammerOfJusticeSelector : public acore::unary_function<Unit*, bool> { Unit const* _me; HammerOfJusticeSelector(Unit* me) : _me(me) { } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index effcab5203..c69605e465 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -402,7 +402,7 @@ class spell_leotheras_insidious_whisper : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& unitList) { if (Unit* victim = GetCaster()->GetVictim()) - unitList.remove_if(Trinity::ObjectGUIDCheck(victim->GetGUID(), true)); + unitList.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true)); } void Register() diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index bc7f8a0893..2af6529e19 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -200,7 +200,7 @@ class spell_morogrim_tidewalker_water_globule_new_target : public SpellScriptLoa void FilterTargets(std::list<WorldObject*>& unitList) { - Trinity::Containers::RandomResizeList(unitList, 1); + acore::Containers::RandomResizeList(unitList, 1); } void HandleDummy(SpellEffIndex effIndex) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 899a5b7a3e..b9c0aca5e4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -245,7 +245,7 @@ class spell_tsh_shoot_flame_arrow : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& unitList) { - Trinity::Containers::RandomResizeList(unitList, 1); + acore::Containers::RandomResizeList(unitList, 1); } void HandleScriptEffect(SpellEffIndex effIndex) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index e0b66ca35e..373e6338b6 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -835,7 +835,7 @@ class spell_kaelthas_mind_control : public SpellScriptLoader void SelectTarget(std::list<WorldObject*>& targets) { if (Unit* victim = GetCaster()->GetVictim()) - targets.remove_if(Trinity::ObjectGUIDCheck(victim->GetGUID(), true)); + targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true)); } void Register() @@ -995,7 +995,7 @@ class spell_kaelthas_nether_beam : public SpellScriptLoader targetList.push_back(target); } - Trinity::Containers::RandomResizeList(targetList, 5); + acore::Containers::RandomResizeList(targetList, 5); for (std::list<Unit*>::const_iterator itr = targetList.begin(); itr != targetList.end(); ++itr) GetCaster()->CastSpell(*itr, SPELL_NETHER_BEAM_DAMAGE, true); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index b611ba5035..0f17ad869a 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -692,8 +692,8 @@ class npc_simon_bunny : public CreatureScript me->SetObjectScale(large ? 2.0f : 1.0f); std::list<WorldObject*> ClusterList; - Trinity::AllWorldObjectsInRange objects(me, searchDistance); - Trinity::WorldObjectListSearcher<Trinity::AllWorldObjectsInRange> searcher(me, ClusterList, objects); + acore::AllWorldObjectsInRange objects(me, searchDistance); + acore::WorldObjectListSearcher<acore::AllWorldObjectsInRange> searcher(me, ClusterList, objects); me->VisitNearbyObject(searchDistance, searcher); for (std::list<WorldObject*>::const_iterator i = ClusterList.begin(); i != ClusterList.end(); ++i) diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 254773a499..1e8e63b3a9 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -1759,7 +1759,7 @@ public: } if (!UnitsWithMana.empty()) { - DoCast(Trinity::Containers::SelectRandomContainerElement(UnitsWithMana), SPELL_MANA_BURN); + DoCast(acore::Containers::SelectRandomContainerElement(UnitsWithMana), SPELL_MANA_BURN); ManaBurnTimer = 8000 + (rand() % 10 * 1000); // 8-18 sec cd } else diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index b9d762819b..6b889b06b1 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -154,8 +154,8 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript _initialSelection = false; // Find victim of Summon Gargoyle spell std::list<Unit*> targets; - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 50); - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check); + acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 50); + acore::UnitListSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check); me->VisitNearbyObject(50, searcher); for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) if ((*iter)->GetAura(SPELL_DK_SUMMON_GARGOYLE_1, me->GetOwnerGUID())) diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index cb8ef709b4..3544477bc1 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1368,7 +1368,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader FinishCast(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW); return; } - target = Trinity::Containers::SelectRandomContainerElement(targets); + target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); } @@ -2255,7 +2255,7 @@ class spell_dk_raise_dead : public SpellScriptLoader return; } - WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + WorldObject* target = acore::Containers::SelectRandomContainerElement(targets); targets.clear(); targets.push_back(target); _corpse = true; diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 5aa510dc64..7a081c3a68 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -1067,7 +1067,7 @@ class spell_dru_starfall_dummy : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - Trinity::Containers::RandomResizeList(targets, 2); + acore::Containers::RandomResizeList(targets, 2); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -1295,7 +1295,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader return; } - tempTargets.sort(Trinity::HealthPctOrderPred()); + tempTargets.sort(acore::HealthPctOrderPred()); targets.clear(); targets.push_back(tempTargets.front()); } @@ -1332,13 +1332,13 @@ class spell_dru_wild_growth : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::RaidCheck(GetCaster(), false)); + targets.remove_if(acore::RaidCheck(GetCaster(), false)); uint32 const maxTargets = GetCaster()->HasAura(SPELL_DRUID_GLYPH_OF_WILD_GROWTH) ? 6 : 5; if (targets.size() > maxTargets) { - targets.sort(Trinity::HealthPctOrderPred()); + targets.sort(acore::HealthPctOrderPred()); targets.resize(maxTargets); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 1858a8cf6f..1866ad8378 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -766,7 +766,7 @@ class spell_gen_select_target_count : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { targets.remove(GetCaster()); - Trinity::Containers::RandomResizeList(targets, _count); + acore::Containers::RandomResizeList(targets, _count); } void Register() @@ -1720,8 +1720,8 @@ class spell_gen_cannibalize : public SpellScriptLoader float max_range = GetSpellInfo()->GetMaxRange(false); WorldObject* result = NULL; // search for nearby enemy corpse in range - Trinity::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE); - Trinity::WorldObjectSearcher<Trinity::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check); + acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE); + acore::WorldObjectSearcher<acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check); caster->GetMap()->VisitFirstFound(caster->m_positionX, caster->m_positionY, max_range, searcher); if (!result) return SPELL_FAILED_NO_EDIBLE_CORPSES; @@ -4766,13 +4766,13 @@ class spell_gen_replenishment : public SpellScriptLoader } } - targets.remove_if(Trinity::PowerCheck(POWER_MANA, false)); + targets.remove_if(acore::PowerCheck(POWER_MANA, false)); uint8 const maxTargets = 10; if (targets.size() > maxTargets) { - targets.sort(Trinity::PowerPctOrderPred(POWER_MANA)); + targets.sort(acore::PowerPctOrderPred(POWER_MANA)); targets.resize(maxTargets); } } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 695bdc2771..5b051f2bc9 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -973,8 +973,8 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader float max_range = GetSpellInfo()->GetMaxRange(false); WorldObject* result = NULL; // search for nearby enemy corpse in range - Trinity::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY); - Trinity::WorldObjectSearcher<Trinity::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check); + acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY); + acore::WorldObjectSearcher<acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check); caster->GetMap()->VisitFirstFound(caster->m_positionX, caster->m_positionY, max_range, searcher); if (!result) return SPELL_FAILED_NO_EDIBLE_CORPSES; diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 8f326fcd45..10b15ce4ed 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1910,7 +1910,7 @@ class spell_item_echoes_of_light : public SpellScriptLoader if (targets.size() < 2) return; - targets.sort(Trinity::HealthPctOrderPred()); + targets.sort(acore::HealthPctOrderPred()); WorldObject* target = targets.front(); targets.clear(); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 19cd23c67e..985ebed7bd 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -662,7 +662,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader void CountTargets(std::list<WorldObject*>& targetList) { - Trinity::Containers::RandomResizeList(targetList, GetSpellValue()->MaxAffectedTargets); + acore::Containers::RandomResizeList(targetList, GetSpellValue()->MaxAffectedTargets); _targetCount = targetList.size(); } @@ -779,7 +779,7 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader if (targets.size() > maxTargets) { - targets.sort(Trinity::HealthPctOrderPred()); + targets.sort(acore::HealthPctOrderPred()); targets.resize(maxTargets); } } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index fb6c7937bc..f5424881ae 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -155,13 +155,13 @@ class spell_pri_circle_of_healing : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::RaidCheck(GetCaster(), false)); + targets.remove_if(acore::RaidCheck(GetCaster(), false)); uint32 const maxTargets = GetCaster()->HasAura(SPELL_PRIEST_GLYPH_OF_CIRCLE_OF_HEALING) ? 6 : 5; // Glyph of Circle of Healing if (targets.size() > maxTargets) { - targets.sort(Trinity::HealthPctOrderPred()); + targets.sort(acore::HealthPctOrderPred()); targets.resize(maxTargets); } } @@ -240,13 +240,13 @@ class spell_pri_divine_hymn : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::RaidCheck(GetCaster(), false)); + targets.remove_if(acore::RaidCheck(GetCaster(), false)); uint32 const maxTargets = 3; if (targets.size() > maxTargets) { - targets.sort(Trinity::HealthPctOrderPred()); + targets.sort(acore::HealthPctOrderPred()); targets.resize(maxTargets); } } @@ -370,14 +370,14 @@ class spell_pri_hymn_of_hope : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::PowerCheck(POWER_MANA, false)); - targets.remove_if(Trinity::RaidCheck(GetCaster(), false)); + targets.remove_if(acore::PowerCheck(POWER_MANA, false)); + targets.remove_if(acore::RaidCheck(GetCaster(), false)); uint32 const maxTargets = 3; if (targets.size() > maxTargets) { - targets.sort(Trinity::PowerPctOrderPred(POWER_MANA)); + targets.sort(acore::PowerPctOrderPred(POWER_MANA)); targets.resize(maxTargets); } } @@ -562,7 +562,7 @@ class spell_pri_mind_sear : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& unitList) { - unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT), true)); + unitList.remove_if(acore::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT), true)); } void Register() diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 069ddb54e4..dcc1276fcc 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2398,8 +2398,8 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader Unit* caster = GetCaster(); // Check for player that is in 65 y range std::list<Player*> playerList; - Trinity::AnyPlayerInObjectRangeCheck checker(caster, 65.0f); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker); + acore::AnyPlayerInObjectRangeCheck checker(caster, 65.0f); + acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker); caster->VisitNearbyWorldObject(65.0f, searcher); for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) // Check if found player target is on fly mount or using flying form diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index cd7b81b403..153c646fb2 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -399,7 +399,7 @@ class spell_rog_killing_spree : public SpellScriptLoader { while (!_targets.empty()) { - uint64 guid = Trinity::Containers::SelectRandomContainerElement(_targets); + uint64 guid = acore::Containers::SelectRandomContainerElement(_targets); if (Unit* target = ObjectAccessor::GetUnit(*GetTarget(), guid)) { // xinef: target may be no longer valid diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 3c0641ba19..a8c076379c 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -426,7 +426,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader if (targets.size() < 2) return; - targets.sort(Trinity::HealthPctOrderPred()); + targets.sort(acore::HealthPctOrderPred()); WorldObject* target = targets.front(); targets.clear(); @@ -518,8 +518,8 @@ class spell_sha_bloodlust : public SpellScriptLoader void RemoveInvalidTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED)); - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION)); } void ApplyDebuff() @@ -981,8 +981,8 @@ class spell_sha_heroism : public SpellScriptLoader void RemoveInvalidTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION)); - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED)); } void ApplyDebuff() diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index b1b7669186..0f11329f5d 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -168,7 +168,7 @@ class spell_warr_improved_spell_reflection_trigger : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& unitList) { GetCaster()->RemoveAurasDueToSpell(SPELL_WARRIOR_SPELL_REFLECTION); - unitList.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + unitList.sort(acore::ObjectDistanceOrderPred(GetCaster())); while (unitList.size() > GetSpellValue()->MaxAffectedTargets) unitList.pop_back(); } diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 462bbe0728..09d6412e50 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -671,7 +671,7 @@ class spell_dream_fog_sleep : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SLEEP)); + targets.remove_if(acore::UnitAuraCheck(true, SPELL_SLEEP)); } void Register() diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 2e588f895f..6229bc2a07 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -34,7 +34,7 @@ add_executable(worldserver if(NOT WIN32) set_target_properties(worldserver PROPERTIES - COMPILE_DEFINITIONS _TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf") + COMPILE_DEFINITIONS _ACORE_CORE_CONFIG="${CONF_DIR}/worldserver.conf") endif() add_dependencies(worldserver revision.h) diff --git a/src/server/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h index 8160884387..ed129eea6a 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.h +++ b/src/server/worldserver/CommandLine/CliRunnable.h @@ -12,7 +12,7 @@ #define __CLIRUNNABLE_H /// Command Line Interface handling thread -class CliRunnable : public ACORE::Runnable +class CliRunnable : public acore::Runnable { public: void run(); diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 44193525e6..b9a1a2160c 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -19,8 +19,8 @@ #include "Log.h" #include "Master.h" -#ifndef _TRINITY_CORE_CONFIG -# define _TRINITY_CORE_CONFIG "worldserver.conf" +#ifndef _ACORE_CORE_CONFIG +# define _ACORE_CORE_CONFIG "worldserver.conf" #endif #ifdef _WIN32 @@ -61,7 +61,7 @@ void usage(const char* prog) extern int main(int argc, char** argv) { ///- Command line parsing to get the configuration file name - char const* cfg_file = _TRINITY_CORE_CONFIG; + char const* cfg_file = _ACORE_CORE_CONFIG; int c = 1; while (c < argc) { @@ -118,7 +118,7 @@ extern int main(int argc, char** argv) ++c; } - std::string cfg_def_file=_TRINITY_CORE_CONFIG; + std::string cfg_def_file=_ACORE_CORE_CONFIG; cfg_def_file += ".dist"; if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) { diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 2a7a25de34..75508a69be 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -46,7 +46,7 @@ extern int m_ServiceStatus; #endif /// Handle worldservers's termination signals -class WorldServerSignalHandler : public Trinity::SignalHandler +class WorldServerSignalHandler : public acore::SignalHandler { public: virtual void HandleSignal(int sigNum) @@ -71,7 +71,7 @@ class WorldServerSignalHandler : public Trinity::SignalHandler } }; -class FreezeDetectorRunnable : public ACORE::Runnable +class FreezeDetectorRunnable : public acore::Runnable { private: uint32 _loops; @@ -101,7 +101,7 @@ public: ABORT(); } - ACORE::Thread::Sleep(1000); + acore::Thread::Sleep(1000); } sLog->outString("Anti-freeze thread exiting without problems."); } @@ -176,10 +176,10 @@ int Master::Run() //handle.register_handler(SIGSEGV, &signalSEGV); ///- Launch WorldRunnable thread - ACORE::Thread worldThread(new WorldRunnable); - worldThread.setPriority(ACORE::Priority_Highest); + acore::Thread worldThread(new WorldRunnable); + worldThread.setPriority(acore::Priority_Highest); - ACORE::Thread* cliThread = NULL; + acore::Thread* cliThread = NULL; #ifdef _WIN32 if (sConfigMgr->GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/) @@ -188,14 +188,14 @@ int Master::Run() #endif { ///- Launch CliRunnable thread - cliThread = new ACORE::Thread(new CliRunnable); + cliThread = new acore::Thread(new CliRunnable); } - ACORE::Thread rarThread(new RARunnable); + acore::Thread rarThread(new RARunnable); // pussywizard: - ACORE::Thread auctionLising_thread(new AuctionListingRunnable); - auctionLising_thread.setPriority(ACORE::Priority_High); + acore::Thread auctionLising_thread(new AuctionListingRunnable); + auctionLising_thread.setPriority(acore::Priority_High); #if defined(_WIN32) || defined(__linux__) @@ -267,21 +267,21 @@ int Master::Run() #endif // Start soap serving thread - ACORE::Thread* soapThread = NULL; + acore::Thread* soapThread = NULL; if (sConfigMgr->GetBoolDefault("SOAP.Enabled", false)) { TCSoapRunnable* runnable = new TCSoapRunnable(); runnable->SetListenArguments(sConfigMgr->GetStringDefault("SOAP.IP", "127.0.0.1"), uint16(sConfigMgr->GetIntDefault("SOAP.Port", 7878))); - soapThread = new ACORE::Thread(runnable); + soapThread = new acore::Thread(runnable); } // Start up freeze catcher thread - ACORE::Thread* freezeThread = NULL; + acore::Thread* freezeThread = NULL; if (uint32 freezeDelay = sConfigMgr->GetIntDefault("MaxCoreStuckTime", 0)) { FreezeDetectorRunnable* runnable = new FreezeDetectorRunnable(freezeDelay*1000); - freezeThread = new ACORE::Thread(runnable); - freezeThread->setPriority(ACORE::Priority_Highest); + freezeThread = new acore::Thread(runnable); + freezeThread->setPriority(acore::Priority_Highest); } ///- Launch the world listener socket diff --git a/src/server/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h index aa65b7697d..d573dec74c 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.h +++ b/src/server/worldserver/RemoteAccess/RARunnable.h @@ -8,14 +8,14 @@ /// @{ /// \file -#ifndef _TRINITY_RARUNNABLE_H_ -#define _TRINITY_RARUNNABLE_H_ +#ifndef _ACORE_RARUNNABLE_H_ +#define _ACORE_RARUNNABLE_H_ #include "Common.h" #include <ace/Reactor.h> -class RARunnable : public ACORE::Runnable +class RARunnable : public acore::Runnable { public: RARunnable(); @@ -27,6 +27,6 @@ private: }; -#endif /* _TRINITY_RARUNNABLE_H_ */ +#endif /* _ACORE_RARUNNABLE_H_ */ /// @} diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h index 57eba21f1a..932797c6d2 100644 --- a/src/server/worldserver/TCSoap/TCSoap.h +++ b/src/server/worldserver/TCSoap/TCSoap.h @@ -14,7 +14,7 @@ #include <ace/Task.h> #include <Threading.h> -class TCSoapRunnable : public ACORE::Runnable +class TCSoapRunnable : public acore::Runnable { public: TCSoapRunnable() : _port(0) { } diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp index 26423c2b48..c594ce56a0 100644 --- a/src/server/worldserver/WorldThread/WorldRunnable.cpp +++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp @@ -53,7 +53,7 @@ void WorldRunnable::run() avgDiffTracker.Update(executionTimeDiff > WORLD_SLEEP_CONST ? executionTimeDiff : WORLD_SLEEP_CONST); if (executionTimeDiff < WORLD_SLEEP_CONST) - ACORE::Thread::Sleep(WORLD_SLEEP_CONST-executionTimeDiff); + acore::Thread::Sleep(WORLD_SLEEP_CONST-executionTimeDiff); #ifdef _WIN32 if (m_ServiceStatus == 0) @@ -97,10 +97,10 @@ void AuctionListingRunnable::run() if (AsyncAuctionListingMgr::GetTempList().size() || AsyncAuctionListingMgr::GetList().size()) { - TRINITY_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetLock()); + ACORE_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetLock()); { - TRINITY_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetTempLock()); + ACORE_GUARD(ACE_Thread_Mutex, AsyncAuctionListingMgr::GetTempLock()); for (std::list<AuctionListItemsDelayEvent>::iterator itr = AsyncAuctionListingMgr::GetTempList().begin(); itr != AsyncAuctionListingMgr::GetTempList().end(); ++itr) AsyncAuctionListingMgr::GetList().push_back( (*itr) ); AsyncAuctionListingMgr::GetTempList().clear(); @@ -123,7 +123,7 @@ void AuctionListingRunnable::run() } } } - ACORE::Thread::Sleep(1); + acore::Thread::Sleep(1); } sLog->outString("Auction House Listing thread exiting without problems."); } diff --git a/src/server/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h index 0cf6db8a36..fe0d1e7d1c 100644 --- a/src/server/worldserver/WorldThread/WorldRunnable.h +++ b/src/server/worldserver/WorldThread/WorldRunnable.h @@ -12,13 +12,13 @@ #define __WORLDRUNNABLE_H /// Heartbeat thread for the World -class WorldRunnable : public ACORE::Runnable +class WorldRunnable : public acore::Runnable { public: void run(); }; -class AuctionListingRunnable : public ACORE::Runnable +class AuctionListingRunnable : public acore::Runnable { public: void run(); diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index dfeb290d0d..751b46cfb4 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -944,7 +944,7 @@ void ExtractMapsFromMpq(uint32 build) { printf("Extract %s (%d/%u) \n", map_ids[z].name, z+1, map_count); // Loadup map grid data - mpqMapName = ACORE::StringFormat("World\\Maps\\%s\\%s.wdt", map_ids[z].name, map_ids[z].name); + mpqMapName = acore::StringFormat("World\\Maps\\%s\\%s.wdt", map_ids[z].name, map_ids[z].name); WDT_file wdt; if (!wdt.loadFile(mpqMapName, false)) { @@ -958,8 +958,8 @@ void ExtractMapsFromMpq(uint32 build) { if (!wdt.main->adt_list[y][x].exist) continue; - mpqFileName = ACORE::StringFormat("World\\Maps\\%s\\%s_%u_%u.adt", map_ids[z].name, map_ids[z].name, x, y); - outputFileName = ACORE::StringFormat("%s/maps/%03u%02u%02u.map", output_path, map_ids[z].id, y, x); + mpqFileName = acore::StringFormat("World\\Maps\\%s\\%s_%u_%u.adt", map_ids[z].name, map_ids[z].name, x, y); + outputFileName = acore::StringFormat("%s/maps/%03u%02u%02u.map", output_path, map_ids[z].id, y, x); ConvertADT(mpqFileName, outputFileName, y, x, build); } // draw progress bar |