diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index 86e70a77a..1207563bc 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -67,7 +67,7 @@ public: uint32 Idx = 0; const T* temp; if (m_obj2Idx.getRemove(&obj, temp, Idx)) - m_objects[Idx] = NULL; + m_objects[Idx] = nullptr; else m_objects_to_push.remove(&obj); } diff --git a/src/common/Collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp index 6e0de1853..788d4b45f 100644 --- a/src/common/Collision/Management/MMapFactory.cpp +++ b/src/common/Collision/Management/MMapFactory.cpp @@ -12,12 +12,12 @@ namespace MMAP { // ######################## MMapFactory ######################## // our global singleton copy - MMapManager* g_MMapManager = NULL; + MMapManager* g_MMapManager = nullptr; bool MMapFactory::forbiddenMaps[1000] = {0}; MMapManager* MMapFactory::createOrGetMMapManager() { - if (g_MMapManager == NULL) + if (g_MMapManager == nullptr) g_MMapManager = new MMapManager(); return g_MMapManager; @@ -43,7 +43,7 @@ namespace MMAP if (g_MMapManager) { delete g_MMapManager; - g_MMapManager = NULL; + g_MMapManager = nullptr; } } } \ No newline at end of file diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 4f68e851a..44a8ed581 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -218,7 +218,7 @@ namespace MMAP dtStatus status; { ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); - status = mmap->navMesh->removeTile(tileRef, NULL, NULL); + status = mmap->navMesh->removeTile(tileRef, nullptr, nullptr); } // unload, and mark as non loaded @@ -266,7 +266,7 @@ namespace MMAP dtStatus status; { ACORE_WRITE_GUARD(ACE_RW_Thread_Mutex, GetMMapLock(mapId)); - status = mmap->navMesh->removeTile(i->second, NULL, NULL); + status = mmap->navMesh->removeTile(i->second, nullptr, nullptr); } if (status != DT_SUCCESS) @@ -329,7 +329,7 @@ namespace MMAP //ACORE_READ_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); if (loadedMMaps.find(mapId) == loadedMMaps.end()) - return NULL; + return nullptr; return loadedMMaps[mapId]->navMesh; } @@ -340,7 +340,7 @@ namespace MMAP //ACORE_READ_GUARD(ACE_RW_Thread_Mutex, MMapManagerLock); if (loadedMMaps.find(mapId) == loadedMMaps.end()) - return NULL; + return nullptr; MMapData* mmap = loadedMMaps[mapId]; if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end()) @@ -357,7 +357,7 @@ namespace MMAP { dtFreeNavMeshQuery(query); sLog->outError("MMAP:GetNavMeshQuery: Failed to initialize dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId); - return NULL; + return nullptr; } #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) diff --git a/src/common/Collision/Management/VMapFactory.cpp b/src/common/Collision/Management/VMapFactory.cpp index 101066f23..9b16cc962 100644 --- a/src/common/Collision/Management/VMapFactory.cpp +++ b/src/common/Collision/Management/VMapFactory.cpp @@ -9,7 +9,7 @@ namespace VMAP { - IVMapManager* gVMapManager = NULL; + IVMapManager* gVMapManager = nullptr; //=============================================== // just return the instance @@ -25,6 +25,6 @@ namespace VMAP void VMapFactory::clear() { delete gVMapManager; - gVMapManager = NULL; + gVMapManager = nullptr; } } diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index cbdd2813d..d91d2d275 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -137,7 +137,7 @@ namespace VMAP bool VMapManager2::isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_VMAP_CHECKS) - if (!isLineOfSightCalcEnabled() || DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LOS)) + if (!isLineOfSightCalcEnabled() || DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, nullptr, VMAP_DISABLE_LOS)) return true; #endif @@ -162,7 +162,7 @@ namespace VMAP bool VMapManager2::getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_VMAP_CHECKS) - if (isLineOfSightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LOS)) + if (isLineOfSightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, nullptr, VMAP_DISABLE_LOS)) #endif { InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(mapId); @@ -194,7 +194,7 @@ namespace VMAP float VMapManager2::getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_VMAP_CHECKS) - if (isHeightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_HEIGHT)) + if (isHeightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, nullptr, VMAP_DISABLE_HEIGHT)) #endif { InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(mapId); @@ -215,7 +215,7 @@ namespace VMAP bool VMapManager2::getAreaInfo(unsigned int mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const { #if defined(ENABLE_EXTRAS) && defined(ENABLE_VMAP_CHECKS) - if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_AREAFLAG)) + if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, nullptr, VMAP_DISABLE_AREAFLAG)) #endif { InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(mapId); @@ -235,7 +235,7 @@ namespace VMAP bool VMapManager2::GetLiquidLevel(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const { #if defined(ENABLE_EXTRAS) && defined(ENABLE_VMAP_CHECKS) - if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LIQUIDSTATUS)) + if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, nullptr, VMAP_DISABLE_LIQUIDSTATUS)) #endif { InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(mapId); @@ -272,7 +272,7 @@ namespace VMAP { sLog->outError("VMapManager2: could not load '%s%s.vmo'", basepath.c_str(), filename.c_str()); delete worldmodel; - return NULL; + return nullptr; } #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_MAPS, "VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str()); diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index e11f53911..ad295a4c4 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -41,7 +41,7 @@ namespace VMAP //================================================================= TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName) - : iDestDir(pDestDirName), iSrcDir(pSrcDirName), iFilterMethod(NULL), iCurrentUniqueNameId(0) + : iDestDir(pDestDirName), iSrcDir(pSrcDirName), iFilterMethod(nullptr), iCurrentUniqueNameId(0) { //mkdir(iDestDir); //init(); diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 4b4375c11..431381c16 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -140,13 +140,13 @@ GameObjectModel* GameObjectModel::Create(const GameObject& go) { const GameObjectDisplayInfoEntry* info = sGameObjectDisplayInfoStore.LookupEntry(go.GetDisplayId()); if (!info) - return NULL; + return nullptr; GameObjectModel* mdl = new GameObjectModel(); if (!mdl->initialize(go, *info)) { delete mdl; - return NULL; + return nullptr; } return mdl; diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp index 6558d3b05..a19e33b7a 100644 --- a/src/common/Collision/Models/WorldModel.cpp +++ b/src/common/Collision/Models/WorldModel.cpp @@ -314,7 +314,7 @@ namespace VMAP triangles.clear(); vertices.clear(); delete iLiquid; - iLiquid = NULL; + iLiquid = nullptr; if (result && fread(&iBound, sizeof(G3D::AABox), 1, rf) != 1) result = false; if (result && fread(&iMogpFlags, sizeof(uint32), 1, rf) != 1) result = false; diff --git a/src/common/Common.h b/src/common/Common.h index fff6e689b..6b2f42455 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -124,7 +124,7 @@ inline float finiteAlways(float f) { return isfinite(f) ? f : 0.0f; } inline bool myisfinite(float f) { return isfinite(f) && !isnan(f); } -#define atol(a) strtoul( a, NULL, 10) +#define atol(a) strtoul( a, nullptr, 10) #define STRINGIZE(a) #a diff --git a/src/common/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp index 53e3f5601..0da56a4d0 100644 --- a/src/common/Cryptography/BigNumber.cpp +++ b/src/common/Cryptography/BigNumber.cpp @@ -99,7 +99,7 @@ BigNumber BigNumber::operator/=(BigNumber const& bn) BN_CTX* bnctx; bnctx = BN_CTX_new(); - BN_div(_bn, NULL, _bn, bn._bn, bnctx); + BN_div(_bn, nullptr, _bn, bn._bn, bnctx); BN_CTX_free(bnctx); return *this; diff --git a/src/common/Database/AdhocStatement.cpp b/src/common/Database/AdhocStatement.cpp index 96978623c..50f8e3ca6 100644 --- a/src/common/Database/AdhocStatement.cpp +++ b/src/common/Database/AdhocStatement.cpp @@ -34,7 +34,7 @@ bool BasicStatementTask::Execute() if (!result || !result->GetRowCount()) { delete result; - m_result.set(QueryResult(NULL)); + m_result.set(QueryResult(nullptr)); return false; } result->NextRow(); diff --git a/src/common/Database/DatabaseWorker.cpp b/src/common/Database/DatabaseWorker.cpp index 6e565cb69..f83190ba9 100644 --- a/src/common/Database/DatabaseWorker.cpp +++ b/src/common/Database/DatabaseWorker.cpp @@ -23,7 +23,7 @@ int DatabaseWorker::svc() if (!m_queue) return -1; - SQLOperation* request = NULL; + SQLOperation* request = nullptr; while (1) { request = (SQLOperation*)(m_queue->dequeue()); diff --git a/src/common/Database/DatabaseWorkerPool.cpp b/src/common/Database/DatabaseWorkerPool.cpp index 95f32a875..30ef85e0e 100644 --- a/src/common/Database/DatabaseWorkerPool.cpp +++ b/src/common/Database/DatabaseWorkerPool.cpp @@ -149,7 +149,7 @@ QueryResult DatabaseWorkerPool::Query(const char* sql, T* conn /* = nullptr*/ if (!result || !result->GetRowCount()) { delete result; - return QueryResult(NULL); + return QueryResult(nullptr); } result->NextRow(); @@ -169,7 +169,7 @@ PreparedQueryResult DatabaseWorkerPool::Query(PreparedStatement* stmt) if (!ret || !ret->GetRowCount()) { delete ret; - return PreparedQueryResult(NULL); + return PreparedQueryResult(nullptr); } return PreparedQueryResult(ret); diff --git a/src/common/Database/Field.cpp b/src/common/Database/Field.cpp index db54cdcc8..c528beddc 100644 --- a/src/common/Database/Field.cpp +++ b/src/common/Database/Field.cpp @@ -8,7 +8,7 @@ Field::Field() { - data.value = NULL; + data.value = nullptr; data.type = MYSQL_TYPE_NULL; data.length = 0; data.raw = false; diff --git a/src/common/Database/Field.h b/src/common/Database/Field.h index 66ebf716c..df3bee325 100644 --- a/src/common/Database/Field.h +++ b/src/common/Database/Field.h @@ -219,7 +219,7 @@ public: if (IsNumeric()) { sLog->outSQLDriver("Error: GetCString() on numeric field. Using type: %s.", FieldTypeToString(data.type)); - return NULL; + return nullptr; } #endif return static_cast(data.value); @@ -381,7 +381,7 @@ private: case MYSQL_TYPE_NEWDATE: return "NEWDATE"; case MYSQL_TYPE_NULL: - return "NULL"; + return "nullptr"; case MYSQL_TYPE_SET: return "SET"; case MYSQL_TYPE_SHORT: diff --git a/src/common/Database/MySQLConnection.cpp b/src/common/Database/MySQLConnection.cpp index 6dbd99ded..d3b25fc2a 100644 --- a/src/common/Database/MySQLConnection.cpp +++ b/src/common/Database/MySQLConnection.cpp @@ -26,9 +26,9 @@ MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo) : m_reconnecting(false), m_prepareError(false), - m_queue(NULL), - m_worker(NULL), - m_Mysql(NULL), + m_queue(nullptr), + m_worker(nullptr), + m_Mysql(nullptr), m_connectionInfo(connInfo), m_connectionFlags(CONNECTION_SYNCH) { @@ -38,7 +38,7 @@ MySQLConnection::MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInf m_reconnecting(false), m_prepareError(false), m_queue(queue), - m_Mysql(NULL), + m_Mysql(nullptr), m_connectionInfo(connInfo), m_connectionFlags(CONNECTION_ASYNC) { @@ -64,7 +64,7 @@ void MySQLConnection::Close() bool MySQLConnection::Open() { MYSQL* mysqlInit; - mysqlInit = mysql_init(NULL); + mysqlInit = mysql_init(nullptr); if (!mysqlInit) { sLog->outError("Could not initialize Mysql connection to database `%s`", m_connectionInfo.database.c_str()); @@ -313,15 +313,15 @@ bool MySQLConnection::_Query(PreparedStatement* stmt, MYSQL_RES** pResult, uint6 ResultSet* MySQLConnection::Query(const char* sql) { if (!sql) - return NULL; + return nullptr; - MYSQL_RES* result = NULL; - MYSQL_FIELD* fields = NULL; + MYSQL_RES* result = nullptr; + MYSQL_FIELD* fields = nullptr; uint64 rowCount = 0; uint32 fieldCount = 0; if (!_Query(sql, &result, &fields, &rowCount, &fieldCount)) - return NULL; + return nullptr; return new ResultSet(result, fields, rowCount, fieldCount); } @@ -460,7 +460,7 @@ void MySQLConnection::PrepareStatement(uint32 index, const char* sql, Connection // to save memory that will not be used. if (!(m_connectionFlags & flags)) { - m_stmts[index] = NULL; + m_stmts[index] = nullptr; return; } @@ -490,12 +490,12 @@ void MySQLConnection::PrepareStatement(uint32 index, const char* sql, Connection PreparedResultSet* MySQLConnection::Query(PreparedStatement* stmt) { - MYSQL_RES* result = NULL; + MYSQL_RES* result = nullptr; uint64 rowCount = 0; uint32 fieldCount = 0; if (!_Query(stmt, &result, &rowCount, &fieldCount)) - return NULL; + return nullptr; if (mysql_more_results(m_Mysql)) { diff --git a/src/common/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp index d453cbf2d..c9df0a88f 100644 --- a/src/common/Database/PreparedStatement.cpp +++ b/src/common/Database/PreparedStatement.cpp @@ -9,7 +9,7 @@ #include "Log.h" PreparedStatement::PreparedStatement(uint32 index) : - m_stmt(NULL), + m_stmt(nullptr), m_index(index) { } @@ -192,9 +192,9 @@ void PreparedStatement::setNull(const uint8 index) } MySQLPreparedStatement::MySQLPreparedStatement(MYSQL_STMT* stmt) : - m_stmt(NULL), + m_stmt(nullptr), m_Mstmt(stmt), - m_bind(NULL) + m_bind(nullptr) { /// Initialize variable parameters m_paramCount = mysql_stmt_param_count(stmt); @@ -224,9 +224,9 @@ void MySQLPreparedStatement::ClearParameters() for (uint32 i = 0; i < m_paramCount; ++i) { delete m_bind[i].length; - m_bind[i].length = NULL; + m_bind[i].length = nullptr; delete[] (char*) m_bind[i].buffer; - m_bind[i].buffer = NULL; + m_bind[i].buffer = nullptr; m_paramsSet[i] = false; } } @@ -356,11 +356,11 @@ void MySQLPreparedStatement::setNull(const uint8 index) MYSQL_BIND* param = &m_bind[index]; param->buffer_type = MYSQL_TYPE_NULL; delete [] static_cast(param->buffer); - param->buffer = NULL; + param->buffer = nullptr; param->buffer_length = 0; param->is_null_value = 1; delete param->length; - param->length = NULL; + param->length = nullptr; } void MySQLPreparedStatement::setValue(MYSQL_BIND* param, enum_field_types type, const void* value, uint32 len, bool isUnsigned) @@ -370,7 +370,7 @@ void MySQLPreparedStatement::setValue(MYSQL_BIND* param, enum_field_types type, param->buffer = new char[len]; param->buffer_length = 0; param->is_null_value = 0; - param->length = NULL; // Only != NULL for strings + param->length = nullptr; // Only != nullptr for strings param->is_unsigned = isUnsigned; memcpy(param->buffer, value, len); @@ -425,7 +425,7 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern ss << '\'' << m_stmt->statement_data[i].str << '\''; break; case TYPE_NULL: - ss << "NULL"; + ss << "nullptr"; break; } @@ -464,7 +464,7 @@ bool PreparedStatementTask::Execute() if (!result || !result->GetRowCount()) { delete result; - m_result.set(PreparedQueryResult(NULL)); + m_result.set(PreparedQueryResult(nullptr)); return false; } m_result.set(PreparedQueryResult(result)); diff --git a/src/common/Database/QueryHolder.cpp b/src/common/Database/QueryHolder.cpp index aa17667e1..bcb19bf3e 100644 --- a/src/common/Database/QueryHolder.cpp +++ b/src/common/Database/QueryHolder.cpp @@ -23,7 +23,7 @@ bool SQLQueryHolder::SetQuery(size_t index, const char* sql) element.element.query = strdup(sql); SQLResultSetUnion result; - result.qresult = NULL; + result.qresult = nullptr; m_queries[index] = SQLResultPair(element, result); return true; @@ -66,7 +66,7 @@ bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatement* stmt) element.element.stmt = stmt; SQLResultSetUnion result; - result.presult = NULL; + result.presult = nullptr; m_queries[index] = SQLResultPair(element, result); return true; @@ -79,13 +79,13 @@ QueryResult SQLQueryHolder::GetResult(size_t index) { ResultSet* result = m_queries[index].second.qresult; if (!result || !result->GetRowCount()) - return QueryResult(NULL); + return QueryResult(nullptr); result->NextRow(); return QueryResult(result); } else - return QueryResult(NULL); + return QueryResult(nullptr); } PreparedQueryResult SQLQueryHolder::GetPreparedResult(size_t index) @@ -95,12 +95,12 @@ PreparedQueryResult SQLQueryHolder::GetPreparedResult(size_t index) { PreparedResultSet* result = m_queries[index].second.presult; if (!result || !result->GetRowCount()) - return PreparedQueryResult(NULL); + return PreparedQueryResult(nullptr); return PreparedQueryResult(result); } else - return PreparedQueryResult(NULL); + return PreparedQueryResult(nullptr); } void SQLQueryHolder::SetResult(size_t index, ResultSet* result) @@ -108,7 +108,7 @@ void SQLQueryHolder::SetResult(size_t index, ResultSet* result) if (result && !result->GetRowCount()) { delete result; - result = NULL; + result = nullptr; } /// store the result in the holder @@ -121,7 +121,7 @@ void SQLQueryHolder::SetPreparedResult(size_t index, PreparedResultSet* result) if (result && !result->GetRowCount()) { delete result; - result = NULL; + result = nullptr; } /// store the result in the holder diff --git a/src/common/Database/QueryResult.cpp b/src/common/Database/QueryResult.cpp index ad8973689..37b0bb73e 100644 --- a/src/common/Database/QueryResult.cpp +++ b/src/common/Database/QueryResult.cpp @@ -21,11 +21,11 @@ PreparedResultSet::PreparedResultSet(MYSQL_STMT* stmt, MYSQL_RES* result, uint64 m_rowCount(rowCount), m_rowPosition(0), m_fieldCount(fieldCount), - m_rBind(NULL), + m_rBind(nullptr), m_stmt(stmt), m_res(result), - m_isNull(NULL), - m_length(NULL) + m_isNull(nullptr), + m_length(nullptr) { if (!m_res) return; @@ -67,7 +67,7 @@ PreparedResultSet::PreparedResultSet(MYSQL_STMT* stmt, MYSQL_RES* result, uint64 m_rBind[i].buffer_length = size; m_rBind[i].length = &m_length[i]; m_rBind[i].is_null = &m_isNull[i]; - m_rBind[i].error = NULL; + m_rBind[i].error = nullptr; m_rBind[i].is_unsigned = field->flags & UNSIGNED_FLAG; ++i; @@ -198,13 +198,13 @@ void ResultSet::CleanUp() if (_currentRow) { delete [] _currentRow; - _currentRow = NULL; + _currentRow = nullptr; } if (_result) { mysql_free_result(_result); - _result = NULL; + _result = nullptr; } } diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp index 379c84ecd..a862430be 100644 --- a/src/common/Debugging/Errors.cpp +++ b/src/common/Debugging/Errors.cpp @@ -16,7 +16,7 @@ @brief This file contains definitions of functions used for reporting critical application errors - It is very important that (std::)abort is NEVER called in place of *((volatile int*)NULL) = 0; + It is very important that (std::)abort is NEVER called in place of *((volatile int*)nullptr) = 0; Calling abort() on Windows does not invoke unhandled exception filters - a mechanism used by WheatyExceptionReport to log crashes. exit(1) calls here are for static analysis tools to indicate that calling functions defined in this file terminates the application. diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 9b305d26c..e0fde5d53 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -35,11 +35,11 @@ inline LPTSTR ErrorMessage(DWORD dw) DWORD formatResult = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, + nullptr, dw, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, - 0, NULL); + 0, nullptr); if (formatResult != 0) return (LPTSTR)lpMsgBuf; else @@ -130,7 +130,7 @@ LONG WINAPI WheatyExceptionReport::WheatyUnhandledExceptionFilter( TCHAR crash_folder_path[MAX_PATH]; sprintf_s(crash_folder_path, "%s\\%s", module_folder_name, CrashFolder); - if (!CreateDirectory(crash_folder_path, NULL)) + if (!CreateDirectory(crash_folder_path, nullptr)) { if (GetLastError() != ERROR_ALREADY_EXISTS) return 0; @@ -220,7 +220,7 @@ BOOL WheatyExceptionReport::_GetProcessorName(TCHAR* sProcessorName, DWORD maxco return FALSE; TCHAR szTmp[2048]; DWORD cntBytes = sizeof(szTmp); - lRet = ::RegQueryValueEx(hKey, _T("ProcessorNameString"), NULL, NULL, + lRet = ::RegQueryValueEx(hKey, _T("ProcessorNameString"), nullptr, nullptr, (LPBYTE)szTmp, &cntBytes); if (lRet != ERROR_SUCCESS) return FALSE; @@ -582,7 +582,7 @@ void WheatyExceptionReport::GenerateExceptionReport( CONTEXT trashableContext = *pCtx; - WriteStackDetails(&trashableContext, false, NULL); + WriteStackDetails(&trashableContext, false, nullptr); printTracesForAllThreads(false); // #ifdef _M_IX86 // X86 Only! @@ -591,7 +591,7 @@ void WheatyExceptionReport::GenerateExceptionReport( Log(_T("Local Variables And Parameters\r\n")); trashableContext = *pCtx; - WriteStackDetails(&trashableContext, true, NULL); + WriteStackDetails(&trashableContext, true, nullptr); printTracesForAllThreads(true); SymCleanup(GetCurrentProcess()); @@ -764,7 +764,7 @@ void WheatyExceptionReport::WriteStackDetails( // Get the next stack frame if (! StackWalk64(dwMachineType, m_hProcess, - pThreadHandle != NULL ? pThreadHandle : GetCurrentThread(), + pThreadHandle != nullptr ? pThreadHandle : GetCurrentThread(), &sf, pContext, 0, @@ -969,7 +969,7 @@ void WheatyExceptionReport::DumpTypeIndex( char buffer[50]; FormatOutputValue(buffer, btStdString, 0, (PVOID)offset, sizeof(buffer)); symbolDetails.top().Value = buffer; - if (Name != NULL && Name[0] != '\0') + if (Name != nullptr && Name[0] != '\0') symbolDetails.top().Name = Name; bHandled = true; return; @@ -978,7 +978,7 @@ void WheatyExceptionReport::DumpTypeIndex( char buffer[WER_SMALL_BUFFER_SIZE]; wcstombs(buffer, pwszTypeName, sizeof(buffer)); buffer[WER_SMALL_BUFFER_SIZE - 1] = '\0'; - if (Name != NULL && Name[0] != '\0') + if (Name != nullptr && Name[0] != '\0') { symbolDetails.top().Type = buffer; symbolDetails.top().Name = Name; @@ -988,7 +988,7 @@ void WheatyExceptionReport::DumpTypeIndex( LocalFree(pwszTypeName); } - else if (Name != NULL && Name[0] != '\0') + else if (Name != nullptr && Name[0] != '\0') symbolDetails.top().Name = Name; if (!StoreSymbol(dwTypeIndex, offset)) @@ -1005,7 +1005,7 @@ void WheatyExceptionReport::DumpTypeIndex( case SymTagPointerType: if (SymGetTypeInfo(m_hProcess, modBase, dwTypeIndex, TI_GET_TYPEID, &innerTypeID)) { - if (Name != NULL && Name[0] != '\0') + if (Name != nullptr && Name[0] != '\0') symbolDetails.top().Name = Name; BOOL isReference; @@ -1083,7 +1083,7 @@ void WheatyExceptionReport::DumpTypeIndex( offset, bHandled, symbolDetails.top().Name.c_str(), "", false, logChildren); break; case SymTagPointerType: - if (Name != NULL && Name[0] != '\0') + if (Name != nullptr && Name[0] != '\0') symbolDetails.top().Name = Name; DumpTypeIndex(modBase, innerTypeID, offset, bHandled, symbolDetails.top().Name.c_str(), "", false, logChildren); diff --git a/src/common/Dynamic/FactoryHolder.h b/src/common/Dynamic/FactoryHolder.h index 5c4dab22c..c419b2730 100644 --- a/src/common/Dynamic/FactoryHolder.h +++ b/src/common/Dynamic/FactoryHolder.h @@ -28,7 +28,7 @@ public: void DeregisterSelf(void) { FactoryHolderRegistry::instance()->RemoveItem(this, false); } /// Abstract Factory create method - virtual T* Create(void* data = NULL) const = 0; + virtual T* Create(void* data = nullptr) const = 0; private: Key i_key; }; diff --git a/src/common/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefManager.h index 674980936..f1e495ef7 100644 --- a/src/common/Dynamic/LinkedReference/RefManager.h +++ b/src/common/Dynamic/LinkedReference/RefManager.h @@ -24,9 +24,9 @@ public: [[nodiscard]] Reference const* getLast() const { return ((Reference const*) LinkedListHead::getLast()); } iterator begin() { return iterator(getFirst()); } - iterator end() { return iterator(NULL); } + iterator end() { return iterator(nullptr); } iterator rbegin() { return iterator(getLast()); } - iterator rend() { return iterator(NULL); } + iterator rend() { return iterator(nullptr); } void clearReferences() { diff --git a/src/common/Dynamic/LinkedReference/Reference.h b/src/common/Dynamic/LinkedReference/Reference.h index 0e855183e..1da515de3 100644 --- a/src/common/Dynamic/LinkedReference/Reference.h +++ b/src/common/Dynamic/LinkedReference/Reference.h @@ -33,7 +33,7 @@ public: // Create new link void link(TO* toObj, FROM* fromObj) { - ASSERT(fromObj); // fromObj MUST not be NULL + ASSERT(fromObj); // fromObj MUST not be nullptr if (isValid()) unlink(); if (toObj != nullptr) diff --git a/src/common/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h index ba7451318..e1debd0ff 100644 --- a/src/common/Dynamic/ObjectRegistry.h +++ b/src/common/Dynamic/ObjectRegistry.h @@ -25,7 +25,7 @@ public: const T* GetRegistryItem(Key key) const { typename RegistryMapType::const_iterator iter = i_registeredObjects.find(key); - return ( iter == i_registeredObjects.end() ? NULL : iter->second ); + return ( iter == i_registeredObjects.end() ? nullptr : iter->second ); } static ObjectRegistry* instance() diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h index 1f99c9b41..3785164ef 100644 --- a/src/common/Dynamic/TypeContainer.h +++ b/src/common/Dynamic/TypeContainer.h @@ -86,20 +86,20 @@ template class TypeMapContainer { public: - template [[nodiscard]] size_t Count() const { return acore::Count(i_elements, (SPECIFIC_TYPE*)NULL); } + template [[nodiscard]] size_t Count() const { return acore::Count(i_elements, (SPECIFIC_TYPE*)nullptr); } /// inserts a specific object into the container template bool insert(SPECIFIC_TYPE* obj) { SPECIFIC_TYPE* t = acore::Insert(i_elements, obj); - return (t != NULL); + return (t != nullptr); } /// Removes the object from the container, and returns the removed object //template bool remove(SPECIFIC_TYPE* obj) //{ // SPECIFIC_TYPE* t = acore::Remove(i_elements, obj); - // return (t != NULL); + // return (t != nullptr); //} ContainerMapList& GetElements() { return i_elements; } diff --git a/src/common/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h index d885aa774..f3d89b5b2 100644 --- a/src/common/Dynamic/TypeContainerFunctions.h +++ b/src/common/Dynamic/TypeContainerFunctions.h @@ -56,20 +56,20 @@ namespace acore template SPECIFIC_TYPE* Insert(ContainerMapList& /*elements*/, SPECIFIC_TYPE* /*obj*/) { - return NULL; + return nullptr; } // this is a missed template SPECIFIC_TYPE* Insert(ContainerMapList& /*elements*/, SPECIFIC_TYPE* /*obj*/) { - return NULL; // a missed + return nullptr; // a missed } // Recursion template SPECIFIC_TYPE* Insert(ContainerMapList>& elements, SPECIFIC_TYPE* obj) { SPECIFIC_TYPE* t = Insert(elements._elements, obj); - return (t != NULL ? t : Insert(elements._TailElements, obj)); + return (t != nullptr ? t : Insert(elements._TailElements, obj)); } //// non-const remove method @@ -81,20 +81,20 @@ namespace acore //template SPECIFIC_TYPE* Remove(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/) //{ - // return NULL; + // return nullptr; //} //// this is a missed //template SPECIFIC_TYPE* Remove(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/) //{ - // return NULL; // a missed + // return nullptr; // a missed //} //template SPECIFIC_TYPE* Remove(ContainerMapList > &elements, SPECIFIC_TYPE *obj) //{ // // The head element is bad // SPECIFIC_TYPE* t = Remove(elements._elements, obj); - // return ( t != NULL ? t : Remove(elements._TailElements, obj) ); + // return ( t != nullptr ? t : Remove(elements._TailElements, obj) ); //} } #endif diff --git a/src/common/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h index d785a95b8..040762ed4 100644 --- a/src/common/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h @@ -50,17 +50,17 @@ namespace acore template CountedPtr& Find(ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { typename std::map>::iterator iter = elements._element.find(hdl); - return (iter == elements._element.end() ? NullPtr((SPECIFIC_TYPE*)NULL) : iter->second); + return (iter == elements._element.end() ? NullPtr((SPECIFIC_TYPE*)nullptr) : iter->second); }; template CountedPtr& Find(ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { - return NullPtr((SPECIFIC_TYPE*)NULL);// terminate recursion + return NullPtr((SPECIFIC_TYPE*)nullptr);// terminate recursion } template CountedPtr& Find(ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { - return NullPtr((SPECIFIC_TYPE*)NULL);// this is a missed + return NullPtr((SPECIFIC_TYPE*)nullptr);// this is a missed } template CountedPtr& Find(ContainerMapList>& elements, OBJECT_HANDLE hdl, CountedPtr* fake) @@ -73,17 +73,17 @@ namespace acore template const CountedPtr& Find(const ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { typename CountedPtr::iterator iter = elements._element.find(hdl); - return (iter == elements._element.end() ? NullPtr((SPECIFIC_TYPE*)NULL) : iter->second); + return (iter == elements._element.end() ? NullPtr((SPECIFIC_TYPE*)nullptr) : iter->second); }; template const CountedPtr& Find(const ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { - return NullPtr((SPECIFIC_TYPE*)NULL); + return NullPtr((SPECIFIC_TYPE*)nullptr); } template const CountedPtr& Find(const ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { - return NullPtr((SPECIFIC_TYPE*)NULL); + return NullPtr((SPECIFIC_TYPE*)nullptr); } template CountedPtr& Find(const ContainerMapList>& elements, OBJECT_HANDLE hdl, CountedPtr* fake) @@ -104,13 +104,13 @@ namespace acore template CountedPtr& Insert(ContainerMapList& elements, CountedPtr& obj, OBJECT_HANDLE hdl) { - return NullPtr((SPECIFIC_TYPE*)NULL); + return NullPtr((SPECIFIC_TYPE*)nullptr); } // this is a missed template CountedPtr& Insert(ContainerMapList& elements, CountedPtr& obj, OBJECT_HANDLE hdl) { - return NullPtr((SPECIFIC_TYPE*)NULL);// a missed + return NullPtr((SPECIFIC_TYPE*)nullptr);// a missed } // Recursion diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 42bdc4552..f192a0f4a 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -18,8 +18,8 @@ extern LoginDatabaseWorkerPool LoginDatabase; #include Log::Log() : - raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL), - dberLogfile(NULL), chatLogfile(NULL), sqlLogFile(NULL), sqlDevLogFile(NULL), miscLogFile(NULL), + raLogfile(nullptr), logfile(nullptr), gmLogfile(nullptr), charLogfile(nullptr), + dberLogfile(nullptr), chatLogfile(nullptr), sqlLogFile(nullptr), sqlDevLogFile(nullptr), miscLogFile(nullptr), m_gmlog_per_account(false), m_enableLogDB(false), m_colored(false) { Initialize(); @@ -27,41 +27,41 @@ Log::Log() : Log::~Log() { - if (logfile != NULL) + if (logfile != nullptr) fclose(logfile); - logfile = NULL; + logfile = nullptr; - if (gmLogfile != NULL) + if (gmLogfile != nullptr) fclose(gmLogfile); - gmLogfile = NULL; + gmLogfile = nullptr; - if (charLogfile != NULL) + if (charLogfile != nullptr) fclose(charLogfile); - charLogfile = NULL; + charLogfile = nullptr; - if (dberLogfile != NULL) + if (dberLogfile != nullptr) fclose(dberLogfile); - dberLogfile = NULL; + dberLogfile = nullptr; - if (raLogfile != NULL) + if (raLogfile != nullptr) fclose(raLogfile); - raLogfile = NULL; + raLogfile = nullptr; - if (chatLogfile != NULL) + if (chatLogfile != nullptr) fclose(chatLogfile); - chatLogfile = NULL; + chatLogfile = nullptr; - if (sqlLogFile != NULL) + if (sqlLogFile != nullptr) fclose(sqlLogFile); - sqlLogFile = NULL; + sqlLogFile = nullptr; - if (sqlDevLogFile != NULL) + if (sqlDevLogFile != nullptr) fclose(sqlDevLogFile); - sqlDevLogFile = NULL; + sqlDevLogFile = nullptr; - if (miscLogFile != NULL) + if (miscLogFile != nullptr) fclose(miscLogFile); - miscLogFile = NULL; + miscLogFile = nullptr; } std::unique_ptr& getLogInstance() @@ -145,11 +145,11 @@ void Log::Initialize() } charLogfile = openLogFile("CharLogFile", "CharLogTimestamp", "a"); - dberLogfile = openLogFile("DBErrorLogFile", NULL, "a"); - raLogfile = openLogFile("RaLogFile", NULL, "a"); + dberLogfile = openLogFile("DBErrorLogFile", nullptr, "a"); + raLogfile = openLogFile("RaLogFile", nullptr, "a"); chatLogfile = openLogFile("ChatLogFile", "ChatLogTimestamp", "a"); - sqlLogFile = openLogFile("SQLDriverLogFile", NULL, "a"); - sqlDevLogFile = openLogFile("SQLDeveloperLogFile", NULL, "a"); + sqlLogFile = openLogFile("SQLDriverLogFile", nullptr, "a"); + sqlDevLogFile = openLogFile("SQLDeveloperLogFile", nullptr, "a"); miscLogFile = fopen((m_logsDir + "Misc.log").c_str(), "a"); // Main log file settings @@ -185,7 +185,7 @@ FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFl { std::string logfn = sConfigMgr->GetOption(configFileName, "", false); if (logfn.empty()) - return NULL; + return nullptr; if (configTimeStampFlag && sConfigMgr->GetOption(configTimeStampFlag, false, false)) { @@ -202,7 +202,7 @@ FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFl FILE* Log::openGmlogPerAccount(uint32 account) { if (m_gmlog_filename_format.empty()) - return NULL; + return nullptr; char namebuf[ACORE_PATH_MAX]; snprintf(namebuf, ACORE_PATH_MAX, m_gmlog_filename_format.c_str(), account); @@ -211,7 +211,7 @@ FILE* Log::openGmlogPerAccount(uint32 account) void Log::outTimestamp(FILE* file) { - time_t t = time(NULL); + time_t t = time(nullptr); tm* aTm = localtime(&t); // YYYY year // MM month (2 digits 01-12) @@ -337,7 +337,7 @@ void Log::ResetColor(bool stdout_stream) std::string Log::GetTimestampStr() { - time_t t = time(NULL); + time_t t = time(nullptr); tm aTm; localtime_r(&t, &aTm); // YYYY year @@ -918,7 +918,7 @@ void Log::outChar(const char* str, ...) void Log::outCharDump(const char* str, uint32 account_id, uint32 guid, const char* name) { - FILE* file = NULL; + FILE* file = nullptr; if (m_charLog_Dump_Separate) { char fileName[29]; // Max length: name(12) + guid(11) + _.log (5) + \0 diff --git a/src/common/Threading/Callback.h b/src/common/Threading/Callback.h index 853129d78..e71e6653b 100644 --- a/src/common/Threading/Callback.h +++ b/src/common/Threading/Callback.h @@ -89,7 +89,7 @@ public: //! Resets all underlying variables (param, result and stage) void Reset() { - SetParam(NULL); + SetParam(nullptr); FreeResult(); ResetStage(); } @@ -180,7 +180,7 @@ public: void Reset() { SetFirstParam(0); - SetSecondParam(NULL); + SetSecondParam(nullptr); FreeResult(); ResetStage(); } @@ -281,9 +281,9 @@ public: //! Resets all underlying variables (param, result and stage) void Reset() { - SetFirstParam(NULL); - SetSecondParam(NULL); - SetThirdParam(NULL); + SetFirstParam(nullptr); + SetSecondParam(nullptr); + SetThirdParam(nullptr); FreeResult(); ResetStage(); } diff --git a/src/server/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h index cb31b8ccc..12392ab4d 100644 --- a/src/server/authserver/Server/RealmAcceptor.h +++ b/src/server/authserver/Server/RealmAcceptor.h @@ -48,7 +48,7 @@ protected: { sLog->outError("Out of file descriptors, suspending incoming connections for 10 seconds"); reactor()->remove_handler(this, ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - reactor()->schedule_timer(this, NULL, ACE_Time_Value(10)); + reactor()->schedule_timer(this, nullptr, ACE_Time_Value(10)); } #endif return 0; diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index f2a73c360..f111637ba 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -443,7 +443,7 @@ void PetAI::OwnerAttacked(Unit* target) // Called when owner attacks something. Allows defensive pets to know // that they need to assist - // Target might be NULL if called from spell with invalid cast targets + // Target might be nullptr if called from spell with invalid cast targets if (!target) return; diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 25309326e..057444a8b 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -191,7 +191,7 @@ void UnitAI::DoCastAOE(uint32 spellId, bool triggered) if (!triggered && me->HasUnitState(UNIT_STATE_CASTING)) return; - me->CastSpell((Unit*)NULL, spellId, triggered); + me->CastSpell((Unit*)nullptr, spellId, triggered); } #define UPDATE_TARGET(a) {if (AIInfo->targettarget=a;} diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index c75bcce8f..35a9b8991 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -26,12 +26,12 @@ void CreatureAI::OnCharmed(bool /*apply*/) AISpellInfoType* UnitAI::AISpellInfo; AISpellInfoType* GetAISpellInfo(uint32 i) { return &CreatureAI::AISpellInfo[i]; } -void CreatureAI::Talk(uint8 id, WorldObject const* whisperTarget /*= NULL*/) +void CreatureAI::Talk(uint8 id, WorldObject const* whisperTarget /*= nullptr*/) { sCreatureTextMgr->SendChat(me, id, whisperTarget); } -void CreatureAI::DoZoneInCombat(Creature* creature /*= NULL*/, float maxRangeToNearestTarget /* = 50.0f*/) +void CreatureAI::DoZoneInCombat(Creature* creature /*= nullptr*/, float maxRangeToNearestTarget /* = 50.0f*/) { if (!creature) creature = me; diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 39a29a981..e3da779f7 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -125,7 +125,7 @@ public: // Called at reaching home after evade virtual void JustReachedHome() {} - void DoZoneInCombat(Creature* creature = NULL, float maxRangeToNearestTarget = 50.0f); + void DoZoneInCombat(Creature* creature = nullptr, float maxRangeToNearestTarget = 50.0f); // Called at text emote receive from player virtual void ReceiveEmote(Player* /*player*/, uint32 /*emoteId*/) {} diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index f87a91746..3cdd54a13 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -86,7 +86,7 @@ namespace FactorySelector ainame = (ai_factory == nullptr) ? "NullCreatureAI" : ai_factory->key(); sLog->outDebug(LOG_FILTER_TSCR, "Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str()); #endif - return (ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature)); + return (ai_factory == nullptr ? new NullCreatureAI(creature) : ai_factory->Create(creature)); } MovementGenerator* selectMovementGenerator(Creature* creature) @@ -114,7 +114,7 @@ namespace FactorySelector } }*/ - return (mv_factory == NULL ? NULL : mv_factory->Create(creature)); + return (mv_factory == nullptr ? nullptr : mv_factory->Create(creature)); } GameObjectAI* SelectGameObjectAI(GameObject* go) @@ -130,10 +130,10 @@ namespace FactorySelector //future goAI types go here #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - std::string ainame = (ai_factory == NULL || go->GetScriptId()) ? "NullGameObjectAI" : ai_factory->key(); + std::string ainame = (ai_factory == nullptr || go->GetScriptId()) ? "NullGameObjectAI" : ai_factory->key(); sLog->outDebug(LOG_FILTER_TSCR, "GameObject %u used AI is %s.", go->GetGUIDLow(), ainame.c_str()); #endif - return (ai_factory == NULL ? new NullGameObjectAI(go) : ai_factory->Create(go)); + return (ai_factory == nullptr ? new NullGameObjectAI(go) : ai_factory->Create(go)); } } diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 18e41c099..dda1740fc 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -407,7 +407,7 @@ void npc_escortAI::SetRun(bool on) } //TODO: get rid of this many variables passed in function. -void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */, uint64 playerGUID /* = 0 */, Quest const* quest /* = NULL */, bool instantRespawn /* = false */, bool canLoopPath /* = false */, bool resetWaypoints /* = true */) +void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */, uint64 playerGUID /* = 0 */, Quest const* quest /* = nullptr */, bool instantRespawn /* = false */, bool canLoopPath /* = false */, bool resetWaypoints /* = true */) { if (me->GetVictim()) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index b5018de77..d2e1ea327 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -78,7 +78,7 @@ public: virtual void WaypointReached(uint32 pointId) = 0; virtual void WaypointStart(uint32 /*pointId*/) {} - void Start(bool isActiveAttacker = true, bool run = false, uint64 playerGUID = 0, Quest const* quest = NULL, bool instantRespawn = false, bool canLoopPath = false, bool resetWaypoints = true); + void Start(bool isActiveAttacker = true, bool run = false, uint64 playerGUID = 0, Quest const* quest = nullptr, bool instantRespawn = false, bool canLoopPath = false, bool resetWaypoints = true); void SetRun(bool on = true); void SetEscortPaused(bool on); diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index c47718e58..cdfc23297 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -205,7 +205,7 @@ void SmartAI::StartPath(bool run, uint32 path, bool repeat, Unit* invoker) GenerateWayPointArray(&pathPoints); me->GetMotionMaster()->MoveSplinePath(&pathPoints); - GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_START, NULL, wp->id, GetScript()->GetPathId()); + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_START, nullptr, wp->id, GetScript()->GetPathId()); } } @@ -248,7 +248,7 @@ void SmartAI::PausePath(uint32 delay, bool forced) me->StopMoving(); me->GetMotionMaster()->MoveIdle();//force stop } - GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_PAUSED, NULL, mCurrentWPID, GetScript()->GetPathId()); + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_PAUSED, nullptr, mCurrentWPID, GetScript()->GetPathId()); } void SmartAI::StopPath(uint32 DespawnTime, uint32 quest, bool fail) @@ -266,7 +266,7 @@ void SmartAI::StopPath(uint32 DespawnTime, uint32 quest, bool fail) me->StopMoving(); me->GetMotionMaster()->MoveIdle(); - GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_STOPPED, NULL, mCurrentWPID, GetScript()->GetPathId()); + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_STOPPED, nullptr, mCurrentWPID, GetScript()->GetPathId()); EndPath(fail); } @@ -335,7 +335,7 @@ void SmartAI::EndPath(bool fail) return; } - GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_ENDED, NULL, mCurrentWPID, GetScript()->GetPathId()); + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_ENDED, nullptr, mCurrentWPID, GetScript()->GetPathId()); mCurrentWPID = 0; if (mCanRepeatPath) @@ -398,7 +398,7 @@ void SmartAI::UpdatePath(const uint32 diff) { if (!me->IsInCombat() && !HasEscortState(SMART_ESCORT_RETURNING) && (mWPReached || mForcedPaused)) { - GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_RESUMED, NULL, mCurrentWPID, GetScript()->GetPathId()); + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_RESUMED, nullptr, mCurrentWPID, GetScript()->GetPathId()); RemoveEscortState(SMART_ESCORT_PAUSED); if (mForcedPaused)// if paused between 2 wps resend movement { @@ -565,7 +565,7 @@ void SmartAI::MovepointReached(uint32 id) } mWPReached = true; - GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_REACHED, NULL, mCurrentWPID); + GetScript()->ProcessEventsFor(SMART_EVENT_WAYPOINT_REACHED, nullptr, mCurrentWPID); if (mLastWP) { @@ -602,7 +602,7 @@ void SmartAI::MovementInform(uint32 MovementType, uint32 Data) if (MovementType == POINT_MOTION_TYPE && Data == SMART_ESCORT_LAST_OOC_POINT) me->ClearUnitState(UNIT_STATE_EVADE); - GetScript()->ProcessEventsFor(SMART_EVENT_MOVEMENTINFORM, NULL, MovementType, Data); + GetScript()->ProcessEventsFor(SMART_EVENT_MOVEMENTINFORM, nullptr, MovementType, Data); if (!HasEscortState(SMART_ESCORT_ESCORTING)) return; @@ -857,7 +857,7 @@ void SmartAI::UpdateAIWhileCharmed(const uint32 /*diff*/) void SmartAI::CorpseRemoved(uint32& respawnDelay) { - GetScript()->ProcessEventsFor(SMART_EVENT_CORPSE_REMOVED, NULL, respawnDelay); + GetScript()->ProcessEventsFor(SMART_EVENT_CORPSE_REMOVED, nullptr, respawnDelay); // xinef: end escort upon corpse remove, safe check in case of immediate despawn if (IsEscorted()) @@ -882,12 +882,12 @@ void SmartAI::InitializeAI() void SmartAI::OnCharmed(bool apply) { - GetScript()->ProcessEventsFor(SMART_EVENT_CHARMED, NULL, 0, 0, apply); + GetScript()->ProcessEventsFor(SMART_EVENT_CHARMED, nullptr, 0, 0, apply); } void SmartAI::DoAction(int32 param) { - GetScript()->ProcessEventsFor(SMART_EVENT_ACTION_DONE, NULL, param); + GetScript()->ProcessEventsFor(SMART_EVENT_ACTION_DONE, nullptr, param); } uint32 SmartAI::GetData(uint32 /*id*/) const @@ -897,7 +897,7 @@ uint32 SmartAI::GetData(uint32 /*id*/) const void SmartAI::SetData(uint32 id, uint32 value) { - GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, NULL, id, value); + GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, nullptr, id, value); } void SmartAI::SetGUID(uint64 /*guid*/, int32 /*id*/) @@ -1052,7 +1052,7 @@ void SmartAI::SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker) void SmartAI::sOnGameEvent(bool start, uint16 eventId) { - GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, NULL, eventId); + GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, nullptr, eventId); } void SmartAI::OnSpellClick(Unit* clicker, bool& /*result*/) @@ -1100,14 +1100,14 @@ bool SmartGameObjectAI::GossipHello(Player* player, bool reportUse) #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartGameObjectAI::GossipHello"); #endif - GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, (uint32)reportUse, 0, false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, (uint32)reportUse, 0, false, nullptr, go); return false; } // Called when a player selects a gossip item in the gameobject's gossip menu. bool SmartGameObjectAI::GossipSelect(Player* player, uint32 sender, uint32 action) { - GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, sender, action, false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, sender, action, false, nullptr, go); return false; } @@ -1120,26 +1120,26 @@ bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*sender*/, // Called when a player accepts a quest from the gameobject. bool SmartGameObjectAI::QuestAccept(Player* player, Quest const* quest) { - GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId(), 0, false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId(), 0, false, nullptr, go); return false; } // Called when a player selects a quest reward. bool SmartGameObjectAI::QuestReward(Player* player, Quest const* quest, uint32 opt) { - GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt, false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt, false, nullptr, go); return false; } // Called when the gameobject is destroyed (destructible buildings only). void SmartGameObjectAI::Destroyed(Player* player, uint32 eventId) { - GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId, 0, false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId, 0, false, nullptr, go); } void SmartGameObjectAI::SetData(uint32 id, uint32 value) { - GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, NULL, id, value); + GetScript()->ProcessEventsFor(SMART_EVENT_DATA_SET, nullptr, id, value); } void SmartGameObjectAI::SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker) @@ -1151,7 +1151,7 @@ void SmartGameObjectAI::SetScript9(SmartScriptHolder& e, uint32 entry, Unit* inv void SmartGameObjectAI::OnGameEvent(bool start, uint16 eventId) { - GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, NULL, eventId); + GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, nullptr, eventId); } void SmartGameObjectAI::OnStateChanged(uint32 state, Unit* unit) @@ -1161,7 +1161,7 @@ void SmartGameObjectAI::OnStateChanged(uint32 state, Unit* unit) void SmartGameObjectAI::EventInform(uint32 eventId) { - GetScript()->ProcessEventsFor(SMART_EVENT_GO_EVENT_INFORM, NULL, eventId); + GetScript()->ProcessEventsFor(SMART_EVENT_GO_EVENT_INFORM, nullptr, eventId); } void SmartGameObjectAI::SpellHit(Unit* unit, const SpellInfo* spellInfo) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 3b68888ce..2f492b638 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -749,7 +749,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (go) { - // Xinef: may be NULL! + // Xinef: may be nullptr! go->CastSpell((*itr)->ToUnit(), e.action.cast.spell); } @@ -2104,7 +2104,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; } case SMART_ACTION_TRIGGER_TIMED_EVENT: - ProcessEventsFor((SMART_EVENT)SMART_EVENT_TIMED_EVENT_TRIGGERED, NULL, e.action.timeEvent.id); + ProcessEventsFor((SMART_EVENT)SMART_EVENT_TIMED_EVENT_TRIGGERED, nullptr, e.action.timeEvent.id); // xinef: remove this event if not repeatable if (e.event.event_flags & SMART_EVENT_FLAG_NOT_REPEATABLE) @@ -2987,7 +2987,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u case SMART_ACTION_TRIGGER_RANDOM_TIMED_EVENT: { uint32 eventId = urand(e.action.randomTimedEvent.minId, e.action.randomTimedEvent.maxId); - ProcessEventsFor((SMART_EVENT)SMART_EVENT_TIMED_EVENT_TRIGGERED, NULL, eventId); + ProcessEventsFor((SMART_EVENT)SMART_EVENT_TIMED_EVENT_TRIGGERED, nullptr, eventId); break; } case SMART_ACTION_SET_HOVER: @@ -3427,7 +3427,7 @@ SmartScriptHolder SmartScript::CreateSmartEvent(SMART_EVENT e, uint32 event_flag return script; } -ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /*= NULL*/) +ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /*= nullptr*/) { Unit* scriptTrigger = nullptr; if (invoker) @@ -4297,7 +4297,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui { if (e.event.gameEvent.gameEventId != var0) return; - ProcessAction(e, NULL, var0); + ProcessAction(e, nullptr, var0); break; } case SMART_EVENT_GO_STATE_CHANGED: @@ -4311,7 +4311,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui { if (e.event.eventInform.eventId != var0) return; - ProcessAction(e, NULL, var0); + ProcessAction(e, nullptr, var0); break; } case SMART_EVENT_ACTION_DONE: @@ -4518,7 +4518,7 @@ void SmartScript::UpdateTimer(SmartScriptHolder& e, uint32 const diff) if (e.GetEventType() == SMART_EVENT_UPDATE_IC && (!me || !me->IsInCombat())) return; - if (e.GetEventType() == SMART_EVENT_UPDATE_OOC && (me && me->IsInCombat()))//can be used with me=NULL (go script) + if (e.GetEventType() == SMART_EVENT_UPDATE_OOC && (me && me->IsInCombat()))//can be used with me=nullptr (go script) return; if (e.timer < diff) @@ -4654,7 +4654,7 @@ void SmartScript::OnUpdate(uint32 const diff) mTalkerEntry = 0; mTextTimer = 0; mUseTextTimer = false; - ProcessEventsFor(SMART_EVENT_TEXT_OVER, NULL, textID, entry); + ProcessEventsFor(SMART_EVENT_TEXT_OVER, nullptr, textID, entry); } else mTextTimer -= diff; } @@ -4717,7 +4717,7 @@ void SmartScript::GetScript() else if (trigger) { e = sSmartScriptMgr->GetScript((int32)trigger->entry, mScriptType); - FillScript(e, NULL, trigger); + FillScript(e, nullptr, trigger); } } @@ -4756,7 +4756,7 @@ void SmartScript::OnInitialize(WorldObject* obj, AreaTrigger const* at) } else { - sLog->outError("SmartScript::OnInitialize: !WARNING! Initialized objects are NULL."); + sLog->outError("SmartScript::OnInitialize: !WARNING! Initialized objects are nullptr."); return; } diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index b0be901bb..c9d9b468c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -25,14 +25,14 @@ public: void GetScript(); void FillScript(SmartAIEventList e, WorldObject* obj, AreaTrigger const* at); - void ProcessEventsFor(SMART_EVENT e, Unit* unit = NULL, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = NULL, GameObject* gob = nullptr); - void ProcessEvent(SmartScriptHolder& e, Unit* unit = NULL, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = NULL, GameObject* gob = nullptr); + void ProcessEventsFor(SMART_EVENT e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); + void ProcessEvent(SmartScriptHolder& e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); bool CheckTimer(SmartScriptHolder const& e) const; void RecalcTimer(SmartScriptHolder& e, uint32 min, uint32 max); void UpdateTimer(SmartScriptHolder& e, uint32 const diff); void InitTimer(SmartScriptHolder& e); - void ProcessAction(SmartScriptHolder& e, Unit* unit = NULL, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = NULL, GameObject* gob = nullptr); - void ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit = NULL, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = NULL, GameObject* gob = nullptr); + void ProcessAction(SmartScriptHolder& e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); + void ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); ObjectList* GetTargets(SmartScriptHolder const& e, Unit* invoker = nullptr); ObjectList* GetWorldObjectsInDist(float dist); void InstallTemplate(SmartScriptHolder const& e); @@ -145,7 +145,7 @@ public: else mCounterList.insert(std::make_pair(id, value)); - ProcessEventsFor(SMART_EVENT_COUNTER_SET, NULL, id); + ProcessEventsFor(SMART_EVENT_COUNTER_SET, nullptr, id); } uint32 GetCounterValue(uint32 id) diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index a83d95d44..1789f9b67 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -1849,7 +1849,7 @@ private: { if (!data) { - sLog->outErrorDb("SmartAIMgr: Entry %d SourceType %u Event %u Action %u Parameter can not be NULL, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); + sLog->outErrorDb("SmartAIMgr: Entry %d SourceType %u Event %u Action %u Parameter can not be nullptr, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); return false; } return true; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 0b5b59810..895ecd19d 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -755,7 +755,7 @@ static const uint32 achievIdForDungeon[][4] = /** * this function will be called whenever the user might have done a criteria relevant action */ -void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= NULL*/) +void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= nullptr*/) { // disable for gamemasters with GM-mode enabled if (m_player->IsGameMaster()) diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 4ca477b57..a473152fb 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -477,7 +477,7 @@ void AuctionHouseObject::Update() time_t checkTime = sWorld->GetGameTime() + 60; ///- Handle expired auctions - // If storage is empty, no need to update. next == NULL in this case. + // If storage is empty, no need to update. next == nullptr in this case. if (AuctionsMap.empty()) return; diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 8f299babb..93797293e 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -463,7 +463,7 @@ void Battlefield::SendWarningToAllInZone(uint32 entry) { if (Unit* unit = ObjectAccessor::FindUnit(StalkerGuid)) if (Creature* stalker = unit->ToCreature()) - sCreatureTextMgr->SendChat(stalker, (uint8)entry, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(stalker, (uint8)entry, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); } void Battlefield::SendWarningToPlayer(Player* player, uint32 entry) diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 8c247fc1a..0dd97dfb6 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -98,7 +98,7 @@ public: virtual void SendChangePhase(); bool SetCapturePointData(GameObject* capturePoint); - GameObject* GetCapturePointGo() { return ObjectAccessor::GetObjectInWorld(m_capturePoint, (GameObject*)NULL); } + GameObject* GetCapturePointGo() { return ObjectAccessor::GetObjectInWorld(m_capturePoint, (GameObject*)nullptr); } GameObject* GetCapturePointGo(WorldObject* obj) { return ObjectAccessor::GetGameObject(*obj, m_capturePoint); } TeamId GetTeamId() { return m_team; } diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 9158601a9..a1bfb2251 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -373,7 +373,7 @@ public: bool SetupBattlefield() override; /// Return pointer to relic object - GameObject* GetRelic() { return ObjectAccessor::GetObjectInWorld(m_titansRelic, (GameObject*)NULL); } + GameObject* GetRelic() { return ObjectAccessor::GetObjectInWorld(m_titansRelic, (GameObject*)nullptr); } /// Define relic object //void SetRelic(GameObject* relic) { m_titansRelic = relic; } @@ -1136,11 +1136,11 @@ struct BfWGGameObjectBuilding break; } - GameObject* go = ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)NULL); + GameObject* go = ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)nullptr); if (go) { // Rebuild gameobject - go->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true); + go->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); go->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[m_Team]); } @@ -1190,7 +1190,7 @@ struct BfWGGameObjectBuilding { // Inform the global wintergrasp script of the destruction of this object case BATTLEFIELD_WG_OBJECTTYPE_TOWER: - m_WG->UpdatedDestroyedTowerCount(TeamId(m_Team), ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)NULL)); + m_WG->UpdatedDestroyedTowerCount(TeamId(m_Team), ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)nullptr)); break; case BATTLEFIELD_WG_OBJECTTYPE_DOOR_LAST: m_WG->SetRelicInteractible(true); @@ -1202,7 +1202,7 @@ struct BfWGGameObjectBuilding case BATTLEFIELD_WG_OBJECTTYPE_DOOR: case BATTLEFIELD_WG_OBJECTTYPE_WALL: case BATTLEFIELD_WG_OBJECTTYPE_KEEP_TOWER: - m_WG->UpdatedDestroyedTowerCount(TeamId(m_Team), ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)NULL)); + m_WG->UpdatedDestroyedTowerCount(TeamId(m_Team), ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)nullptr)); break; } @@ -1247,7 +1247,7 @@ struct BfWGGameObjectBuilding { case BATTLEFIELD_WG_OBJECTSTATE_ALLIANCE_INTACT: case BATTLEFIELD_WG_OBJECTSTATE_HORDE_INTACT: - gobj->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true); + gobj->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); break; case BATTLEFIELD_WG_OBJECTSTATE_ALLIANCE_DESTROY: case BATTLEFIELD_WG_OBJECTSTATE_HORDE_DESTROY: @@ -1379,7 +1379,7 @@ struct BfWGGameObjectBuilding void UpdateTurretAttack(bool disable) { - GameObject* build = ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)NULL); + GameObject* build = ObjectAccessor::GetObjectInWorld(m_Build, (GameObject*)nullptr); if (!build) return; diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 7a5ce758b..3db545f7b 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -410,13 +410,13 @@ inline void Battleground::_ProcessProgress(uint32 diff) if (newtime > (MINUTE * IN_MILLISECONDS)) { if (newtime / (MINUTE * IN_MILLISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS)) - PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))); + PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, nullptr, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))); } else { //announce every 15 seconds if (newtime / (15 * IN_MILLISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILLISECONDS)) - PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS)); + PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, nullptr, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS)); } m_PrematureCountDownTimer = newtime; } @@ -557,7 +557,7 @@ inline void Battleground::_ProcessJoin(uint32 diff) if (GetStatus() == STATUS_IN_PROGRESS) { for (ToBeTeleportedMap::const_iterator itr = m_ToBeTeleported.begin(); itr != m_ToBeTeleported.end(); ++itr) - if (Player* p = ObjectAccessor::GetObjectInOrOutOfWorld(itr->first, (Player*)NULL)) + if (Player* p = ObjectAccessor::GetObjectInOrOutOfWorld(itr->first, (Player*)nullptr)) if (Player* t = ObjectAccessor::FindPlayer(itr->second)) { if (!t->FindMap() || t->FindMap() != GetBgMap()) diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 119e1d11f..26be3b047 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -1050,7 +1050,7 @@ bool BGQueueRemoveEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) Battleground* bg = sBattlegroundMgr->GetBattleground(m_BgInstanceGUID); - // battleground can be already deleted, bg may be NULL! + // battleground can be already deleted, bg may be nullptr! // check if still in queue for this battleground uint32 queueSlot = player->GetBattlegroundQueueIndex(m_BgQueueTypeId); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index d4192ecf9..cfbbf8c28 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -825,7 +825,7 @@ void BattlegroundAV::DePopulateNode(BG_AV_Nodes node) //remove bonus honor aura trigger creature when node is lost if (node < BG_AV_NODES_MAX)//fail safe - DelCreature(node + 302);//NULL checks are in DelCreature! 0-302 spirit guides + DelCreature(node + 302);//nullptr checks are in DelCreature! 0-302 spirit guides } BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index a64dc8ec8..e995f6a07 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -372,7 +372,7 @@ void BattlegroundEY::RespawnFlagAfterDrop() _flagState = BG_EY_FLAG_STATE_ON_BASE; RespawnFlag(); - if (GameObject* flag = ObjectAccessor::GetObjectInMap(GetDroppedFlagGUID(), FindBgMap(), (GameObject*)NULL)) + if (GameObject* flag = ObjectAccessor::GetObjectInMap(GetDroppedFlagGUID(), FindBgMap(), (GameObject*)nullptr)) flag->Delete(); SetDroppedFlagGUID(0); } @@ -418,7 +418,7 @@ void BattlegroundEY::EventPlayerClickedOnFlag(Player* player, GameObject* gameOb player->CastSpell(player, BG_EY_NETHERSTORM_FLAG_SPELL, true); player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT); - PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, player->GetTeamId() == TEAM_ALLIANCE ? CHAT_MSG_BG_SYSTEM_ALLIANCE : CHAT_MSG_BG_SYSTEM_HORDE, NULL, player->GetName().c_str()); + PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, player->GetTeamId() == TEAM_ALLIANCE ? CHAT_MSG_BG_SYSTEM_ALLIANCE : CHAT_MSG_BG_SYSTEM_HORDE, nullptr, player->GetName().c_str()); PlaySoundToAll(player->GetTeamId() == TEAM_ALLIANCE ? BG_EY_SOUND_FLAG_PICKED_UP_ALLIANCE : BG_EY_SOUND_FLAG_PICKED_UP_HORDE); UpdateWorldState(NETHERSTORM_FLAG, 0); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 3a6c49660..fd99f1925 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -234,7 +234,7 @@ void BattlegroundIC::PostUpdateImpl(uint32 diff) UpdateNodeWorldState(&nodePoint[i]); HandleCapturedNodes(&nodePoint[i], false); - SendMessage2ToAll(LANG_BG_IC_TEAM_HAS_TAKEN_NODE, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (nodePoint[i].faction == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE), nodePoint[i].string); + SendMessage2ToAll(LANG_BG_IC_TEAM_HAS_TAKEN_NODE, CHAT_MSG_BG_SYSTEM_NEUTRAL, nullptr, (nodePoint[i].faction == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE), nodePoint[i].string); nodePoint[i].needChange = false; nodePoint[i].timer = BANNER_STATE_CHANGE_TIME; @@ -543,7 +543,7 @@ void BattlegroundIC::HandleKillPlayer(Player* player, Player* killer) void BattlegroundIC::EndBattleground(TeamId winnerTeamId) { - SendMessage2ToAll(LANG_BG_IC_TEAM_WINS, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (winnerTeamId == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); + SendMessage2ToAll(LANG_BG_IC_TEAM_WINS, CHAT_MSG_BG_SYSTEM_NEUTRAL, nullptr, (winnerTeamId == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); Battleground::EndBattleground(winnerTeamId); } @@ -944,7 +944,7 @@ void BattlegroundIC::DestroyGate(Player* /*player*/, GameObject* go) } TurnBosses(true); - SendMessage2ToAll(lang_entry, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (teamId == TEAM_ALLIANCE ? LANG_BG_IC_HORDE_KEEP : LANG_BG_IC_ALLIANCE_KEEP)); + SendMessage2ToAll(lang_entry, CHAT_MSG_BG_SYSTEM_NEUTRAL, nullptr, (teamId == TEAM_ALLIANCE ? LANG_BG_IC_HORDE_KEEP : LANG_BG_IC_ALLIANCE_KEEP)); } void BattlegroundIC::EventPlayerDamagedGO(Player* /*player*/, GameObject* /*go*/, uint32 /*eventType*/) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index ac433b9f3..f85a70397 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -70,18 +70,18 @@ void BattlegroundWS::PostUpdateImpl(uint32 diff) RespawnFlagAfterDrop(TEAM_HORDE); break; case BG_WS_EVENT_BOTH_FLAGS_KEPT10: - if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_ALLIANCE), this->FindBgMap(), (Player*)NULL)) + if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_ALLIANCE), this->FindBgMap(), (Player*)nullptr)) player->CastSpell(player, BG_WS_SPELL_FOCUSED_ASSAULT, true); - if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_HORDE), this->FindBgMap(), (Player*)NULL)) + if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_HORDE), this->FindBgMap(), (Player*)nullptr)) player->CastSpell(player, BG_WS_SPELL_FOCUSED_ASSAULT, true); break; case BG_WS_EVENT_BOTH_FLAGS_KEPT15: - if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_ALLIANCE), this->FindBgMap(), (Player*)NULL)) + if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_ALLIANCE), this->FindBgMap(), (Player*)nullptr)) { player->RemoveAurasDueToSpell(BG_WS_SPELL_FOCUSED_ASSAULT); player->CastSpell(player, BG_WS_SPELL_BRUTAL_ASSAULT, true); } - if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_HORDE), this->FindBgMap(), (Player*)NULL)) + if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_HORDE), this->FindBgMap(), (Player*)nullptr)) { player->RemoveAurasDueToSpell(BG_WS_SPELL_FOCUSED_ASSAULT); player->CastSpell(player, BG_WS_SPELL_BRUTAL_ASSAULT, true); @@ -540,12 +540,12 @@ uint32 BattlegroundWS::GetAssaultSpellId() const void BattlegroundWS::RemoveAssaultAuras() { - if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_ALLIANCE), this->FindBgMap(), (Player*)NULL)) + if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_ALLIANCE), this->FindBgMap(), (Player*)nullptr)) { player->RemoveAurasDueToSpell(BG_WS_SPELL_FOCUSED_ASSAULT); player->RemoveAurasDueToSpell(BG_WS_SPELL_BRUTAL_ASSAULT); } - if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_HORDE), this->FindBgMap(), (Player*)NULL)) + if (Player* player = ObjectAccessor::GetObjectInMap(GetFlagPickerGUID(TEAM_HORDE), this->FindBgMap(), (Player*)nullptr)) { player->RemoveAurasDueToSpell(BG_WS_SPELL_FOCUSED_ASSAULT); player->RemoveAurasDueToSpell(BG_WS_SPELL_BRUTAL_ASSAULT); diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index d76cfb860..57006329f 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -401,7 +401,7 @@ CalendarEventStore CalendarMgr::GetPlayerEvents(uint64 guid) for (CalendarEventInviteStore::const_iterator itr = _invites.begin(); itr != _invites.end(); ++itr) for (CalendarInviteStore::const_iterator itr2 = itr->second.begin(); itr2 != itr->second.end(); ++itr2) if ((*itr2)->GetInviteeGUID() == guid) - if (CalendarEvent* event = GetEvent(itr->first)) // NULL check added as attempt to fix #11512 + if (CalendarEvent* event = GetEvent(itr->first)) // nullptr check added as attempt to fix #11512 events.insert(event); if (Player* player = ObjectAccessor::FindPlayerInOrOutOfWorld(guid)) @@ -665,7 +665,7 @@ void CalendarMgr::SendCalendarClearPendingAction(uint64 guid) } } -void CalendarMgr::SendCalendarCommandResult(uint64 guid, CalendarError err, char const* param /*= NULL*/) +void CalendarMgr::SendCalendarCommandResult(uint64 guid, CalendarError err, char const* param /*= nullptr*/) { if (Player* player = ObjectAccessor::FindPlayerInOrOutOfWorld(guid)) { diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 2837672a8..3fe6e4fcc 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -116,7 +116,7 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac else if (target_account) target_sec = AccountMgr::GetSecurity(target_account, realmID); else - return true; // caller must report error for (target == NULL && target_account == 0) + return true; // caller must report error for (target == nullptr && target_account == 0) AccountTypes target_ac_sec = AccountTypes(target_sec); if (m_session->GetSecurity() < target_ac_sec || (strong && m_session->GetSecurity() <= target_ac_sec)) @@ -276,7 +276,7 @@ bool ChatHandler::ExecuteCommandInTable(std::vector const& table, c if (!ExecuteCommandInTable(table[i].ChildCommands, text, fullcmd.c_str())) { #ifdef ELUNA - if (!sEluna->OnCommand(GetSession() ? GetSession()->GetPlayer() : NULL, oldtext)) + if (!sEluna->OnCommand(GetSession() ? GetSession()->GetPlayer() : nullptr, oldtext)) return true; #endif if (text[0] != '\0') @@ -429,7 +429,7 @@ bool ChatHandler::ParseCommands(char const* text) if (!ExecuteCommandInTable(getCommandTable(), text, fullcmd)) { #ifdef ELUNA - if (!sEluna->OnCommand(GetSession() ? GetSession()->GetPlayer() : NULL, text)) + if (!sEluna->OnCommand(GetSession() ? GetSession()->GetPlayer() : nullptr, text)) return true; #endif if (m_session && AccountMgr::IsPlayerAccount(m_session->GetSecurity())) @@ -1084,7 +1084,7 @@ std::string ChatHandler::extractPlayerNameFromLink(char* text) return name; } -bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* player_guid /*=NULL*/, std::string* player_name /*= NULL*/) +bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* player_guid /*=nullptr*/, std::string* player_name /*= nullptr*/) { if (args && *args) { @@ -1171,7 +1171,7 @@ char* ChatHandler::extractQuotedArg(char* args) continue; } - // return NULL if we reached the end of the string + // return nullptr if we reached the end of the string if (!*args) return nullptr; diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 7753670ed..36915e4a9 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -93,7 +93,7 @@ public: char* extractKeyFromLink(char* text, char const* linkType, char** something1 = nullptr); char* extractKeyFromLink(char* text, char const* const* linkTypes, int* found_idx, char** something1 = nullptr); - // if args have single value then it return in arg2 and arg1 == NULL + // if args have single value then it return in arg2 and arg1 == nullptr void extractOptFirstArg(char* args, char** arg1, char** arg2); char* extractQuotedArg(char* args); @@ -103,7 +103,7 @@ public: bool GetPlayerGroupAndGUIDByName(const char* cname, Player*& player, Group*& group, uint64& guid, bool offline = false); std::string extractPlayerNameFromLink(char* text); // select by arg (name/link) or in-game selection online/offline player - bool extractPlayerTarget(char* args, Player** player, uint64* player_guid = NULL, std::string* player_name = nullptr); + bool extractPlayerTarget(char* args, Player** player, uint64* player_guid = nullptr, std::string* player_name = nullptr); std::string playerLink(std::string const& name) const { return m_session ? "|cffffffff|Hplayer:" + name + "|h[" + name + "]|h|r" : name; } std::string GetNameLink(Player* chr) const; @@ -123,7 +123,7 @@ protected: bool ShowHelpForSubCommands(std::vector const& table, char const* cmd, char const* subcmd); private: - WorldSession* m_session; // != NULL for chat command call and NULL for CLI command + WorldSession* m_session; // != nullptr for chat command call and nullptr for CLI command // common global flag static bool load_command_table; diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index 8836bf49a..56b215450 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -173,7 +173,7 @@ bool ItemChatLink::Initialize(std::istringstream& iss) inline std::string ItemChatLink::FormatName(uint8 index, ItemLocale const* locale, char* const* suffixStrings) const { std::stringstream ss; - if (locale == NULL || index >= locale->Name.size()) + if (locale == nullptr || index >= locale->Name.size()) ss << _item->Name1; else ss << locale->Name[index]; @@ -188,7 +188,7 @@ bool ItemChatLink::ValidateName(char* buffer, const char* context) char* const* suffixStrings = _suffix ? _suffix->nameSuffix : (_property ? _property->nameSuffix : nullptr); - bool res = (FormatName(LOCALE_enUS, NULL, suffixStrings) == buffer); + bool res = (FormatName(LOCALE_enUS, nullptr, suffixStrings) == buffer); if (!res) { diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index e97b35579..d04e37fdf 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -238,7 +238,7 @@ void ThreatContainer::clearReferences() } //============================================================ -// Return the HostileReference of NULL, if not found +// Return the HostileReference of nullptr, if not found HostileReference* ThreatContainer::getReferenceByTarget(Unit* victim) const { if (!victim) @@ -338,7 +338,7 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* attacker, HostileR // pussywizard: skip not valid targets if (attacker->_CanDetectFeignDeathOf(target) && attacker->CanCreatureAttack(target)) { - if (currentVictim) // pussywizard: if not NULL then target must have 10%/30% more threat + if (currentVictim) // pussywizard: if not nullptr then target must have 10%/30% more threat { if (currentVictim == currentRef) // pussywizard: nothing found previously was good and enough, currentRef passed all necessary tests, so end now { @@ -460,7 +460,7 @@ Unit* ThreatManager::getHostilTarget() iThreatContainer.update(); HostileReference* nextVictim = iThreatContainer.selectNextVictim(GetOwner()->ToCreature(), getCurrentVictim()); setCurrentVictim(nextVictim); - return getCurrentVictim() != NULL ? getCurrentVictim()->getTarget() : nullptr; + return getCurrentVictim() != nullptr ? getCurrentVictim()->getTarget() : nullptr; } //============================================================ diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h index 1ab7df551..9fcfd57e9 100644 --- a/src/server/game/Combat/UnitEvents.h +++ b/src/server/game/Combat/UnitEvents.h @@ -36,7 +36,7 @@ enum UNIT_EVENT_TYPE // New target should be fetched, could tbe the current target as well UEV_THREAT_SET_NEXT_TARGET = 1 << 5, - // A new victim (target) was set. Could be NULL + // A new victim (target) was set. Could be nullptr UEV_THREAT_VICTIM_CHANGED = 1 << 6, // Future use diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 269c8d52d..eec13ce6d 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -570,7 +570,7 @@ namespace lfg else { uint8 memberCount = 0; - for (GroupReference* itr = grp->GetFirstMember(); itr != NULL && joinData.result == LFG_JOIN_OK; itr = itr->next()) + for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr && joinData.result == LFG_JOIN_OK; itr = itr->next()) { if (Player* plrg = itr->GetSource()) { @@ -598,7 +598,7 @@ namespace lfg joinData.result = LFG_JOIN_RANDOM_COOLDOWN; else if (grp) { - for (GroupReference* itr = grp->GetFirstMember(); itr != NULL && joinData.result == LFG_JOIN_OK; itr = itr->next()) + for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr && joinData.result == LFG_JOIN_OK; itr = itr->next()) if (Player* plrg = itr->GetSource()) if (plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) // xinef: added !isContinue joinData.result = LFG_JOIN_PARTY_RANDOM_COOLDOWN; @@ -733,7 +733,7 @@ namespace lfg /** Leaves Dungeon System. Player/Group is removed from queue, rolechecks, proposals - or votekicks. Player or group needs to be not NULL and using Dungeon System + or votekicks. Player or group needs to be not nullptr and using Dungeon System @param[in] guid Player or group guid */ @@ -2085,7 +2085,7 @@ namespace lfg // if we can take the quest, means that we haven't done this kind of "run", IE: First Heroic Random of Day. if (player->CanRewardQuest(quest, false)) - player->RewardQuest(quest, 0, NULL, false); + player->RewardQuest(quest, 0, nullptr, false); else { done = true; @@ -2093,7 +2093,7 @@ namespace lfg if (!quest) continue; // we give reward without informing client (retail does this) - player->RewardQuest(quest, 0, NULL, false); + player->RewardQuest(quest, 0, nullptr, false); } // Give rewards diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 6d0c7020e..1445c7016 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1051,7 +1051,7 @@ void Creature::SetLootRecipient(Unit* unit, bool withGroup) { // set the player whose group should receive the right // to loot the creature after it dies - // should be set to NULL after the loot disappears + // should be set to nullptr after the loot disappears if (!unit) { @@ -2387,7 +2387,7 @@ void Creature::SendZoneUnderAttackMessage(Player* attacker) { WorldPacket data(SMSG_ZONE_UNDER_ATTACK, 4); data << (uint32)GetAreaId(); - sWorld->SendGlobalMessage(&data, NULL, (attacker->GetTeamId() == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE)); + sWorld->SendGlobalMessage(&data, nullptr, (attacker->GetTeamId() == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE)); } void Creature::SetInCombatWithZone() diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index ab5a7da38..04e06a767 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1212,7 +1212,7 @@ void GameObject::ResetDoorOrButton() m_cooldownTime = 0; } -void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = false */, Unit* user /*=NULL*/) +void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = false */, Unit* user /*=nullptr*/) { if (m_lootState != GO_READY) return; @@ -1667,7 +1667,7 @@ void GameObject::Use(Unit* user) if (info->spellcaster.partyOnly) { - Player const* caster = ObjectAccessor::GetObjectInOrOutOfWorld(GetOwnerGUID(), (Player*)NULL); + Player const* caster = ObjectAccessor::GetObjectInOrOutOfWorld(GetOwnerGUID(), (Player*)nullptr); if (!caster || user->GetTypeId() != TYPEID_PLAYER || !user->ToPlayer()->IsInSameRaidWith(caster)) return; } @@ -2029,7 +2029,7 @@ void GameObject::SetWorldRotationAngles(float z_rot, float y_rot, float x_rot) SetWorldRotation(G3D::Quat(G3D::Matrix3::fromEulerAnglesZYX(z_rot, y_rot, x_rot))); } -void GameObject::ModifyHealth(int32 change, Unit* attackerOrHealer /*= NULL*/, uint32 spellId /*= 0*/) +void GameObject::ModifyHealth(int32 change, Unit* attackerOrHealer /*= nullptr*/, uint32 spellId /*= 0*/) { if (!IsDestructibleBuilding()) return; @@ -2085,7 +2085,7 @@ void GameObject::ModifyHealth(int32 change, Unit* attackerOrHealer /*= NULL*/, u SetDestructibleState(newState, player, false); } -void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player* eventInvoker /*= NULL*/, bool setHealth /*= false*/) +void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player* eventInvoker /*= nullptr*/, bool setHealth /*= false*/) { // the user calling this must know he is already operating on destructible gameobject ASSERT(GetGoType() == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING); @@ -2303,7 +2303,7 @@ void GameObject::SetLootRecipient(Unit* unit) { // set the player whose group should receive the right // to loot the creature after it dies - // should be set to NULL after the loot disappears + // should be set to nullptr after the loot disappears if (!unit) { @@ -2437,7 +2437,7 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t data->append(fieldBuffer); } -void GameObject::GetRespawnPosition(float& x, float& y, float& z, float* ori /* = NULL*/) const +void GameObject::GetRespawnPosition(float& x, float& y, float& z, float* ori /* = nullptr*/) const { if (m_DBTableGuid) { diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 7c605d135..2c3348860 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -91,7 +91,7 @@ void AddItemsSetItem(Player* player, Item* item) } // spell casted only if fit form requirement, in other case will casted at form change - player->ApplyEquipSpell(spellInfo, NULL, true); + player->ApplyEquipSpell(spellInfo, nullptr, true); eff->spells[y] = spellInfo; break; } @@ -142,8 +142,8 @@ void RemoveItemsSetItem(Player* player, ItemTemplate const* proto) if (eff->spells[z] && eff->spells[z]->Id == set->spells[x]) { // spell can be not active if not fit form requirement - player->ApplyEquipSpell(eff->spells[z], NULL, false); - eff->spells[z] = NULL; + player->ApplyEquipSpell(eff->spells[z], nullptr, false); + eff->spells[z] = nullptr; break; } } @@ -1075,7 +1075,7 @@ Item* Item::CreateItem(uint32 item, uint32 count, Player const* player, bool clo Item* Item::CloneItem(uint32 count, Player const* player) const { - // player CAN be NULL in which case we must not update random properties because that accesses player's item update queue + // player CAN be nullptr in which case we must not update random properties because that accesses player's item update queue Item* newItem = CreateItem(GetEntry(), count, player, true, player ? GetItemRandomPropertyId() : 0); if (!newItem) return nullptr; @@ -1143,7 +1143,7 @@ void Item::DeleteRefundDataFromDB(SQLTransaction* trans) } } -void Item::SetNotRefundable(Player* owner, bool changestate /*=true*/, SQLTransaction* trans /*=NULL*/) +void Item::SetNotRefundable(Player* owner, bool changestate /*=true*/, SQLTransaction* trans /*=nullptr*/) { if (!HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_REFUNDABLE)) return; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 806ccafb1..cef3b3e43 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2201,7 +2201,7 @@ void WorldObject::AddObjectToRemoveList() map->AddObjectToRemoveList(this); } -TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties /*= NULL*/, uint32 duration /*= 0*/, Unit* summoner /*= NULL*/, uint32 spellId /*= 0*/, uint32 vehId /*= 0*/) +TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties /*= nullptr*/, uint32 duration /*= 0*/, Unit* summoner /*= nullptr*/, uint32 spellId /*= 0*/, uint32 vehId /*= 0*/) { uint32 mask = UNIT_MASK_SUMMON; if (properties) @@ -2305,14 +2305,14 @@ TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropert * @param list List to store pointers to summoned creatures. */ -void Map::SummonCreatureGroup(uint8 group, std::list* list /*= NULL*/) +void Map::SummonCreatureGroup(uint8 group, std::list* list /*= nullptr*/) { std::vector const* data = sObjectMgr->GetSummonGroup(GetId(), SUMMONER_TYPE_MAP, group); if (!data) return; for (std::vector::const_iterator itr = data->begin(); itr != data->end(); ++itr) - if (TempSummon* summon = SummonCreature(itr->entry, itr->pos, NULL, itr->time)) + if (TempSummon* summon = SummonCreature(itr->entry, itr->pos, nullptr, itr->time)) if (list) list->push_back(summon); } @@ -2437,7 +2437,7 @@ Creature* WorldObject::SummonTrigger(float x, float y, float z, float ang, uint3 * @param group Id of group to summon. * @param list List to store pointers to summoned creatures. */ -void WorldObject::SummonCreatureGroup(uint8 group, std::list* list /*= NULL*/) +void WorldObject::SummonCreatureGroup(uint8 group, std::list* list /*= nullptr*/) { ASSERT((GetTypeId() == TYPEID_GAMEOBJECT || GetTypeId() == TYPEID_UNIT) && "Only GOs and creatures can summon npc groups!"); @@ -2850,7 +2850,7 @@ void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update) UpdateObjectVisibility(); } -void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/) +void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= nullptr*/) { WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4 + 8); data << uint32(sound_id); @@ -2861,7 +2861,7 @@ void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/) SendMessageToSet(&data, true); } -void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/) +void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= nullptr*/) { WorldPacket data(SMSG_PLAY_SOUND, 4); data << uint32(sound_id); @@ -2871,7 +2871,7 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/) SendMessageToSet(&data, true); } -void WorldObject::PlayDirectMusic(uint32 music_id, Player* target /*= NULL*/) +void WorldObject::PlayDirectMusic(uint32 music_id, Player* target /*= nullptr*/) { WorldPacket data(SMSG_PLAY_MUSIC, 4); data << uint32(music_id); @@ -2997,7 +2997,7 @@ struct WorldObjectChangeAccumulator if (IS_PLAYER_GUID(guid)) { - //Caster may be NULL if DynObj is in removelist + //Caster may be nullptr if DynObj is in removelist if (Player* caster = ObjectAccessor::FindPlayer(guid)) if (caster->GetUInt64Value(PLAYER_FARSIGHT) == source->GetGUID()) BuildPacket(caster); diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index bdc76df25..37a4fe408 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1268,7 +1268,7 @@ void Pet::_LoadAuras(PreparedQueryResult result, uint32 timediff) int32 baseDamage[3]; Field* fields = result->Fetch(); uint64 caster_guid = fields[0].GetUInt64(); - // NULL guid stored - pet is the caster of the spell - see Pet::_SaveAuras + // nullptr guid stored - pet is the caster of the spell - see Pet::_SaveAuras if (!caster_guid) caster_guid = GetGUID(); uint32 spellid = fields[1].GetUInt32(); @@ -1319,7 +1319,7 @@ void Pet::_LoadAuras(PreparedQueryResult result, uint32 timediff) else remaincharges = 0; - if (Aura* aura = Aura::TryCreate(spellInfo, effmask, this, NULL, &baseDamage[0], NULL, caster_guid)) + if (Aura* aura = Aura::TryCreate(spellInfo, effmask, this, nullptr, &baseDamage[0], nullptr, caster_guid)) { if (!aura->CanBeSaved()) { @@ -1781,7 +1781,7 @@ bool Pet::resetTalents() return true; } -void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/) +void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= nullptr*/) { // not need after this call if (owner->ToPlayer()->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS)) @@ -2237,7 +2237,7 @@ void Pet::HandleAsynchLoadFailed(AsynchPetSummon* info, Player* player, uint8 as // we are almost at home... if (asynchLoadType == PET_LOAD_SUMMON_PET) { - Unit* caster = ObjectAccessor::GetObjectInMap(info->m_casterGUID, map, (Unit*)NULL); + Unit* caster = ObjectAccessor::GetObjectInMap(info->m_casterGUID, map, (Unit*)nullptr); if (!caster) caster = player; diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index 478931c70..a6db2c406 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -126,7 +126,7 @@ void Totem::UnSummon(uint32 msTime) player->SendAutoRepeatCancel(this); if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(GetUInt32Value(UNIT_CREATED_BY_SPELL))) - player->SendCooldownEvent(spell, 0, NULL, false); + player->SendCooldownEvent(spell, 0, nullptr, false); if (Group* group = player->GetGroup()) { diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index e39a3ed25..94590da3f 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -837,7 +837,7 @@ void StaticTransport::Update(uint32 diff) void StaticTransport::RelocateToProgress(uint32 progress) { - TransportAnimationEntry const* curr = NULL, *next = nullptr; + TransportAnimationEntry const* curr = nullptr, *next = nullptr; float percPos; if (m_goValue.Transport.AnimationInfo->GetAnimNode(progress, curr, next, percPos)) { diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 34932ff50..44291c3b9 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1224,9 +1224,9 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama if (CanApplyResilience()) { if (attackType != RANGED_ATTACK) - Unit::ApplyResilience(victim, NULL, &damage, crit, CR_CRIT_TAKEN_MELEE); + Unit::ApplyResilience(victim, nullptr, &damage, crit, CR_CRIT_TAKEN_MELEE); else - Unit::ApplyResilience(victim, NULL, &damage, crit, CR_CRIT_TAKEN_RANGED); + Unit::ApplyResilience(victim, nullptr, &damage, crit, CR_CRIT_TAKEN_RANGED); } break; } @@ -1242,7 +1242,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama } if (CanApplyResilience()) - Unit::ApplyResilience(victim, NULL, &damage, crit, CR_CRIT_TAKEN_SPELL); + Unit::ApplyResilience(victim, nullptr, &damage, crit, CR_CRIT_TAKEN_SPELL); break; } default: @@ -1354,7 +1354,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam // Calculate armor reduction if (IsDamageReducedByArmor((SpellSchoolMask)(damageInfo->damageSchoolMask))) { - damageInfo->damage = Unit::CalcArmorReducedDamage(this, damageInfo->target, damage, NULL, 0, damageInfo->attackType); + damageInfo->damage = Unit::CalcArmorReducedDamage(this, damageInfo->target, damage, nullptr, 0, damageInfo->attackType); damageInfo->cleanDamage += damage - damageInfo->damage; } else @@ -1473,7 +1473,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam // attackType is checked already for BASE_ATTACK or OFF_ATTACK so it can't be RANGED_ATTACK here if (CanApplyResilience()) - Unit::ApplyResilience(victim, NULL, &resilienceReduction, (damageInfo->hitOutCome == MELEE_HIT_CRIT), CR_CRIT_TAKEN_MELEE); + Unit::ApplyResilience(victim, nullptr, &resilienceReduction, (damageInfo->hitOutCome == MELEE_HIT_CRIT), CR_CRIT_TAKEN_MELEE); resilienceReduction = damageInfo->damage - resilienceReduction; damageInfo->damage -= resilienceReduction; @@ -1548,7 +1548,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) // Call default DealDamage CleanDamage cleanDamage(damageInfo->cleanDamage, damageInfo->absorb, damageInfo->attackType, damageInfo->hitOutCome); - Unit::DealDamage(this, victim, damageInfo->damage, &cleanDamage, DIRECT_DAMAGE, SpellSchoolMask(damageInfo->damageSchoolMask), NULL, durabilityLoss); + Unit::DealDamage(this, victim, damageInfo->damage, &cleanDamage, DIRECT_DAMAGE, SpellSchoolMask(damageInfo->damageSchoolMask), nullptr, durabilityLoss); // If this is a creature and it attacks from behind it has a probability to daze it's victim if (damageInfo->damage && ((damageInfo->hitOutCome == MELEE_HIT_CRIT || damageInfo->hitOutCome == MELEE_HIT_CRUSHING || damageInfo->hitOutCome == MELEE_HIT_NORMAL || damageInfo->hitOutCome == MELEE_HIT_GLANCING) && @@ -3214,9 +3214,9 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit* victi // reduce crit chance from Rating for players if (attackType != RANGED_ATTACK) - Unit::ApplyResilience(victim, &crit, NULL, false, CR_CRIT_TAKEN_MELEE); + Unit::ApplyResilience(victim, &crit, nullptr, false, CR_CRIT_TAKEN_MELEE); else - Unit::ApplyResilience(victim, &crit, NULL, false, CR_CRIT_TAKEN_RANGED); + Unit::ApplyResilience(victim, &crit, nullptr, false, CR_CRIT_TAKEN_RANGED); // Apply crit chance from defence skill crit += (int32(GetMaxSkillValueForLevel(victim)) - int32(victim->GetDefenseSkillValue(this))) * 0.04f; @@ -3398,7 +3398,7 @@ void Unit::_UpdateAutoRepeatSpell() void Unit::SetCurrentCastedSpell(Spell* pSpell) { - ASSERT(pSpell); // NULL may be never passed here, use InterruptSpell or InterruptNonMeleeSpells + ASSERT(pSpell); // nullptr may be never passed here, use InterruptSpell or InterruptNonMeleeSpells CurrentSpellTypes CSpellType = pSpell->GetCurrentContainer(); @@ -3936,7 +3936,7 @@ void Unit::DeMorph() SetDisplayId(GetNativeDisplayId()); } -Aura* Unit::_TryStackingOrRefreshingExistingAura(SpellInfo const* newAura, uint8 effMask, Unit* caster, int32* baseAmount /*= NULL*/, Item* castItem /*= NULL*/, uint64 casterGUID /*= 0*/, bool periodicReset /*= false*/) +Aura* Unit::_TryStackingOrRefreshingExistingAura(SpellInfo const* newAura, uint8 effMask, Unit* caster, int32* baseAmount /*= nullptr*/, Item* castItem /*= nullptr*/, uint64 casterGUID /*= 0*/, bool periodicReset /*= false*/) { ASSERT(casterGUID || caster); if (!casterGUID) @@ -4570,7 +4570,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit* // Xinef: if stealer has same aura Aura* curAura = stealer->GetAura(aura->GetId()); if (!curAura || (!curAura->IsPermanent() && curAura->GetDuration() < (int32)dur)) - if (Aura* newAura = Aura::TryRefreshStackOrCreate(aura->GetSpellInfo(), effMask, stealer, NULL, &baseDamage[0], NULL, aura->GetCasterGUID())) + if (Aura* newAura = Aura::TryRefreshStackOrCreate(aura->GetSpellInfo(), effMask, stealer, nullptr, &baseDamage[0], nullptr, aura->GetCasterGUID())) { // created aura must not be single target aura,, so stealer won't loose it on recast if (newAura->IsSingleTarget()) @@ -5657,7 +5657,7 @@ void Unit::AddGameObject(GameObject* gameObj) // Need disable spell use for owner if (createBySpell && createBySpell->IsCooldownStartedOnEvent()) // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases) - ToPlayer()->AddSpellAndCategoryCooldowns(createBySpell, 0, NULL, true); + ToPlayer()->AddSpellAndCategoryCooldowns(createBySpell, 0, nullptr, true); } } @@ -5972,7 +5972,7 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit* target, uint8 /*SwingType SendAttackStateUpdate(&dmgInfo); } -//victim may be NULL +//victim may be nullptr bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggeredByAura, SpellInfo const* procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown) { SpellInfo const* dummySpell = triggeredByAura->GetSpellInfo(); @@ -6726,7 +6726,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere int32 total = CalculatePct(int32(damage), triggerAmount); int32 team = total / 5; int32 self = total - team; - CastCustomSpell(this, 15290, &team, &self, NULL, true, castItem, triggeredByAura); + CastCustomSpell(this, 15290, &team, &self, nullptr, true, castItem, triggeredByAura); return true; // no hidden cooldown } // Priest Tier 6 Trinket (Ashtongue Talisman of Acumen) @@ -7404,7 +7404,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (!victim || !victim->IsAlive()) return false; - CastSpell(this, 71432, true, NULL, triggeredByAura); + CastSpell(this, 71432, true, nullptr, triggeredByAura); Aura const* dummy = GetAura(71432); if (!dummy || dummy->GetStackAmount() < (dummySpell->Id == 71406 ? 8 : 7)) @@ -8104,7 +8104,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere continue; basepoints0 = int32(CalculateSpellDamage(this, procSpell, i) * 0.4f); - CastCustomSpell(this, triggered_spell_id, &basepoints0, nullptr, nullptr, true, NULL, triggeredByAura); + CastCustomSpell(this, triggered_spell_id, &basepoints0, nullptr, nullptr, true, nullptr, triggeredByAura); } return true; } @@ -8266,7 +8266,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp return false; int32 bp0 = int32(CalculatePct(GetMaxPower(POWER_MANA), spInfo->Effects[0].CalcValue())); - CastCustomSpell(this, 67545, &bp0, nullptr, nullptr, true, NULL, triggeredByAura->GetEffect(EFFECT_0), GetGUID()); + CastCustomSpell(this, 67545, &bp0, nullptr, nullptr, true, nullptr, triggeredByAura->GetEffect(EFFECT_0), GetGUID()); return true; } } @@ -8707,14 +8707,14 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg ToPlayer()->AddSpellCooldown(stack_spell_id, 0, cooldown); } - CastSpell(this, stack_spell_id, true, NULL, triggeredByAura); + CastSpell(this, stack_spell_id, true, nullptr, triggeredByAura); Aura* dummy = GetAura(stack_spell_id); if (!dummy || dummy->GetStackAmount() < triggerAmount) return false; RemoveAurasDueToSpell(stack_spell_id); - CastSpell(victim, trigger_spell_id, true, NULL, triggeredByAura); + CastSpell(victim, trigger_spell_id, true, nullptr, triggeredByAura); return true; } default: @@ -9158,7 +9158,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg if (AuraEffect* aurEff = owner->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 3220, 0)) { basepoints0 = int32((aurEff->GetAmount() * owner->SpellBaseDamageBonusDone(SpellSchoolMask(SPELL_SCHOOL_MASK_MAGIC)) + 100.0f) / 100.0f); // TODO: Is it right? - CastCustomSpell(this, trigger_spell_id, &basepoints0, &basepoints0, NULL, true, castItem, triggeredByAura); + CastCustomSpell(this, trigger_spell_id, &basepoints0, &basepoints0, nullptr, true, castItem, triggeredByAura); return true; } } @@ -9316,7 +9316,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg } if(basepoints0) - CastCustomSpell(target, triggerEntry->Id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); + CastCustomSpell(target, triggerEntry->Id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura); else CastSpell(target, triggerEntry->Id, true, castItem, triggeredByAura); @@ -10170,7 +10170,7 @@ void Unit::SetMinion(Minion* minion, bool apply) SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(minion->GetUInt32Value(UNIT_CREATED_BY_SPELL)); if (spellInfo && spellInfo->IsCooldownStartedOnEvent()) - ToPlayer()->AddSpellAndCategoryCooldowns(spellInfo, 0, NULL, true); + ToPlayer()->AddSpellAndCategoryCooldowns(spellInfo, 0, nullptr, true); } } else @@ -11417,7 +11417,7 @@ float Unit::SpellTakenCritChance(Unit const* caster, SpellInfo const* spellProto crit_chance += GetMaxPositiveAuraModifierByMiscMask(SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE, schoolMask); } - Unit::ApplyResilience(this, &crit_chance, NULL, false, CR_CRIT_TAKEN_SPELL); + Unit::ApplyResilience(this, &crit_chance, nullptr, false, CR_CRIT_TAKEN_SPELL); } // scripted (increase crit chance ... against ... target by x% if (caster) @@ -11560,10 +11560,10 @@ float Unit::SpellTakenCritChance(Unit const* caster, SpellInfo const* spellProto if (attackType != RANGED_ATTACK) { // xinef: little hack, crit chance dont require caster to calculate, pass victim - Unit::ApplyResilience(this, &crit_chance, NULL, false, CR_CRIT_TAKEN_MELEE); + Unit::ApplyResilience(this, &crit_chance, nullptr, false, CR_CRIT_TAKEN_MELEE); } else - Unit::ApplyResilience(this, &crit_chance, NULL, false, CR_CRIT_TAKEN_RANGED); + Unit::ApplyResilience(this, &crit_chance, nullptr, false, CR_CRIT_TAKEN_RANGED); // Apply crit chance from defence skill if (caster) @@ -15465,7 +15465,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u DamageInfo damageInfo = DamageInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL, SPELL_DIRECT_DAMAGE); HealInfo healInfo = HealInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL); - ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, NULL, &damageInfo, &healInfo, procAura); + ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, nullptr, &damageInfo, &healInfo, procAura); ProcTriggeredList procTriggered; // Fill procTriggered list @@ -15522,7 +15522,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u // Skip this auras if (isNonTriggerAura[aurEff->GetAuraType()]) continue; - // If not trigger by default and spellProcEvent == NULL - skip + // If not trigger by default and spellProcEvent == nullptr - skip if (!isTriggerAura[aurEff->GetAuraType()] && triggerData.spellProcEvent == nullptr) continue; // Some spells must always trigger @@ -15808,7 +15808,7 @@ void Unit::GetProcAurasTriggeredOnEvent(std::list& aurasTrigge void Unit::TriggerAurasProcOnEvent(CalcDamageInfo& damageInfo) { DamageInfo dmgInfo = DamageInfo(damageInfo); - TriggerAurasProcOnEvent(nullptr, NULL, damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, 0, 0, damageInfo.procEx, NULL, &dmgInfo, nullptr); + TriggerAurasProcOnEvent(nullptr, nullptr, damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, 0, 0, damageInfo.procEx, nullptr, &dmgInfo, nullptr); } void Unit::TriggerAurasProcOnEvent(std::list* myProcAuras, std::list* targetProcAuras, Unit* actionTarget, uint32 typeMaskActor, uint32 typeMaskActionTarget, uint32 spellTypeMask, uint32 spellPhaseMask, uint32 hitMask, Spell* spell, DamageInfo* damageInfo, HealInfo* healInfo) @@ -16706,7 +16706,7 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura) if (Unit* target = nearMembers.front()) { CastSpell(target, 41637 /*Dummy visual effect triggered by main spell cast*/, true); - CastCustomSpell(target, spellProto->Id, &heal, nullptr, nullptr, true, NULL, triggeredByAura, caster_guid); + CastCustomSpell(target, spellProto->Id, &heal, nullptr, nullptr, true, nullptr, triggeredByAura, caster_guid); if (Aura* aura = target->GetAura(spellProto->Id, caster->GetGUID())) aura->SetCharges(jumps); } @@ -16758,14 +16758,14 @@ bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura) float radius = triggeredByAura->GetSpellInfo()->Effects[triggeredByAura->GetEffIndex()].CalcRadius(caster); if (Unit* target = GetNextRandomRaidMemberOrPet(radius)) { - CastSpell(target, spellProto, true, NULL, triggeredByAura, caster_guid); + CastSpell(target, spellProto, true, nullptr, triggeredByAura, caster_guid); if (Aura* aura = target->GetAura(spellProto->Id, caster->GetGUID())) aura->SetCharges(jumps); } } } - CastSpell(this, damageSpellId, true, NULL, triggeredByAura, caster_guid); + CastSpell(this, damageSpellId, true, nullptr, triggeredByAura, caster_guid); return true; } @@ -16938,7 +16938,7 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp victim->SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId); // FORM_SPIRITOFREDEMPTION and related auras - victim->CastSpell(victim, 27827, true, NULL, aurEff); + victim->CastSpell(victim, 27827, true, nullptr, aurEff); spiritOfRedemption = true; } } @@ -17336,7 +17336,7 @@ void Unit::SetFeared(bool apply) caster = ObjectAccessor::GetUnit(*this, fearAuras.front()->GetCasterGUID()); if (!caster) caster = getAttackerForHelper(); - GetMotionMaster()->MoveFleeing(caster, fearAuras.empty() ? sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY) : 0); // caster == NULL processed in MoveFleeing + GetMotionMaster()->MoveFleeing(caster, fearAuras.empty() ? sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY) : 0); // caster == nullptr processed in MoveFleeing } else { @@ -18599,7 +18599,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId) bp0[j] = spellEntry->Effects[j].BasePoints; bp0[i] = seatId; - Aura::TryRefreshStackOrCreate(spellEntry, MAX_EFFECT_MASK, this, clicker, bp0, NULL, origCasterGUID); + Aura::TryRefreshStackOrCreate(spellEntry, MAX_EFFECT_MASK, this, clicker, bp0, nullptr, origCasterGUID); } } else diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 5d1eac46e..b542cf301 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1274,11 +1274,11 @@ struct AttackPosition { { if (!val) { - // _pos = NULL; + // _pos = nullptr; _taken = false; - return 0; // NULL + return 0; // nullptr } - return 0; // NULL + return 0; // nullptr }; Position _pos; bool _taken; diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index b837f08c1..16b089cc4 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -65,7 +65,7 @@ private: void InitMovementInfoForBase(); /// This method transforms supplied transport offsets into global coordinates - void CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= NULL*/) const override + void CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= nullptr*/) const override { TransportBase::CalculatePassengerPosition(x, y, z, o, GetBase()->GetPositionX(), GetBase()->GetPositionY(), @@ -73,7 +73,7 @@ private: } /// This method transforms supplied global coordinates into local offsets - void CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= NULL*/) const override + void CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= nullptr*/) const override { TransportBase::CalculatePassengerOffset(x, y, z, o, GetBase()->GetPositionX(), GetBase()->GetPositionY(), diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 44bb3a9f8..7dead1f7e 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1361,7 +1361,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) { sObjectMgr->RemoveCreatureFromGrid(*itr, data); - if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)nullptr)) creature->AddObjectToRemoveList(); } } @@ -1383,7 +1383,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) { sObjectMgr->RemoveGameobjectFromGrid(*itr, data); - if (GameObject* pGameobject = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL)) + if (GameObject* pGameobject = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)nullptr)) pGameobject->AddObjectToRemoveList(); } } @@ -1409,7 +1409,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) continue; // Update if spawned - Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT), (Creature*)NULL); + Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT), (Creature*)nullptr); if (creature) { if (activate) diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index f2db6aa2e..5b01ed923 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -110,12 +110,12 @@ Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const& p, uint64 guid, u Corpse* ObjectAccessor::GetCorpse(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (Corpse*)NULL); + return GetObjectInMap(guid, u.GetMap(), (Corpse*)nullptr); } GameObject* ObjectAccessor::GetGameObject(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (GameObject*)NULL); + return GetObjectInMap(guid, u.GetMap(), (GameObject*)nullptr); } Transport* ObjectAccessor::GetTransport(WorldObject const& u, uint64 guid) @@ -129,27 +129,27 @@ Transport* ObjectAccessor::GetTransport(WorldObject const& u, uint64 guid) DynamicObject* ObjectAccessor::GetDynamicObject(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (DynamicObject*)NULL); + return GetObjectInMap(guid, u.GetMap(), (DynamicObject*)nullptr); } Unit* ObjectAccessor::GetUnit(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (Unit*)NULL); + return GetObjectInMap(guid, u.GetMap(), (Unit*)nullptr); } Creature* ObjectAccessor::GetCreature(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (Creature*)NULL); + return GetObjectInMap(guid, u.GetMap(), (Creature*)nullptr); } Pet* ObjectAccessor::GetPet(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (Pet*)NULL); + return GetObjectInMap(guid, u.GetMap(), (Pet*)nullptr); } Player* ObjectAccessor::GetPlayer(WorldObject const& u, uint64 guid) { - return GetObjectInMap(guid, u.GetMap(), (Player*)NULL); + return GetObjectInMap(guid, u.GetMap(), (Player*)nullptr); } Creature* ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const& u, uint64 guid) @@ -165,22 +165,22 @@ Creature* ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const& u, uint64 Pet* ObjectAccessor::FindPet(uint64 guid) { - return GetObjectInWorld(guid, (Pet*)NULL); + return GetObjectInWorld(guid, (Pet*)nullptr); } Player* ObjectAccessor::FindPlayer(uint64 guid) { - return GetObjectInWorld(guid, (Player*)NULL); + return GetObjectInWorld(guid, (Player*)nullptr); } Player* ObjectAccessor::FindPlayerInOrOutOfWorld(uint64 guid) { - return GetObjectInOrOutOfWorld(guid, (Player*)NULL); + return GetObjectInOrOutOfWorld(guid, (Player*)nullptr); } Unit* ObjectAccessor::FindUnit(uint64 guid) { - return GetObjectInWorld(guid, (Unit*)NULL); + return GetObjectInWorld(guid, (Unit*)nullptr); } Player* ObjectAccessor::FindConnectedPlayer(uint64 const& guid) @@ -334,7 +334,7 @@ Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia sLog->outStaticDebug("Deleting Corpse and spawned bones."); #endif - // Map can be NULL + // Map can be nullptr Map* map = corpse->FindMap(); bool inWorld = corpse->IsInWorld(); @@ -419,7 +419,7 @@ void ObjectAccessor::RemoveOldCorpses() next2 = itr; ++next2; - Corpse* c = GetObjectInWorld((*itr), (Corpse*)NULL); + Corpse* c = GetObjectInWorld((*itr), (Corpse*)nullptr); if (c) { if (!c->IsExpired(now)) diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 31ea86f00..4056d5711 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -134,7 +134,7 @@ public: template static T* GetObjectInMap(uint64 guid, Map* map, T* /*typeSpecifier*/) { ASSERT(map); - if (T* obj = GetObjectInWorld(guid, (T*)NULL)) + if (T* obj = GetObjectInWorld(guid, (T*)nullptr)) if (obj->GetMap() == map) return obj; return nullptr; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 697b6dced..f319935f4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1278,7 +1278,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId) return nullptr; } -uint32 ObjectMgr::ChooseDisplayId(CreatureTemplate const* cinfo, CreatureData const* data /*= NULL*/) +uint32 ObjectMgr::ChooseDisplayId(CreatureTemplate const* cinfo, CreatureData const* data /*= nullptr*/) { // Load creature model (display id) if (data && data->displayid) @@ -1287,7 +1287,7 @@ uint32 ObjectMgr::ChooseDisplayId(CreatureTemplate const* cinfo, CreatureData co return cinfo->GetRandomValidModelId(); } -void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data /*= NULL*/) +void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data /*= nullptr*/) { npcflag = cinfo->npcflag; unit_flags = cinfo->unit_flags; @@ -8042,7 +8042,7 @@ GameTele const* ObjectMgr::GetGameTele(const std::string& name) const { if (itr->second.wnameLow == wname) return &itr->second; - else if (alt == NULL && itr->second.wnameLow.find(wname) != std::wstring::npos) + else if (alt == nullptr && itr->second.wnameLow.find(wname) != std::wstring::npos) alt = &itr->second; } @@ -8314,7 +8314,7 @@ int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set* s uint32 incrtime = fields[2].GetUInt32(); uint32 ExtendedCost = fields[3].GetUInt32(); - if (!IsVendorItemValid(vendor, item_id, maxcount, incrtime, ExtendedCost, NULL, skip_vendors)) + if (!IsVendorItemValid(vendor, item_id, maxcount, incrtime, ExtendedCost, nullptr, skip_vendors)) continue; VendorItemData& vList = _cacheVendorItemStore[vendor]; @@ -8364,7 +8364,7 @@ void ObjectMgr::LoadVendors() uint32 incrtime = fields[3].GetUInt32(); uint32 ExtendedCost = fields[4].GetUInt32(); - if (!IsVendorItemValid(entry, item_id, maxcount, incrtime, ExtendedCost, NULL, &skip_vendors)) + if (!IsVendorItemValid(entry, item_id, maxcount, incrtime, ExtendedCost, nullptr, &skip_vendors)) continue; VendorItemData& vList = _cacheVendorItemStore[entry]; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 1fe48f5e7..ce029f3b1 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -497,7 +497,7 @@ bool Group::AddMember(Player* player) return true; } -bool Group::RemoveMember(uint64 guid, const RemoveMethod& method /*= GROUP_REMOVEMETHOD_DEFAULT*/, uint64 kicker /*= 0*/, const char* reason /*= NULL*/) +bool Group::RemoveMember(uint64 guid, const RemoveMethod& method /*= GROUP_REMOVEMETHOD_DEFAULT*/, uint64 kicker /*= 0*/, const char* reason /*= nullptr*/) { BroadcastGroupUpdate(); @@ -1355,7 +1355,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) continue; player = ObjectAccessor::FindPlayer(itr->first); - if (!player || (allowedMap != NULL && player->FindMap() != allowedMap)) + if (!player || (allowedMap != nullptr && player->FindMap() != allowedMap)) { --roll->totalNeed; continue; @@ -1419,7 +1419,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) continue; player = ObjectAccessor::FindPlayer(itr->first); - if (!player || (allowedMap != NULL && player->FindMap() != allowedMap)) + if (!player || (allowedMap != nullptr && player->FindMap() != allowedMap)) { --roll->totalGreed; continue; diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 90a5bdf91..a9256ccd9 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -95,7 +95,7 @@ enum GroupUpdateFlags GROUP_UPDATE_FLAG_POSITION = 0x00000100, // uint16, uint16 GROUP_UPDATE_FLAG_AURAS = 0x00000200, // uint64 mask, for each bit set uint32 spellid + uint8 unk GROUP_UPDATE_FLAG_PET_GUID = 0x00000400, // uint64 pet guid - GROUP_UPDATE_FLAG_PET_NAME = 0x00000800, // pet name, NULL terminated string + GROUP_UPDATE_FLAG_PET_NAME = 0x00000800, // pet name, nullptr terminated string GROUP_UPDATE_FLAG_PET_MODEL_ID = 0x00001000, // uint16, model id GROUP_UPDATE_FLAG_PET_CUR_HP = 0x00002000, // uint32 pet cur health GROUP_UPDATE_FLAG_PET_MAX_HP = 0x00004000, // uint32 pet max health diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index a1a15e340..6d133a8c9 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -531,7 +531,7 @@ void Guild::BankTab::SetText(std::string const& text) } // Sets/removes contents of specified slot. -// If pItem == NULL contents are removed. +// If pItem == nullptr contents are removed. bool Guild::BankTab::SetItem(SQLTransaction& trans, uint8 slotId, Item* item) { if (slotId >= GUILD_BANK_MAX_SLOTS) @@ -2155,7 +2155,7 @@ void Guild::BroadcastToGuild(WorldSession* session, bool officerOnly, std::strin if (session && session->GetPlayer() && _HasRankRight(session->GetPlayer(), officerOnly ? GR_RIGHT_OFFCHATSPEAK : GR_RIGHT_GCHATSPEAK)) { WorldPacket data; - ChatHandler::BuildChatPacket(data, officerOnly ? CHAT_MSG_OFFICER : CHAT_MSG_GUILD, Language(language), session->GetPlayer(), NULL, msg); + ChatHandler::BuildChatPacket(data, officerOnly ? CHAT_MSG_OFFICER : CHAT_MSG_GUILD, Language(language), session->GetPlayer(), nullptr, msg); for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) if (Player* player = itr->second->FindPlayer()) if (_HasRankRight(player, officerOnly ? GR_RIGHT_OFFCHATLISTEN : GR_RIGHT_GCHATLISTEN) && !player->GetSocial()->HasIgnore(session->GetPlayer()->GetGUIDLow())) @@ -2873,7 +2873,7 @@ void Guild::_BroadcastEvent(GuildEvents guildEvent, uint64 guid, const char* par #endif } -void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/, bool sendAllSlots /*= false*/, SlotIds* slots /*= NULL*/) const +void Guild::_SendBankList(WorldSession* session /* = nullptr*/, uint8 tabId /*= 0*/, bool sendAllSlots /*= false*/, SlotIds* slots /*= nullptr*/) const { WorldPacket data(SMSG_GUILD_BANK_LIST, 500); data << uint64(m_bankMoney); diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 51ebeb1a7..56c5b0a94 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -330,7 +330,7 @@ public: // pussywizard: public class Member int32 GetBankWithdrawValue(uint8 tabId) const; void ResetValues(); - inline Player* FindPlayer() const { return ObjectAccessor::GetObjectInOrOutOfWorld(m_guid, (Player*)NULL); } + inline Player* FindPlayer() const { return ObjectAccessor::GetObjectInOrOutOfWorld(m_guid, (Player*)nullptr); } private: uint32 m_guildId; @@ -841,8 +841,8 @@ private: void _SendBankMoneyUpdate(WorldSession* session) const; void _SendBankContentUpdate(MoveItemData* pSrc, MoveItemData* pDest) const; void _SendBankContentUpdate(uint8 tabId, SlotIds slots) const; - void _SendBankList(WorldSession* session = NULL, uint8 tabId = 0, bool sendFullSlots = false, SlotIds* slots = nullptr) const; + void _SendBankList(WorldSession* session = nullptr, uint8 tabId = 0, bool sendFullSlots = false, SlotIds* slots = nullptr) const; - void _BroadcastEvent(GuildEvents guildEvent, uint64 guid, const char* param1 = NULL, const char* param2 = NULL, const char* param3 = nullptr) const; + void _BroadcastEvent(GuildEvents guildEvent, uint64 guid, const char* param1 = nullptr, const char* param2 = nullptr, const char* param3 = nullptr) const; }; #endif diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 3c24da0bf..4ef4fae1d 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -564,7 +564,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData) { SendAuctionCommandResult(0, AUCTION_CANCEL, ERR_AUCTION_DATABASE_ERROR); //this code isn't possible ... maybe there should be assert - sLog->outError("CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is NULL", player->GetGUIDLow(), auctionId); + sLog->outError("CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is nullptr", player->GetGUIDLow(), auctionId); return; } diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 92b27f0c2..c89732e76 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -171,7 +171,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData) } BattlegroundQueue& bgQueue = sBattlegroundMgr->GetBattlegroundQueue(bgQueueTypeId); - GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, NULL, bracketEntry, false, false, 0, 0, 0); + GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, nullptr, bracketEntry, false, false, 0, 0, 0); uint32 avgWaitTime = bgQueue.GetAverageQueueWaitTime(ginfo); uint32 queueSlot = _player->AddBattlegroundQueueId(bgQueueTypeId); @@ -675,7 +675,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData) } BattlegroundQueue& bgQueue = sBattlegroundMgr->GetBattlegroundQueue(bgQueueTypeId); - GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, NULL, bracketEntry, false, false, 0, 0, 0); + GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, nullptr, bracketEntry, false, false, 0, 0, 0); uint32 avgWaitTime = bgQueue.GetAverageQueueWaitTime(ginfo); uint32 queueSlot = _player->AddBattlegroundQueueId(bgQueueTypeId); diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp index 8238ebac6..df7061ffe 100644 --- a/src/server/game/Handlers/ChannelHandler.cpp +++ b/src/server/game/Handlers/ChannelHandler.cpp @@ -340,7 +340,7 @@ void WorldSession::HandleSetChannelWatch(WorldPacket& recvPacket) return; if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId())) - if (Channel* channel = cMgr->GetChannel(channelName, NULL, false)) + if (Channel* channel = cMgr->GetChannel(channelName, nullptr, false)) channel->AddWatching(GetPlayer()); } @@ -353,6 +353,6 @@ void WorldSession::HandleClearChannelWatch(WorldPacket& recvPacket) return; if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId())) - if (Channel* channel = cMgr->GetChannel(channelName, NULL, false)) + if (Channel* channel = cMgr->GetChannel(channelName, nullptr, false)) channel->RemoveWatching(GetPlayer()); } diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 9926bf508..9d5f348ac 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -115,7 +115,7 @@ bool LoginQueryHolder::Initialize() stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MAILCOUNT_UNREAD); stmt->setUInt32(0, lowGuid); - stmt->setUInt64(1, uint64(time(NULL))); + stmt->setUInt64(1, uint64(time(nullptr))); res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_MAIL_UNREAD_COUNT, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MAILDATE); diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index da90d88a8..75bae166b 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -433,7 +433,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) return; #endif WorldPacket data; - ChatHandler::BuildChatPacket(data, ChatMsg(type), Language(lang), sender, NULL, msg); + ChatHandler::BuildChatPacket(data, ChatMsg(type), Language(lang), sender, nullptr, msg); group->BroadcastPacket(&data, false, group->GetMemberGroup(GetPlayer()->GetGUID())); } break; @@ -488,7 +488,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) return; #endif WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID, Language(lang), sender, NULL, msg); + ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID, Language(lang), sender, nullptr, msg); group->BroadcastPacket(&data, false); } break; @@ -509,7 +509,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) return; #endif WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_LEADER, Language(lang), sender, NULL, msg); + ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_LEADER, Language(lang), sender, nullptr, msg); group->BroadcastPacket(&data, false); } break; @@ -526,7 +526,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) #endif WorldPacket data; //in battleground, raid warning is sent only to players in battleground - code is ok - ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_WARNING, Language(lang), sender, NULL, msg); + ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_WARNING, Language(lang), sender, nullptr, msg); group->BroadcastPacket(&data, false); } break; @@ -543,7 +543,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) return; #endif WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND, Language(lang), sender, NULL, msg); + ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND, Language(lang), sender, nullptr, msg); group->BroadcastPacket(&data, false); } break; @@ -560,7 +560,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) return; #endif WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND_LEADER, Language(lang), sender, NULL, msg); + ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND_LEADER, Language(lang), sender, nullptr, msg); group->BroadcastPacket(&data, false); } break; diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 1bf4c377a..7b62f2c48 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -36,13 +36,13 @@ void WorldSession::HandleSplitItemOpcode(WorldPacket& recvData) if (!_player->IsValidPos(srcbag, srcslot, true)) { - _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } if (!_player->IsValidPos(dstbag, dstslot, false)) // can be autostore pos { - _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, nullptr, nullptr); return; } @@ -63,13 +63,13 @@ void WorldSession::HandleSwapInvItemOpcode(WorldPacket& recvData) if (!_player->IsValidPos(INVENTORY_SLOT_BAG_0, srcslot, true)) { - _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } if (!_player->IsValidPos(INVENTORY_SLOT_BAG_0, dstslot, true)) { - _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, nullptr, nullptr); return; } @@ -127,13 +127,13 @@ void WorldSession::HandleSwapItem(WorldPacket& recvData) if (!_player->IsValidPos(srcbag, srcslot, true)) { - _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } if (!_player->IsValidPos(dstbag, dstslot, true)) { - _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, nullptr, nullptr); return; } @@ -245,7 +245,7 @@ void WorldSession::HandleAutoEquipItemOpcode(WorldPacket& recvData) _player->AutoUnequipOffhandIfNeed(); // Xinef: Call this here after all needed items are equipped - _player->RemoveItemDependentAurasAndCasts((Item*)NULL); + _player->RemoveItemDependentAurasAndCasts((Item*)nullptr); } } @@ -273,13 +273,13 @@ void WorldSession::HandleDestroyItemOpcode(WorldPacket& recvData) Item* pItem = _player->GetItemByPos(bag, slot); if (!pItem) { - _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } if (pItem->GetTemplate()->Flags & ITEM_FLAG_NO_USER_DESTROY) { - _player->SendEquipError(EQUIP_ERR_CANT_DROP_SOULBOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_CANT_DROP_SOULBOUND, nullptr, nullptr); return; } @@ -621,7 +621,7 @@ void WorldSession::HandleReadItem(WorldPacket& recvData) SendPacket(&data); } else - _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); } void WorldSession::HandleSellItemOpcode(WorldPacket& recvData) @@ -643,7 +643,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket& recvData) #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSellItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); #endif - _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, nullptr, itemguid, 0); return; } @@ -768,7 +768,7 @@ void WorldSession::HandleBuybackItem(WorldPacket& recvData) #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBuybackItem - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); #endif - _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0); + _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, nullptr, 0, 0); return; } @@ -905,7 +905,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid, uint32 vendorEntry) #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendListInventory - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorGuid))); #endif - _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0); + _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, nullptr, 0, 0); return; } @@ -1011,7 +1011,7 @@ void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket& recvData) if (!_player->IsValidPos(dstbag, NULL_SLOT, false)) // can be autostore pos { - _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, nullptr, nullptr); return; } @@ -1200,7 +1200,7 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket& recvData) { if (!_player->IsAlive()) { - _player->SendEquipError(EQUIP_ERR_YOU_ARE_DEAD, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_YOU_ARE_DEAD, nullptr, nullptr); return; } @@ -1215,7 +1215,7 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket& recvData) { if (!_player->GetItemCount(item)) { - _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 2de3f6bf3..393a3f4ed 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -92,7 +92,7 @@ uint8 WorldSession::HandleLoadPetFromDBFirstCallback(PreparedQueryResult result, uint8 petSlot = fields[7].GetUInt8(); bool current = petSlot == PET_SAVE_AS_CURRENT; uint32 summon_spell_id = fields[15].GetUInt32(); - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(summon_spell_id); // CANT BE NULL + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(summon_spell_id); // CANT BE nullptr bool is_temporary_summoned = spellInfo && spellInfo->GetDuration() > 0; uint32 pet_number = fields[0].GetUInt32(); uint32 savedhealth = fields[10].GetUInt32(); @@ -293,7 +293,7 @@ void WorldSession::HandleLoadPetFromDBSecondCallback(LoadPetFromDBQueryHolder* h pet->_LoadAuras(holder->GetPreparedResult(PET_LOAD_QUERY_LOADAURAS), holder->GetDiffTime()); bool current = holder->GetCurrent(); uint32 summon_spell_id = pet->GetUInt32Value(UNIT_CREATED_BY_SPELL); - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(summon_spell_id); // CANT BE NULL + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(summon_spell_id); // CANT BE nullptr bool is_temporary_summoned = spellInfo && spellInfo->GetDuration() > 0; // load action bar, if data broken will fill later by default spells. @@ -835,7 +835,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid pet->SendPetAIReaction(guid1); } - pet->ToPet()->CastWhenWillAvailable(spellid, unit_target, NULL, tempspellIsPositive); + pet->ToPet()->CastWhenWillAvailable(spellid, unit_target, nullptr, tempspellIsPositive); } } else if (haspositiveeffect) diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 0e5fb9b60..d6641b07f 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -167,7 +167,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(charterid); if (!pProto) { - _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, NULL, charterid, 0); + _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, nullptr, charterid, 0); return; } diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index ec3cd8b40..7d7ea2b81 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -479,7 +479,7 @@ void WorldSession::HandleQuestConfirmAccept(WorldPacket& recvData) return; if (_player->CanAddQuest(quest, true)) - _player->AddQuestAndCheckCompletion(quest, nullptr); // NULL, this prevent DB script from duplicate running + _player->AddQuestAndCheckCompletion(quest, nullptr); // nullptr, this prevent DB script from duplicate running _player->SetDivider(0); } diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 4c0f56fac..00271b266 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -69,20 +69,20 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) if (glyphIndex >= MAX_GLYPH_SLOT_INDEX) { - pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } Item* pItem = pUser->GetUseableItemByPos(bagIndex, slot); if (!pItem) { - pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } if (pItem->GetGUID() != itemGUID) { - pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } @@ -177,7 +177,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) // xinef: additional check, client outputs message on its own if (!pUser->IsAlive()) { - pUser->SendEquipError(EQUIP_ERR_YOU_ARE_DEAD, NULL, nullptr); + pUser->SendEquipError(EQUIP_ERR_YOU_ARE_DEAD, nullptr, nullptr); return; } @@ -192,7 +192,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) Item* item = pUser->GetItemByPos(bagIndex, slot); if (!item) { - pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } @@ -437,7 +437,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) { SpellInfo const* actualSpellInfo = spellInfo->GetAuraRankForLevel(targets.GetUnitTarget()->getLevel()); - // if rank not found then function return NULL but in explicit cast case original spell can be casted and later failed with appropriate error message + // if rank not found then function return nullptr but in explicit cast case original spell can be casted and later failed with appropriate error message if (actualSpellInfo) spellInfo = actualSpellInfo; } @@ -620,7 +620,7 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPacket& recvData) recvData >> guid; // Get unit for which data is needed by client - Unit* unit = ObjectAccessor::GetObjectInWorld(guid, (Unit*)NULL); + Unit* unit = ObjectAccessor::GetObjectInWorld(guid, (Unit*)nullptr); if (!unit) return; diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 537e52ddd..cc6c5d9d2 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -133,8 +133,8 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) { ItemPosCountVec traderDst; ItemPosCountVec playerDst; - bool traderCanTrade = (myItems[i] == NULL || trader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, myItems[i], false) == EQUIP_ERR_OK); - bool playerCanTrade = (hisItems[i] == NULL || _player->CanStoreItem(NULL_BAG, NULL_SLOT, playerDst, hisItems[i], false) == EQUIP_ERR_OK); + bool traderCanTrade = (myItems[i] == nullptr || trader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, myItems[i], false) == EQUIP_ERR_OK); + bool playerCanTrade = (hisItems[i] == nullptr || _player->CanStoreItem(NULL_BAG, NULL_SLOT, playerDst, hisItems[i], false) == EQUIP_ERR_OK); if (traderCanTrade && playerCanTrade) { // Ok, if trade item exists and can be stored @@ -209,7 +209,7 @@ static void setAcceptTradeMode(TradeData* myTrade, TradeData* hisTrade, Item * * #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outStaticDebug("player trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot()); #endif - //Can return NULL + //Can return nullptr myItems[i] = item; myItems[i]->SetInTrade(); } @@ -280,14 +280,14 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) if (_player->GetMoney() >= uint32(MAX_MONEY_AMOUNT) - his_trade->GetMoney()) { - _player->SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD, NULL, nullptr); + _player->SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD, nullptr, nullptr); my_trade->SetAccepted(false, true); return; } if (trader->GetMoney() >= uint32(MAX_MONEY_AMOUNT) - my_trade->GetMoney()) { - trader->SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD, NULL, nullptr); + trader->SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD, nullptr, nullptr); his_trade->SetAccepted(false, true); return; } diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 08e34461a..70e8679de 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -459,7 +459,7 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator& itr) for (InstanceSave::PlayerListType::iterator iter = pList.begin(), iter2; iter != pList.end(); ) { iter2 = iter++; - PlayerUnbindInstanceNotExtended(*iter2, itr->second->GetMapId(), itr->second->GetDifficulty(), ObjectAccessor::GetObjectInOrOutOfWorld(MAKE_NEW_GUID(*iter2, 0, HIGHGUID_PLAYER), (Player*)NULL)); + PlayerUnbindInstanceNotExtended(*iter2, itr->second->GetMapId(), itr->second->GetDifficulty(), ObjectAccessor::GetObjectInOrOutOfWorld(MAKE_NEW_GUID(*iter2, 0, HIGHGUID_PLAYER), (Player*)nullptr)); } // delete stuff if no players left (noone extended id) @@ -576,7 +576,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b } } -InstancePlayerBind* InstanceSaveManager::PlayerBindToInstance(uint32 guidLow, InstanceSave* save, bool permanent, Player* player /*= NULL*/) +InstancePlayerBind* InstanceSaveManager::PlayerBindToInstance(uint32 guidLow, InstanceSave* save, bool permanent, Player* player /*= nullptr*/) { InstancePlayerBind& bind = playerBindStorage[guidLow]->m[save->GetDifficulty()][save->GetMapId()]; ASSERT(!bind.perm || permanent); // ensure there's no changing permanent to temporary, this can be done only by unbinding @@ -645,7 +645,7 @@ InstancePlayerBind* InstanceSaveManager::PlayerBindToInstance(uint32 guidLow, In return &bind; } -void InstanceSaveManager::PlayerUnbindInstance(uint32 guidLow, uint32 mapid, Difficulty difficulty, bool deleteFromDB, Player* player /*= NULL*/) +void InstanceSaveManager::PlayerUnbindInstance(uint32 guidLow, uint32 mapid, Difficulty difficulty, bool deleteFromDB, Player* player /*= nullptr*/) { BoundInstancesMapWrapper* w = playerBindStorage[guidLow]; BoundInstancesMap::iterator itr = w->m[difficulty].find(mapid); @@ -668,7 +668,7 @@ void InstanceSaveManager::PlayerUnbindInstance(uint32 guidLow, uint32 mapid, Dif } } -void InstanceSaveManager::PlayerUnbindInstanceNotExtended(uint32 guidLow, uint32 mapid, Difficulty difficulty, Player* player /*= NULL*/) +void InstanceSaveManager::PlayerUnbindInstanceNotExtended(uint32 guidLow, uint32 mapid, Difficulty difficulty, Player* player /*= nullptr*/) { BoundInstancesMapWrapper* w = playerBindStorage[guidLow]; BoundInstancesMap::iterator itr = w->m[difficulty].find(mapid); @@ -773,5 +773,5 @@ void InstanceSaveManager::UnbindAllFor(InstanceSave* save) { InstanceSave::PlayerListType& pList = save->m_playerList; while (!pList.empty()) - PlayerUnbindInstance(*(pList.begin()), save->GetMapId(), save->GetDifficulty(), true, ObjectAccessor::GetObjectInOrOutOfWorld(MAKE_NEW_GUID(*(pList.begin()), 0, HIGHGUID_PLAYER), (Player*)NULL)); + PlayerUnbindInstance(*(pList.begin()), save->GetMapId(), save->GetDifficulty(), true, ObjectAccessor::GetObjectInOrOutOfWorld(MAKE_NEW_GUID(*(pList.begin()), 0, HIGHGUID_PLAYER), (Player*)nullptr)); } diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index cf5b51720..270a1b632 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -329,7 +329,7 @@ void InstanceScript::DoSendNotifyToInstance(char const* format, ...) } // Update Achievement Criteria for all players in instance -void InstanceScript::DoUpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= NULL*/) +void InstanceScript::DoUpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= nullptr*/) { Map::PlayerList const& PlayerList = instance->GetPlayers(); @@ -390,7 +390,7 @@ void InstanceScript::DoCastSpellOnPlayers(uint32 spell) player->CastSpell(player, spell, true); } -bool InstanceScript::CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= NULL*/, uint32 /*miscvalue1*/ /*= 0*/) +bool InstanceScript::CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= nullptr*/, uint32 /*miscvalue1*/ /*= 0*/) { sLog->outError("Achievement system call InstanceScript::CheckAchievementCriteriaMeet but instance script for map %u not have implementation for achievement criteria %u", instance->GetId(), criteria_id); @@ -416,7 +416,7 @@ void InstanceScript::SetCompletedEncountersMask(uint32 newMask, bool save) } } -void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8 param1 /*= 0*/, uint8 param2 /*= 0*/) +void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= nullptr*/, uint8 param1 /*= 0*/, uint8 param2 /*= 0*/) { // size of this packet is at most 15 (usually less) WorldPacket data(SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT, 15); diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 6f4117d1f..a5617bb53 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -193,7 +193,7 @@ public: // Achievement criteria additional requirements check // NOTE: not use this if same can be checked existed requirement types from AchievementCriteriaRequirementType - virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0); + virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = nullptr, uint32 /*miscvalue1*/ = 0); // Checks boss requirements (one boss required to kill other) virtual bool CheckRequiredBosses(uint32 /*bossId*/, Player const* /*player*/ = nullptr) const { return true; } @@ -203,7 +203,7 @@ public: // Returns completed encounters mask for packets uint32 GetCompletedEncounterMask() const { return completedEncounters; } - void SendEncounterUnit(uint32 type, Unit* unit = NULL, uint8 param1 = 0, uint8 param2 = 0); + void SendEncounterUnit(uint32 type, Unit* unit = nullptr, uint8 param1 = 0, uint8 param2 = 0); virtual void FillInitialWorldStates(WorldPacket& /*data*/) {} diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index e1005aa59..7b0c0be66 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -98,7 +98,7 @@ private: LootStoreItemList ExplicitlyChanced; // Entries with chances defined in DB LootStoreItemList EqualChanced; // Zero chances - every entry takes the same chance - LootStoreItem const* Roll(Loot& loot, Player const* player, LootStore const& store, uint16 lootMode) const; // Rolls an item from the group, returns NULL if all miss their chances + LootStoreItem const* Roll(Loot& loot, Player const* player, LootStore const& store, uint16 lootMode) const; // Rolls an item from the group, returns nullptr if all miss their chances // This class must never be copied - storing pointers LootGroup(LootGroup const&); @@ -1119,7 +1119,7 @@ void LootTemplate::LootGroup::AddEntry(LootStoreItem* item) EqualChanced.push_back(item); } -// Rolls an item from the group, returns NULL if all miss their chances +// Rolls an item from the group, returns nullptr if all miss their chances LootStoreItem const* LootTemplate::LootGroup::Roll(Loot& loot, Player const* player, LootStore const& store, uint16 lootMode) const { LootStoreItemList possibleLoot = ExplicitlyChanced; diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index b7ec360f7..e1f967ed9 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -177,7 +177,7 @@ void MailDraft::SendMailTo(SQLTransaction& trans, MailReceiver const& receiver, if (!sendMail) // can be changed in the hook return; - Player* pReceiver = receiver.GetPlayer(); // can be NULL + Player* pReceiver = receiver.GetPlayer(); // can be nullptr Player* pSender = ObjectAccessor::FindPlayerInOrOutOfWorld(MAKE_NEW_GUID(sender.GetSenderId(), 0, HIGHGUID_PLAYER)); if (pReceiver) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index e1aa1edab..4f2345a21 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -185,11 +185,11 @@ void Map::LoadMap(int gx, int gy, bool reload) sScriptMgr->OnUnloadGridMap(this, GridMaps[gx][gy], gx, gy); delete (GridMaps[gx][gy]); - GridMaps[gx][gy] = NULL; + GridMaps[gx][gy] = nullptr; } // map file name - char* tmp = NULL; + char* tmp = nullptr; int len = sWorld->GetDataPath().length() + strlen("maps/%03u%02u%02u.map") + 1; tmp = new char[len]; snprintf(tmp, len, (char*)(sWorld->GetDataPath() + "maps/%03u%02u%02u.map").c_str(), GetId(), gx, gy); @@ -229,7 +229,7 @@ Map::Map(uint32 id, uint32 InstanceId, uint8 SpawnMode, Map* _parent) : for (unsigned int j = 0; j < MAX_NUMBER_OF_GRIDS; ++j) { //z code - GridMaps[idx][j] = NULL; + GridMaps[idx][j] = nullptr; setNGrid(nullptr, idx, j); } } @@ -1909,7 +1909,7 @@ GridMap* Map::GetGrid(float x, float y) return GridMaps[gx][gy]; } -float Map::GetWaterOrGroundLevel(uint32 phasemask, float x, float y, float z, float* ground /*= NULL*/, bool /*swim = false*/, float collisionHeight) const +float Map::GetWaterOrGroundLevel(uint32 phasemask, float x, float y, float z, float* ground /*= nullptr*/, bool /*swim = false*/, float collisionHeight) const { if (const_cast(this)->GetGrid(x, y)) { @@ -3056,17 +3056,17 @@ void BattlegroundMap::RemoveAllPlayers() Player* Map::GetPlayer(uint64 guid) { - return ObjectAccessor::GetObjectInMap(guid, this, (Player*)NULL); + return ObjectAccessor::GetObjectInMap(guid, this, (Player*)nullptr); } Creature* Map::GetCreature(uint64 guid) { - return ObjectAccessor::GetObjectInMap(guid, this, (Creature*)NULL); + return ObjectAccessor::GetObjectInMap(guid, this, (Creature*)nullptr); } GameObject* Map::GetGameObject(uint64 guid) { - return ObjectAccessor::GetObjectInMap(guid, this, (GameObject*)NULL); + return ObjectAccessor::GetObjectInMap(guid, this, (GameObject*)nullptr); } Transport* Map::GetTransport(uint64 guid) @@ -3080,17 +3080,17 @@ Transport* Map::GetTransport(uint64 guid) DynamicObject* Map::GetDynamicObject(uint64 guid) { - return ObjectAccessor::GetObjectInMap(guid, this, (DynamicObject*)NULL); + return ObjectAccessor::GetObjectInMap(guid, this, (DynamicObject*)nullptr); } Pet* Map::GetPet(uint64 guid) { - return ObjectAccessor::GetObjectInMap(guid, this, (Pet*)NULL); + return ObjectAccessor::GetObjectInMap(guid, this, (Pet*)nullptr); } Corpse* Map::GetCorpse(uint64 guid) { - return ObjectAccessor::GetObjectInMap(guid, this, (Corpse*)NULL); + return ObjectAccessor::GetObjectInMap(guid, this, (Corpse*)nullptr); } void Map::UpdateIteratorBack(Player* player) diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index a793e1ea0..ca4ffd695 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -165,7 +165,7 @@ Map* MapInstanced::CreateInstanceForPlayer(const uint32 mapId, Player* player) uint32 newInstanceId = sMapMgr->GenerateInstanceId(); ASSERT(!FindInstanceMap(newInstanceId)); // pussywizard: instance with new id can't exist Difficulty diff = player->GetGroup() ? player->GetGroup()->GetDifficulty(IsRaid()) : player->GetDifficulty(IsRaid()); - map = CreateInstance(newInstanceId, NULL, diff); + map = CreateInstance(newInstanceId, nullptr, diff); } } diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index ea06206d6..0c9d52fd9 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -31,7 +31,7 @@ public: Map* FindInstanceMap(uint32 instanceId) const { InstancedMaps::const_iterator i = m_InstancedMaps.find(instanceId); - return(i == m_InstancedMaps.end() ? NULL : i->second); + return(i == m_InstancedMaps.end() ? nullptr : i->second); } bool DestroyInstance(InstancedMaps::iterator& itr); diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 6ce03670f..0c560a518 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -32,7 +32,7 @@ public: Map* FindBaseMap(uint32 mapId) const // pussywizard: need this public for movemaps (mmaps) { MapMapType::const_iterator iter = i_maps.find(mapId); - return (iter == i_maps.end() ? NULL : iter->second); + return (iter == i_maps.end() ? nullptr : iter->second); } uint32 GetAreaId(uint32 mapid, float x, float y, float z) const diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 31183ae55..077b314c4 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -344,7 +344,7 @@ void TransportMgr::AddPathNodeToTransport(uint32 transportEntry, uint32 timeSeg, animNode.Path[timeSeg] = node; } -MotionTransport* TransportMgr::CreateTransport(uint32 entry, uint32 guid /*= 0*/, Map* map /*= NULL*/) +MotionTransport* TransportMgr::CreateTransport(uint32 entry, uint32 guid /*= 0*/, Map* map /*= nullptr*/) { // instance case, execute GetGameObjectEntry hook if (map) diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index b83153b7b..05dc66acf 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -368,7 +368,7 @@ GraveyardStruct const* Graveyard::GetGraveyard(const std::string& name) const { if (itr->second.wnameLow == wname) return &itr->second; - else if (alt == NULL && itr->second.wnameLow.find(wname) != std::wstring::npos) + else if (alt == nullptr && itr->second.wnameLow.find(wname) != std::wstring::npos) alt = &itr->second; } diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index e2f75f405..67c8398e2 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -72,7 +72,7 @@ void MotionMaster::InitDefault() if (_owner->GetTypeId() == TYPEID_UNIT && _owner->IsAlive()) { MovementGenerator* movement = FactorySelector::selectMovementGenerator(_owner->ToCreature()); - Mutate(movement == NULL ? &si_idleMovement : movement, MOTION_SLOT_IDLE); + Mutate(movement == nullptr ? &si_idleMovement : movement, MOTION_SLOT_IDLE); } else { diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 35e6f4a32..8d6e45ecf 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -44,7 +44,7 @@ class WaypointMovementGenerator : public MovementGeneratorMedium< Crea { public: WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) - : PathMovementBase((WaypointPath const*)NULL), i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating) {} + : PathMovementBase((WaypointPath const*)nullptr), i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating) {} ~WaypointMovementGenerator() { i_path = nullptr; } void DoInitialize(Creature*); void DoFinalize(Creature*); diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index ff317f825..1061ed426 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -86,7 +86,7 @@ void OutdoorPvPMgr::InitOutdoorPvP() pvp = sScriptMgr->CreateOutdoorPvP(iter->second); if (!pvp) { - sLog->outError("Could not initialize OutdoorPvP object for type ID %u; got NULL pointer from script.", uint32(i)); + sLog->outError("Could not initialize OutdoorPvP object for type ID %u; got nullptr pointer from script.", uint32(i)); continue; } diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 62361981e..aa1a6f278 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -210,7 +210,7 @@ void PoolGroup::Despawn1Object(uint32 guid) { sObjectMgr->RemoveCreatureFromGrid(guid, data); - if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)nullptr)) creature->AddObjectToRemoveList(); } } @@ -223,7 +223,7 @@ void PoolGroup::Despawn1Object(uint32 guid) { sObjectMgr->RemoveGameobjectFromGrid(guid, data); - if (GameObject* pGameobject = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL)) + if (GameObject* pGameobject = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)nullptr)) pGameobject->AddObjectToRemoveList(); } } @@ -505,7 +505,7 @@ template <> void PoolGroup::ReSpawn1Object(PoolObject* obj) { if (CreatureData const* data = sObjectMgr->GetCreatureData(obj->guid)) - if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)nullptr)) creature->GetMap()->AddToMap(creature); } @@ -514,7 +514,7 @@ template <> void PoolGroup::ReSpawn1Object(PoolObject* obj) { if (GameObjectData const* data = sObjectMgr->GetGOData(obj->guid)) - if (GameObject* pGameobject = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL)) + if (GameObject* pGameobject = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)nullptr)) pGameobject->GetMap()->AddToMap(pGameobject); } diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 38f9be7c5..26da8c6e6 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -91,7 +91,7 @@ inline Player* Map::_GetScriptPlayerSourceOrTarget(Object* source, Object* targe { Player* player = nullptr; if (!source && !target) - sLog->outError("%s source and target objects are NULL.", scriptInfo->GetDebugInfo().c_str()); + sLog->outError("%s source and target objects are nullptr.", scriptInfo->GetDebugInfo().c_str()); else { // Check target first, then source. @@ -113,7 +113,7 @@ inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* t { Creature* creature = nullptr; if (!source && !target) - sLog->outError("%s source and target objects are NULL.", scriptInfo->GetDebugInfo().c_str()); + sLog->outError("%s source and target objects are nullptr.", scriptInfo->GetDebugInfo().c_str()); else { if (bReverse) @@ -146,7 +146,7 @@ inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* s { Unit* unit = nullptr; if (!obj) - sLog->outError("%s %s object is NULL.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); + sLog->outError("%s %s object is nullptr.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else if (!obj->isType(TYPEMASK_UNIT)) sLog->outError("%s %s object is not unit (TypeId: %u, Entry: %u, GUID: %u), skipping.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target", obj->GetTypeId(), obj->GetEntry(), obj->GetGUIDLow()); @@ -164,7 +164,7 @@ inline Player* Map::_GetScriptPlayer(Object* obj, bool isSource, const ScriptInf { Player* player = nullptr; if (!obj) - sLog->outError("%s %s object is NULL.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); + sLog->outError("%s %s object is nullptr.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else { player = obj->ToPlayer(); @@ -179,7 +179,7 @@ inline Creature* Map::_GetScriptCreature(Object* obj, bool isSource, const Scrip { Creature* creature = nullptr; if (!obj) - sLog->outError("%s %s object is NULL.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); + sLog->outError("%s %s object is nullptr.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else { creature = obj->ToCreature(); @@ -194,7 +194,7 @@ inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const { WorldObject* pWorldObject = nullptr; if (!obj) - sLog->outError("%s %s object is NULL.", + sLog->outError("%s %s object is nullptr.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else { @@ -225,7 +225,7 @@ inline void Map::_ScriptProcessDoor(Object* source, Object* target, const Script if (!guid) sLog->outError("%s door guid is not specified.", scriptInfo->GetDebugInfo().c_str()); else if (!source) - sLog->outError("%s source object is NULL.", scriptInfo->GetDebugInfo().c_str()); + sLog->outError("%s source object is nullptr.", scriptInfo->GetDebugInfo().c_str()); else if (!source->isType(TYPEMASK_UNIT)) sLog->outError("%s source object is not unit (TypeId: %u, Entry: %u, GUID: %u), skipping.", scriptInfo->GetDebugInfo().c_str(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow()); @@ -530,12 +530,12 @@ void Map::ScriptsProcess() { if (!source) { - sLog->outError("%s source object is NULL.", step.script->GetDebugInfo().c_str()); + sLog->outError("%s source object is nullptr.", step.script->GetDebugInfo().c_str()); break; } if (!target) { - sLog->outError("%s target object is NULL.", step.script->GetDebugInfo().c_str()); + sLog->outError("%s target object is nullptr.", step.script->GetDebugInfo().c_str()); break; } @@ -674,7 +674,7 @@ void Map::ScriptsProcess() // Target must be GameObject. if (!target) { - sLog->outError("%s target object is NULL.", step.script->GetDebugInfo().c_str()); + sLog->outError("%s target object is nullptr.", step.script->GetDebugInfo().c_str()); break; } @@ -704,7 +704,7 @@ void Map::ScriptsProcess() // TODO: Allow gameobjects to be targets and casters if (!source && !target) { - sLog->outError("%s source and target objects are NULL.", step.script->GetDebugInfo().c_str()); + sLog->outError("%s source and target objects are nullptr.", step.script->GetDebugInfo().c_str()); break; } diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index dd688117a..cb346e198 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1327,7 +1327,7 @@ void ScriptMgr::OnShutdown() bool ScriptMgr::OnCriteriaCheck(uint32 scriptId, Player* source, Unit* target) { ASSERT(source); - // target can be NULL. + // target can be nullptr. GET_SCRIPT_RET(AchievementCriteriaScript, scriptId, tmpscript, false); return tmpscript->OnCheck(source, target); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 2ef884abd..cb0a7e983 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -309,7 +309,7 @@ public: sLog->outError("Invalid MapScript for %u; no such map ID.", _mapId); } - // Gets the MapEntry structure associated with this script. Can return NULL. + // Gets the MapEntry structure associated with this script. Can return nullptr. MapEntry const* GetEntry() { return _mapEntry; } // Called when the map is created. @@ -431,7 +431,7 @@ public: virtual void OnDamage(Unit* /*attacker*/, Unit* /*victim*/, uint32& /*damage*/) { } // Called when DoT's Tick Damage is being Dealt - // Attacker can be NULL if he is despawned while the aura still exists on target + // Attacker can be nullptr if he is despawned while the aura still exists on target virtual void ModifyPeriodicDamageAurasTick(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/) { } // Called when Melee Damage is being Dealt diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 9ef7b2c1c..51753a845 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1333,9 +1333,9 @@ enum Opcodes /// Player state enum SessionStatus { - STATUS_AUTHED = 0, // Player authenticated (_player == NULL, m_GUID has garbage) - STATUS_LOGGEDIN, // Player in game (_player != NULL, m_GUID == _player->GetGUID(), inWorld()) - STATUS_TRANSFER, // Player transferring to another map (_player != NULL, m_GUID == _player->GetGUID(), !inWorld()) + STATUS_AUTHED = 0, // Player authenticated (_player == nullptr, m_GUID has garbage) + STATUS_LOGGEDIN, // Player in game (_player != nullptr, m_GUID == _player->GetGUID(), inWorld()) + STATUS_TRANSFER, // Player transferring to another map (_player != nullptr, m_GUID == _player->GetGUID(), !inWorld()) STATUS_NEVER, // Opcode not accepted from client (deprecated or server side only) STATUS_UNHANDLED, // Opcode not handled yet }; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 1abe7d91e..d048dc2e4 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -171,7 +171,7 @@ WorldSession::~WorldSession() std::string const& WorldSession::GetPlayerName() const { - return _player != NULL ? _player->GetName() : DefaultPlayerName; + return _player != nullptr ? _player->GetName() : DefaultPlayerName; } std::string WorldSession::GetPlayerInfo() const @@ -179,7 +179,7 @@ std::string WorldSession::GetPlayerInfo() const std::ostringstream ss; ss << "[Player: " << GetPlayerName() - << " (Guid: " << (_player != NULL ? _player->GetGUID() : 0) + << " (Guid: " << (_player != nullptr ? _player->GetGUID() : 0) << ", Account: " << GetAccountId() << ")]"; return ss.str(); @@ -765,7 +765,7 @@ void WorldSession::SetAccountData(AccountDataType type, time_t tm, std::string c } else { - // _player can be NULL and packet received after logout but m_GUID still store correct guid + // _player can be nullptr and packet received after logout but m_GUID still store correct guid if (!m_GUIDLow) return; @@ -1160,7 +1160,7 @@ void WorldSession::SetPlayer(Player* player) void WorldSession::InitializeQueryCallbackParameters() { // Callback parameters that have pointers in them should be properly - // initialized to NULL here. + // initialized to nullptr here. _charCreateCallback.SetParam(nullptr); _loadPetFromDBFirstCallback.SetFirstParam(0); _loadPetFromDBFirstCallback.SetSecondParam(nullptr); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index b4ca45b9f..20a203c48 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1018,7 +1018,7 @@ private: typedef std::list AddonsList; // Warden - Warden* _warden; // Remains NULL if Warden system is not enabled by config + Warden* _warden; // Remains nullptr if Warden system is not enabled by config time_t _logoutTime; bool m_inQueue; // session wait in auth.queue diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 61f54ac0c..48d1e7b5c 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -582,7 +582,7 @@ int WorldSocket::handle_input_missing_data(void) // hope this is not hack, as proper m_RecvWPct is asserted around if (!m_RecvWPct) { - sLog->outError("Forcing close on input m_RecvWPct = NULL"); + sLog->outError("Forcing close on input m_RecvWPct = nullptr"); errno = EINVAL; return -1; } diff --git a/src/server/game/Server/WorldSocketAcceptor.h b/src/server/game/Server/WorldSocketAcceptor.h index 307c5461e..fa54e3ce6 100644 --- a/src/server/game/Server/WorldSocketAcceptor.h +++ b/src/server/game/Server/WorldSocketAcceptor.h @@ -42,7 +42,7 @@ protected: { sLog->outError("Out of file descriptors, suspending incoming connections for 10 seconds"); reactor()->remove_handler(this, ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - reactor()->schedule_timer(this, NULL, ACE_Time_Value(10)); + reactor()->schedule_timer(this, nullptr, ACE_Time_Value(10)); } #endif return 0; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index eb8339391..c41bd3d6f 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1272,14 +1272,14 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const { if (player) player->RemoveSpellCooldown(spellId); - target->CastSpell(target, spellId, true, NULL, this, target->GetGUID()); + target->CastSpell(target, spellId, true, nullptr, this, target->GetGUID()); } if (spellId2) { if (player) player->RemoveSpellCooldown(spellId2); - target->CastSpell(target, spellId2, true, NULL, this, target->GetGUID()); + target->CastSpell(target, spellId2, true, nullptr, this, target->GetGUID()); } if (player) @@ -1298,7 +1298,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const continue; if (spellInfo->Stances & (1 << (GetMiscValue() - 1))) - target->CastSpell(target, itr->first, true, NULL, this, target->GetGUID()); + target->CastSpell(target, itr->first, true, nullptr, this, target->GetGUID()); } // xinef: talent stance auras are not on m_spells map, so iterate talents @@ -1317,7 +1317,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const continue; if (spellInfo->Stances & (1 << (GetMiscValue() - 1))) - target->CastSpell(target, itr->first, true, NULL, this, target->GetGUID()); + target->CastSpell(target, itr->first, true, nullptr, this, target->GetGUID()); } // Also do it for Glyphs @@ -1331,7 +1331,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (!spellInfo || !spellInfo->HasAttribute(SpellAttr0(SPELL_ATTR0_PASSIVE | SPELL_ATTR0_HIDDEN_CLIENTSIDE))) continue; if (spellInfo->Stances & (1 << (GetMiscValue() - 1))) - target->CastSpell(target, glyph->SpellId, TriggerCastFlags(TRIGGERED_FULL_MASK & ~(TRIGGERED_IGNORE_SHAPESHIFT | TRIGGERED_IGNORE_CASTER_AURASTATE)), NULL, this, target->GetGUID()); + target->CastSpell(target, glyph->SpellId, TriggerCastFlags(TRIGGERED_FULL_MASK & ~(TRIGGERED_IGNORE_SHAPESHIFT | TRIGGERED_IGNORE_CASTER_AURASTATE)), nullptr, this, target->GetGUID()); } } } @@ -1341,7 +1341,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const { SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(24932); if (spellInfo && spellInfo->Stances & (1 << (GetMiscValue() - 1))) - target->CastSpell(target, 24932, true, NULL, this, target->GetGUID()); + target->CastSpell(target, 24932, true, nullptr, this, target->GetGUID()); } // Improved Barkskin - apply/remove armor bonus due to shapeshift if (player->HasTalent(63410, player->GetActiveSpec()) || player->HasTalent(63411, player->GetActiveSpec())) @@ -1362,7 +1362,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const { int32 HotWMod = (*i)->GetAmount() / 2; // For each 2% Intelligence, you get 1% stamina and 1% attack power. - target->CastCustomSpell(target, HotWSpellId, &HotWMod, nullptr, nullptr, true, NULL, this, target->GetGUID()); + target->CastCustomSpell(target, HotWSpellId, &HotWMod, nullptr, nullptr, true, nullptr, this, target->GetGUID()); break; } } @@ -1386,7 +1386,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const spellId3 = 47180; break; } - target->CastSpell(target, spellId3, true, NULL, this, target->GetGUID()); + target->CastSpell(target, spellId3, true, nullptr, this, target->GetGUID()); } // Master Shapeshifter - Cat if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) @@ -1912,7 +1912,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo { int32 basePoints = int32(std::min(oldPower, FurorChance)); target->SetPower(POWER_ENERGY, 0); - target->CastCustomSpell(target, 17099, &basePoints, nullptr, nullptr, true, NULL, this); + target->CastCustomSpell(target, 17099, &basePoints, nullptr, nullptr, true, nullptr, this); break; } case FORM_BEAR: @@ -1976,12 +1976,12 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo case FORM_DIREBEAR: case FORM_CAT: if (AuraEffect* dummy = target->GetAuraEffect(37315, 0)) - target->CastSpell(target, 37316, true, NULL, dummy); + target->CastSpell(target, 37316, true, nullptr, dummy); break; // Nordrassil Regalia - bonus case FORM_MOONKIN: if (AuraEffect* dummy = target->GetAuraEffect(37324, 0)) - target->CastSpell(target, 37325, true, NULL, dummy); + target->CastSpell(target, 37325, true, nullptr, dummy); break; case FORM_BATTLESTANCE: case FORM_DEFENSIVESTANCE: @@ -2050,7 +2050,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo { if (Item* pItem = target->ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND)) { - target->ToPlayer()->_ApplyWeaponDamage(EQUIPMENT_SLOT_MAINHAND, pItem->GetTemplate(), NULL, apply); + target->ToPlayer()->_ApplyWeaponDamage(EQUIPMENT_SLOT_MAINHAND, pItem->GetTemplate(), nullptr, apply); } } } @@ -2530,7 +2530,7 @@ void AuraEffect::HandleAuraModDisarm(AuraApplication const* aurApp, uint8 mode, if (attacktype < MAX_ATTACK) { - target->ToPlayer()->_ApplyWeaponDamage(slot, pItem->GetTemplate(), NULL, !apply); + target->ToPlayer()->_ApplyWeaponDamage(slot, pItem->GetTemplate(), nullptr, !apply); target->ToPlayer()->_ApplyWeaponDependentAuraMods(pItem, WeaponAttackType(attacktype), !apply); } } @@ -4934,7 +4934,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 13139: // net-o-matic // root to self part of (root_target->charge->root_self sequence if (caster) - caster->CastSpell(caster, 13138, true, NULL, this); + caster->CastSpell(caster, 13138, true, nullptr, this); break; case 34026: // kill command { @@ -4942,7 +4942,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (!pet) break; - target->CastSpell(target, 34027, true, NULL, this); + target->CastSpell(target, 34027, true, nullptr, this); // set 3 stacks and 3 charges (to make all auras not disappear at once) Aura* owner_aura = target->GetAura(34027, GetCasterGUID()); @@ -4966,10 +4966,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool switch (caster->getGender()) { case GENDER_FEMALE: - caster->CastSpell(target, 37095, true, NULL, this); // Blood Elf Disguise + caster->CastSpell(target, 37095, true, nullptr, this); // Blood Elf Disguise break; case GENDER_MALE: - caster->CastSpell(target, 37093, true, NULL, this); + caster->CastSpell(target, 37093, true, nullptr, this); break; default: break; @@ -4986,7 +4986,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool } case 39850: // Rocket Blast if (roll_chance_i(20)) // backfire stun - target->CastSpell(target, 51581, true, NULL, this); + target->CastSpell(target, 51581, true, nullptr, this); break; case 43873: // Headless Horseman Laugh target->PlayDistanceSound(11965); @@ -4997,10 +4997,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool switch (caster->getGender()) { case GENDER_FEMALE: - caster->CastSpell(target, 46356, true, NULL, this); + caster->CastSpell(target, 46356, true, nullptr, this); break; case GENDER_MALE: - caster->CastSpell(target, 46355, true, NULL, this); + caster->CastSpell(target, 46355, true, nullptr, this); break; } } @@ -5086,7 +5086,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool } if (finalSpelId) - caster->CastSpell(target, finalSpelId, true, NULL, this); + caster->CastSpell(target, finalSpelId, true, nullptr, this); } switch (m_spellInfo->SpellFamilyName) @@ -5115,7 +5115,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool } case 52172: // Coyote Spirit Despawn Aura case 60244: // Blood Parrot Despawn Aura - target->CastSpell((Unit*)NULL, GetAmount(), true, NULL, this); + target->CastSpell((Unit*)nullptr, GetAmount(), true, nullptr, this); break; // Halls of Lightning, Arc Lightning case 52921: @@ -5373,7 +5373,7 @@ void AuraEffect::HandleChannelDeathItem(AuraApplication const* aurApp, uint8 mod Item* newitem = plCaster->StoreNewItem(dest, GetSpellInfo()->Effects[m_effIndex].ItemType, true); if (!newitem) { - plCaster->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + plCaster->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } plCaster->SendNewItem(newitem, count, true, true); @@ -5527,9 +5527,9 @@ void AuraEffect::HandleAuraLinked(AuraApplication const* aurApp, uint8 mode, boo return; // If amount avalible cast with basepoints (Crypt Fever for example) if (GetAmount()) - caster->CastCustomSpell(target, triggeredSpellId, &m_amount, nullptr, nullptr, true, NULL, this); + caster->CastCustomSpell(target, triggeredSpellId, &m_amount, nullptr, nullptr, true, nullptr, this); else - caster->CastSpell(target, triggeredSpellId, true, NULL, this); + caster->CastSpell(target, triggeredSpellId, true, nullptr, this); } else { @@ -5714,7 +5714,7 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const if (GetSpellInfo()->SpellFamilyFlags[1] & 0x80000000) { if (caster) - caster->CastCustomSpell(53352, SPELLVALUE_BASE_POINT0, m_amount, target, true, NULL, this); + caster->CastCustomSpell(53352, SPELLVALUE_BASE_POINT0, m_amount, target, true, nullptr, this); break; } switch (GetSpellInfo()->Id) @@ -5748,7 +5748,7 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const { case 49016: // Hysteria uint32 damage = uint32(target->CountPctFromMaxHealth(1)); - Unit::DealDamage(target, target, damage, NULL, NODAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(target, target, damage, nullptr, NODAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); break; } // Blood of the North @@ -5829,7 +5829,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) case 27808: if (caster) { - caster->CastCustomSpell(29879, SPELLVALUE_BASE_POINT0, int32(target->CountPctFromMaxHealth(21)), target, true, NULL, this); + caster->CastCustomSpell(29879, SPELLVALUE_BASE_POINT0, int32(target->CountPctFromMaxHealth(21)), target, true, nullptr, this); if (GetTickNumber() == 1) caster->CastSpell(target, 27808, true); } @@ -5872,7 +5872,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) // so instakill will be naturally done before trigger spell case 31347: { - target->CastSpell(target, 31350, true, NULL, this); + target->CastSpell(target, 31350, true, nullptr, this); Unit::Kill(target, target); return; } @@ -5893,7 +5893,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) if (!caster || target->GetTypeId() != TYPEID_UNIT) return; - caster->CastSpell(caster, 38495, true, NULL, this); + caster->CastSpell(caster, 38495, true, nullptr, this); Creature* creatureTarget = target->ToCreature(); @@ -5954,20 +5954,20 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) { // Mana Tide case 16191: - target->CastCustomSpell(target, triggerSpellId, &m_amount, nullptr, nullptr, true, NULL, this); + target->CastCustomSpell(target, triggerSpellId, &m_amount, nullptr, nullptr, true, nullptr, this); return; // Poison (Grobbulus) case 28158: case 54362: // Slime Pool (Dreadscale & Acidmaw) case 66882: - target->CastCustomSpell(triggerSpellId, SPELLVALUE_RADIUS_MOD, (int32)((((float)m_tickNumber / 60) * 0.9f + 0.1f) * 10000 * 2 / 3), NULL, true, NULL, this); + target->CastCustomSpell(triggerSpellId, SPELLVALUE_RADIUS_MOD, (int32)((((float)m_tickNumber / 60) * 0.9f + 0.1f) * 10000 * 2 / 3), nullptr, true, nullptr, this); return; // Eye of Eternity, Malygos, Arcane Overload case 56432: if (triggerSpellId == 56438) { - target->CastCustomSpell(triggerSpellId, SPELLVALUE_RADIUS_MOD, (int32)(10000 * (1.0f - 0.02f * (m_tickNumber + 1))), NULL, true, NULL, this); + target->CastCustomSpell(triggerSpellId, SPELLVALUE_RADIUS_MOD, (int32)(10000 * (1.0f - 0.02f * (m_tickNumber + 1))), nullptr, true, nullptr, this); return; } break; @@ -6059,7 +6059,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) if (GetSpellInfo()->Effects[GetEffIndex()].TargetA.GetCheckType() == TARGET_CHECK_ENTRY || GetSpellInfo()->Effects[GetEffIndex()].TargetB.GetCheckType() == TARGET_CHECK_ENTRY) triggerFlags = TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST); - triggerCaster->CastSpell(targets, triggeredSpellInfo, NULL, triggerFlags, NULL, this); + triggerCaster->CastSpell(targets, triggeredSpellInfo, nullptr, triggerFlags, nullptr, this); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandlePeriodicTriggerSpellAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id); #endif @@ -6085,7 +6085,7 @@ void AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick(Unit* target, Unit* CustomSpellValues values; values.AddSpellMod(SPELLVALUE_BASE_POINT0, GetAmount()); - triggerCaster->CastSpell(targets, triggeredSpellInfo, &values, TRIGGERED_FULL_MASK, NULL, this); + triggerCaster->CastSpell(targets, triggeredSpellInfo, &values, TRIGGERED_FULL_MASK, nullptr, this); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id); #endif @@ -6213,7 +6213,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const int32 dmg = damage; if (CanApplyResilience()) - Unit::ApplyResilience(target, NULL, &dmg, crit, CR_CRIT_TAKEN_SPELL); + Unit::ApplyResilience(target, nullptr, &dmg, crit, CR_CRIT_TAKEN_SPELL); damage = dmg; Unit::CalcAbsorbResist(caster, target, GetSpellInfo()->GetSchoolMask(), DOT, damage, &absorb, &resist, GetSpellInfo()); @@ -6295,7 +6295,7 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c int32 dmg = damage; if (CanApplyResilience()) - Unit::ApplyResilience(target, NULL, &dmg, crit, CR_CRIT_TAKEN_SPELL); + Unit::ApplyResilience(target, nullptr, &dmg, crit, CR_CRIT_TAKEN_SPELL); damage = dmg; Unit::CalcAbsorbResist(caster, target, GetSpellInfo()->GetSchoolMask(), DOT, damage, &absorb, &resist, m_spellInfo); @@ -6580,7 +6580,7 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con if (manaFeedVal > 0) { int32 feedAmount = CalculatePct(gainedAmount, manaFeedVal); - caster->CastCustomSpell(caster, 32554, &feedAmount, nullptr, nullptr, true, NULL, this); + caster->CastCustomSpell(caster, 32554, &feedAmount, nullptr, nullptr, true, nullptr, this); } } } @@ -6713,7 +6713,7 @@ void AuraEffect::HandleProcTriggerSpellAuraProc(AuraApplication* aurApp, ProcEve #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerSpellAuraProc: Triggering spell %u from aura %u proc", triggeredSpellInfo->Id, GetId()); #endif - triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this); + triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, nullptr, this); } else { @@ -6738,7 +6738,7 @@ void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerSpellWithValueAuraProc: Triggering spell %u with value %d from aura %u proc", triggeredSpellInfo->Id, basepoints0, GetId()); #endif - triggerCaster->CastCustomSpell(triggerTarget, triggerSpellId, &basepoints0, nullptr, nullptr, true, NULL, this); + triggerCaster->CastCustomSpell(triggerTarget, triggerSpellId, &basepoints0, nullptr, nullptr, true, nullptr, this); } else { @@ -6803,7 +6803,7 @@ void AuraEffect::HandleRaidProcFromChargeAuraProc(AuraApplication* aurApp, ProcE if (Unit* triggerTarget = target->GetNextRandomRaidMemberOrPet(radius)) { - target->CastSpell(triggerTarget, GetSpellInfo(), true, NULL, this, GetCasterGUID()); + target->CastSpell(triggerTarget, GetSpellInfo(), true, nullptr, this, GetCasterGUID()); if (Aura* aura = triggerTarget->GetAura(GetId(), GetCasterGUID())) aura->SetCharges(jumps); } @@ -6813,7 +6813,7 @@ void AuraEffect::HandleRaidProcFromChargeAuraProc(AuraApplication* aurApp, ProcE #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeAuraProc: Triggering spell %u from aura %u proc", triggerSpellId, GetId()); #endif - target->CastSpell(target, triggerSpellId, true, NULL, this, GetCasterGUID()); + target->CastSpell(target, triggerSpellId, true, nullptr, this, GetCasterGUID()); } void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& /*eventInfo*/) @@ -6847,7 +6847,7 @@ void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurA if (Unit* triggerTarget = target->GetNextRandomRaidMemberOrPet(radius)) { - target->CastCustomSpell(triggerTarget, GetId(), &value, nullptr, nullptr, true, NULL, this, GetCasterGUID()); + target->CastCustomSpell(triggerTarget, GetId(), &value, nullptr, nullptr, true, nullptr, this, GetCasterGUID()); if (Aura* aura = triggerTarget->GetAura(GetId(), GetCasterGUID())) aura->SetCharges(jumps); } @@ -6857,5 +6857,5 @@ void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurA #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeWithValueAuraProc: Triggering spell %u from aura %u proc", triggerSpellId, GetId()); #endif - target->CastCustomSpell(target, triggerSpellId, &value, nullptr, nullptr, true, NULL, this, GetCasterGUID()); + target->CastCustomSpell(target, triggerSpellId, &value, nullptr, nullptr, true, nullptr, this, GetCasterGUID()); } diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 84d300f20..94b187614 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -313,7 +313,7 @@ uint8 Aura::BuildEffectMaskForOwner(SpellInfo const* spellProto, uint8 avalibleE return effMask & avalibleEffectMask; } -Aura* Aura::TryRefreshStackOrCreate(SpellInfo const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount /*= NULL*/, Item* castItem /*= NULL*/, uint64 casterGUID /*= 0*/, bool* refresh /*= NULL*/, bool periodicReset /*= false*/) +Aura* Aura::TryRefreshStackOrCreate(SpellInfo const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount /*= nullptr*/, Item* castItem /*= nullptr*/, uint64 casterGUID /*= 0*/, bool* refresh /*= nullptr*/, bool periodicReset /*= false*/) { ASSERT(spellproto); ASSERT(owner); @@ -339,7 +339,7 @@ Aura* Aura::TryRefreshStackOrCreate(SpellInfo const* spellproto, uint8 tryEffMas return Create(spellproto, effMask, owner, caster, baseAmount, castItem, casterGUID); } -Aura* Aura::TryCreate(SpellInfo const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount /*= NULL*/, Item* castItem /*= NULL*/, uint64 casterGUID /*= 0*/) +Aura* Aura::TryCreate(SpellInfo const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount /*= nullptr*/, Item* castItem /*= nullptr*/, uint64 casterGUID /*= 0*/) { ASSERT(spellproto); ASSERT(owner); @@ -428,7 +428,7 @@ void Aura::_InitEffects(uint8 effMask, Unit* caster, int32* baseAmount) for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if (effMask & (uint8(1) << i)) - m_effects[i] = new AuraEffect(this, i, baseAmount ? baseAmount + i : NULL, caster); + m_effects[i] = new AuraEffect(this, i, baseAmount ? baseAmount + i : nullptr, caster); else m_effects[i] = nullptr; } @@ -488,7 +488,7 @@ void Aura::_ApplyForTarget(Unit* target, Unit* caster, AuraApplication* auraApp) if (m_spellInfo->IsCooldownStartedOnEvent()) { Item* castItem = m_castItemGuid ? caster->ToPlayer()->GetItemByGuid(m_castItemGuid) : nullptr; - caster->ToPlayer()->AddSpellAndCategoryCooldowns(m_spellInfo, castItem ? castItem->GetEntry() : 0, NULL, true); + caster->ToPlayer()->AddSpellAndCategoryCooldowns(m_spellInfo, castItem ? castItem->GetEntry() : 0, nullptr, true); } } } @@ -1109,7 +1109,7 @@ void Aura::UnregisterSingleTarget() Unit* caster = GetCaster(); // TODO: find a better way to do this. if (!caster) - caster = ObjectAccessor::GetObjectInOrOutOfWorld(GetCasterGUID(), (Unit*)NULL); + caster = ObjectAccessor::GetObjectInOrOutOfWorld(GetCasterGUID(), (Unit*)nullptr); if (!caster) { sLog->outMisc("Aura::UnregisterSingleTarget (A1) - %u, %u, %u, %s", GetId(), GetOwner()->GetTypeId(), GetOwner()->GetEntry(), GetOwner()->GetName().c_str()); @@ -1390,7 +1390,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, DOT); int32 basepoints0 = damage; - caster->CastCustomSpell(target, 64801, &basepoints0, nullptr, nullptr, true, NULL, GetEffect(0)); + caster->CastCustomSpell(target, 64801, &basepoints0, nullptr, nullptr, true, nullptr, GetEffect(0)); } } break; @@ -1408,8 +1408,8 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b int32 basepoints0 = aurEff->GetAmount() * GetEffect(0)->GetTotalTicks() * int32(damage) / 100; int32 heal = int32(CalculatePct(basepoints0, 15)); - caster->CastCustomSpell(target, 63675, &basepoints0, nullptr, nullptr, true, NULL, GetEffect(0)); - caster->CastCustomSpell(caster, 75999, &heal, nullptr, nullptr, true, NULL, GetEffect(0)); + caster->CastCustomSpell(target, 63675, &basepoints0, nullptr, nullptr, true, nullptr, GetEffect(0)); + caster->CastCustomSpell(caster, 75999, &heal, nullptr, nullptr, true, nullptr, GetEffect(0)); } } // Power Word: Shield @@ -1533,7 +1533,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { int32 remainingDamage = aurEff->GetAmount() * (aurEff->GetTotalTicks() - aurEff->GetTickNumber()); if (remainingDamage > 0) - caster->CastCustomSpell(caster, 72373, NULL, &remainingDamage, NULL, true); + caster->CastCustomSpell(caster, 72373, nullptr, &remainingDamage, nullptr, true); } break; } @@ -1544,7 +1544,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b case 66: // Invisibility if (removeMode != AURA_REMOVE_BY_EXPIRE) break; - target->CastSpell(target, 32612, true, NULL, GetEffect(1)); + target->CastSpell(target, 32612, true, nullptr, GetEffect(1)); target->CombatStop(); break; case 74396: // Fingers of Frost @@ -1572,7 +1572,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (absorb->GetAmount() <= 0) // removed by damage, not dispel if (AuraEffect* dummy = caster->GetDummyAuraEffect(SPELLFAMILY_MAGE, 2945, 0)) if (roll_chance_i(dummy->GetSpellInfo()->ProcChance)) - caster->CastSpell(target, 55080, true, NULL, GetEffect(0)); + caster->CastSpell(target, 55080, true, nullptr, GetEffect(0)); } break; case SPELLFAMILY_WARRIOR: @@ -1613,7 +1613,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 178, 1)) { int32 basepoints0 = aurEff->GetAmount() * caster->GetCreateMana() / 100; - caster->CastCustomSpell(caster, 64103, &basepoints0, nullptr, nullptr, true, NULL, GetEffect(0)); + caster->CastCustomSpell(caster, 64103, &basepoints0, nullptr, nullptr, true, nullptr, GetEffect(0)); } } // Power word: shield diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index d3eb25974..65a6fc877 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -80,8 +80,8 @@ public: typedef std::map ApplicationMap; static uint8 BuildEffectMaskForOwner(SpellInfo const* spellProto, uint8 avalibleEffectMask, WorldObject* owner); - static Aura* TryRefreshStackOrCreate(SpellInfo const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount = NULL, Item* castItem = NULL, uint64 casterGUID = 0, bool* refresh = NULL, bool periodicReset = false); - static Aura* TryCreate(SpellInfo const* spellproto, uint8 effMask, WorldObject* owner, Unit* caster, int32* baseAmount = NULL, Item* castItem = NULL, uint64 casterGUID = 0); + static Aura* TryRefreshStackOrCreate(SpellInfo const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount = nullptr, Item* castItem = nullptr, uint64 casterGUID = 0, bool* refresh = nullptr, bool periodicReset = false); + static Aura* TryCreate(SpellInfo const* spellproto, uint8 effMask, WorldObject* owner, Unit* caster, int32* baseAmount = nullptr, Item* castItem = nullptr, uint64 casterGUID = 0); static Aura* Create(SpellInfo const* spellproto, uint8 effMask, WorldObject* owner, Unit* caster, int32* baseAmount, Item* castItem, uint64 casterGUID); explicit Aura(SpellInfo const* spellproto, WorldObject* owner, Unit* caster, Item* castItem, uint64 casterGUID); void _InitEffects(uint8 effMask, Unit* caster, int32* baseAmount); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 85d51a362..e0cc6c37a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1120,7 +1120,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffIndex effIndex, SpellImplicitTar CallScriptObjectTargetSelectHandlers(target, effIndex, targetType); if (!target) { - //TC_LOG_DEBUG("spells", "Spell::SelectImplicitNearbyTargets: OnObjectTargetSelect script hook for spell Id %u set NULL target, effect %u", m_spellInfo->Id, effIndex); + //TC_LOG_DEBUG("spells", "Spell::SelectImplicitNearbyTargets: OnObjectTargetSelect script hook for spell Id %u set nullptr target, effect %u", m_spellInfo->Id, effIndex); return; } @@ -3026,7 +3026,7 @@ void Spell::DoAllEffectOnTarget(GOTargetInfo* target) for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber) if (effectMask & (1 << effectNumber)) - HandleEffects(nullptr, NULL, go, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET); + HandleEffects(nullptr, nullptr, go, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET); // xinef: inform ai about spellhit go->AI()->SpellHit(m_caster, m_spellInfo); @@ -3047,7 +3047,7 @@ void Spell::DoAllEffectOnTarget(ItemTargetInfo* target) for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber) if (effectMask & (1 << effectNumber)) - HandleEffects(nullptr, target->item, NULL, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET); + HandleEffects(nullptr, target->item, nullptr, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET); CallScriptOnHitHandlers(); @@ -3343,7 +3343,7 @@ SpellCastResult Spell::prepare(SpellCastTargets const* targets, AuraEffect const { // Xinef: Creature should focus to cast target if there is explicit target or self if casting positive spell // Xinef: Creature should not rotate like a retard when casting spell... based on halion behavior - m_caster->ToCreature()->FocusTarget(this, m_targets.GetObjectTarget() != NULL ? m_targets.GetObjectTarget() : m_caster); + m_caster->ToCreature()->FocusTarget(this, m_targets.GetObjectTarget() != nullptr ? m_targets.GetObjectTarget() : m_caster); } } @@ -3610,7 +3610,7 @@ void Spell::_cast(bool skipCheck) // Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells if ((m_spellInfo->Speed > 0.0f && !m_spellInfo->IsChanneled())/* xinef: we dont need this shit || m_spellInfo->Id == 14157*/) { - // Remove used for cast item if need (it can be already NULL after TakeReagents call + // Remove used for cast item if need (it can be already nullptr after TakeReagents call // in case delayed spell remove item at cast delay start TakeCastItem(); @@ -3654,7 +3654,7 @@ void Spell::_cast(bool skipCheck) } // Interrupt Spell casting - // handle this here, in other places SpellHitTarget can be set to NULL, if there is an error in this function + // handle this here, in other places SpellHitTarget can be set to nullptr, if there is an error in this function if (m_spellInfo->HasAttribute(SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER)) if (Unit* target = m_targets.GetUnitTarget()) if (target->GetTypeId() == TYPEID_UNIT) @@ -3719,7 +3719,7 @@ void Spell::handle_immediate() // spell is finished, perform some last features of the spell here _handle_finish_phase(); - // Remove used for cast item if need (it can be already NULL after TakeReagents call + // Remove used for cast item if need (it can be already nullptr after TakeReagents call TakeCastItem(); // handle ammo consumption for Hunter's volley spell @@ -5312,7 +5312,7 @@ SpellCastResult Spell::CheckCast(bool strict) ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL, m_spellInfo->Id); if (!conditions.empty() && !sConditionMgr->IsObjectMeetToConditions(condInfo, conditions)) { - // mLastFailedCondition can be NULL if there was an error processing the condition in Condition::Meets (i.e. wrong data for ConditionTarget or others) + // mLastFailedCondition can be nullptr if there was an error processing the condition in Condition::Meets (i.e. wrong data for ConditionTarget or others) if (condInfo.mLastFailedCondition && condInfo.mLastFailedCondition->ErrorType) { if (condInfo.mLastFailedCondition->ErrorType == SPELL_FAILED_CUSTOM_ERROR) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 747a1e64e..30104c9bd 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -290,7 +290,7 @@ void Spell::EffectInstaKill(SpellEffIndex /*effIndex*/) data << uint32(m_spellInfo->Id); m_caster->SendMessageToSet(&data, true); - Unit::DealDamage(m_caster, unitTarget, unitTarget->GetHealth(), NULL, NODAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(m_caster, unitTarget, unitTarget->GetHealth(), nullptr, NODAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); } void Spell::EffectEnvironmentalDMG(SpellEffIndex /*effIndex*/) @@ -1092,7 +1092,7 @@ void Spell::EffectTriggerRitualOfSummoning(SpellEffIndex effIndex) finish(); - m_caster->CastSpell((Unit*)NULL, spellInfo, false); + m_caster->CastSpell((Unit*)nullptr, spellInfo, false); } void Spell::EffectJump(SpellEffIndex effIndex) @@ -1669,7 +1669,7 @@ void Spell::DoCreateItem(uint8 /*effIndex*/, uint32 itemId) ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(newitemid); if (!pProto) { - player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } @@ -1762,7 +1762,7 @@ void Spell::DoCreateItem(uint8 /*effIndex*/, uint32 itemId) // was it successful? return error if not if (!pItem) { - player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } @@ -2854,7 +2854,7 @@ void Spell::EffectEnchantItemPerm(SpellEffIndex effIndex) unitTarget = p_caster; // and add a scroll DoCreateItem(effIndex, m_spellInfo->Effects[effIndex].ItemType); - itemTarget = NULL; + itemTarget = nullptr; m_targets.SetItemTarget(nullptr); } else @@ -3422,7 +3422,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) // Skyshatter Harness item set bonus // Stormstrike if (AuraEffect* aurEff = m_caster->IsScriptOverriden(m_spellInfo, 5634)) - m_caster->CastSpell(m_caster, 38430, true, NULL, aurEff); + m_caster->CastSpell(m_caster, 38430, true, nullptr, aurEff); // Lava lash damage increased by Flametongue weapon if (m_caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, 688, EFFECT_0)) AddPct(totalDamagePercentMod, 25.0f); @@ -6289,7 +6289,7 @@ void Spell::EffectRechargeManaGem(SpellEffIndex /*effIndex*/) ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(item_id); if (!pProto) { - player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, nullptr); + player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr); return; } diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 877fc49ea..7968c1cdf 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1275,7 +1275,7 @@ bool SpellInfo::IsAffectedBySpellMod(SpellModifier const* mod) const return false; SpellInfo const* affectSpell = sSpellMgr->GetSpellInfo(mod->spellId); - // False if affect_spell == NULL or spellFamily not equal + // False if affect_spell == nullptr or spellFamily not equal if (!affectSpell || affectSpell->SpellFamilyName != SpellFamilyName) return false; diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index cf520498d..7dcccbc00 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -271,13 +271,13 @@ public: bool IsFarDestTargetEffect() const; bool IsUnitOwnedAuraEffect() const; - int32 CalcValue(Unit const* caster = NULL, int32 const* basePoints = NULL, Unit const* target = nullptr) const; + int32 CalcValue(Unit const* caster = nullptr, int32 const* basePoints = nullptr, Unit const* target = nullptr) const; int32 CalcBaseValue(int32 value) const; float CalcValueMultiplier(Unit* caster, Spell* spell = nullptr) const; float CalcDamageMultiplier(Unit* caster, Spell* spell = nullptr) const; bool HasRadius() const; - float CalcRadius(Unit* caster = NULL, Spell* = nullptr) const; + float CalcRadius(Unit* caster = nullptr, Spell* = nullptr) const; uint32 GetProvidedTargetMask() const; uint32 GetMissingTargetMask(bool srcSet = false, bool destSet = false, uint32 mask = 0) const; @@ -479,14 +479,14 @@ public: SpellSpecificType GetSpellSpecific() const; float GetMinRange(bool positive = false) const; - float GetMaxRange(bool positive = false, Unit* caster = NULL, Spell* spell = nullptr) const; + float GetMaxRange(bool positive = false, Unit* caster = nullptr, Spell* spell = nullptr) const; int32 GetDuration() const; int32 GetMaxDuration() const; uint32 GetMaxTicks() const; - uint32 CalcCastTime(Unit* caster = NULL, Spell* spell = nullptr) const; + uint32 CalcCastTime(Unit* caster = nullptr, Spell* spell = nullptr) const; uint32 GetRecoveryTime() const; int32 CalcPowerCost(Unit const* caster, SpellSchoolMask schoolMask, Spell* spell = nullptr) const; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 596b85c2f..aaa5c7544 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -508,7 +508,7 @@ uint32 SpellMgr::GetSpellIdForDifficulty(uint32 spellId, Unit const* caster) con if (difficultyEntry->SpellID[mode] <= 0 && mode > DUNGEON_DIFFICULTY_HEROIC) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: spell %u mode %u spell is NULL, using mode %u", spellId, mode, mode - 2); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: spell %u mode %u spell is nullptr, using mode %u", spellId, mode, mode - 2); #endif mode -= 2; } diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 487cd3e23..cbba94fb9 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -352,38 +352,38 @@ public: // examples: // -shadowstep - explicit target is the unit you want to go behind of // -chain heal - explicit target is the unit to be healed first - // -holy nova/arcane explosion - explicit target = NULL because target you are selecting doesn't affect how spell targets are selected + // -holy nova/arcane explosion - explicit target = nullptr because target you are selecting doesn't affect how spell targets are selected // you can determine if spell requires explicit targets by dbc columns: // - Targets - mask of explicit target types // - ImplicitTargetXX set to TARGET_XXX_TARGET_YYY, _TARGET_ here means that explicit target is used by the effect, so spell needs one too - // returns: WorldLocation which was selected as a spell destination or NULL + // returns: WorldLocation which was selected as a spell destination or nullptr WorldLocation const* GetExplTargetDest(); void SetExplTargetDest(WorldLocation& loc); - // returns: WorldObject which was selected as an explicit spell target or NULL if there's no target + // returns: WorldObject which was selected as an explicit spell target or nullptr if there's no target WorldObject* GetExplTargetWorldObject(); - // returns: Unit which was selected as an explicit spell target or NULL if there's no target + // returns: Unit which was selected as an explicit spell target or nullptr if there's no target Unit* GetExplTargetUnit(); - // returns: GameObject which was selected as an explicit spell target or NULL if there's no target + // returns: GameObject which was selected as an explicit spell target or nullptr if there's no target GameObject* GetExplTargetGObj(); - // returns: Item which was selected as an explicit spell target or NULL if there's no target + // returns: Item which was selected as an explicit spell target or nullptr if there's no target Item* GetExplTargetItem(); // methods useable only during spell hit on target, or during spell launch on target: - // returns: target of current effect if it was Unit otherwise NULL + // returns: target of current effect if it was Unit otherwise nullptr Unit* GetHitUnit(); - // returns: target of current effect if it was Creature otherwise NULL + // returns: target of current effect if it was Creature otherwise nullptr Creature* GetHitCreature(); - // returns: target of current effect if it was Player otherwise NULL + // returns: target of current effect if it was Player otherwise nullptr Player* GetHitPlayer(); - // returns: target of current effect if it was Item otherwise NULL + // returns: target of current effect if it was Item otherwise nullptr Item* GetHitItem(); - // returns: target of current effect if it was GameObject otherwise NULL + // returns: target of current effect if it was GameObject otherwise nullptr GameObject* GetHitGObj(); // returns: destination of current effect WorldLocation* GetHitDest(); @@ -802,13 +802,13 @@ public: // returns guid of object which casted the aura (m_originalCaster of the Spell class) uint64 GetCasterGUID() const; - // returns unit which casted the aura or NULL if not avalible (caster logged out for example) + // returns unit which casted the aura or nullptr if not avalible (caster logged out for example) Unit* GetCaster() const; // returns object on which aura was casted, target for non-area auras, area aura source for area auras WorldObject* GetOwner() const; - // returns owner if it's unit or unit derived object, NULL otherwise (only for persistent area auras NULL is returned) + // returns owner if it's unit or unit derived object, nullptr otherwise (only for persistent area auras nullptr is returned) Unit* GetUnitOwner() const; - // returns owner if it's dynobj, NULL otherwise + // returns owner if it's dynobj, nullptr otherwise DynamicObject* GetDynobjOwner() const; // removes aura with remove mode (see AuraRemoveMode enum) @@ -853,7 +853,7 @@ public: // check if aura has effect of given effindex bool HasEffect(uint8 effIndex) const; - // returns aura effect of given effect index or NULL + // returns aura effect of given effect index or nullptr AuraEffect* GetEffect(uint8 effIndex) const; // check if aura has effect of given aura type @@ -863,8 +863,8 @@ public: // Do not call these in hooks in which AuraApplication is not avalible, otherwise result will differ from expected (the functions will return nullptr) // returns currently processed target of an aura - // Return value does not need to be NULL-checked, the only situation this will (always) - // return NULL is when the call happens in an unsupported hook, in other cases, it is always valid + // Return value does not need to be nullptr-checked, the only situation this will (always) + // return nullptr is when the call happens in an unsupported hook, in other cases, it is always valid Unit* GetTarget() const; // returns AuraApplication object of currently processed target AuraApplication const* GetTargetApplication() const; diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index d5d6e3415..0a2444cae 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -189,7 +189,7 @@ void CreatureTextMgr::LoadCreatureTextLocales() sLog->outString(); } -uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, WorldObject const* whisperTarget /*= NULL*/, ChatMsg msgType /*= CHAT_MSG_ADDON*/, Language language /*= LANG_ADDON*/, CreatureTextRange range /*= TEXT_RANGE_NORMAL*/, uint32 sound /*= 0*/, TeamId teamId /*= TEAM_NEUTRAL*/, bool gmOnly /*= false*/, Player* srcPlr /*= NULL*/) +uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, WorldObject const* whisperTarget /*= nullptr*/, ChatMsg msgType /*= CHAT_MSG_ADDON*/, Language language /*= LANG_ADDON*/, CreatureTextRange range /*= TEXT_RANGE_NORMAL*/, uint32 sound /*= 0*/, TeamId teamId /*= TEAM_NEUTRAL*/, bool gmOnly /*= false*/, Player* srcPlr /*= nullptr*/) { if (!source) return 0; diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 7a8f1dc22..f628f7a5c 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -86,11 +86,11 @@ public: void SendEmote(Unit* source, uint32 emote); //if sent, returns the 'duration' of the text else 0 if error - uint32 SendChat(Creature* source, uint8 textGroup, WorldObject const* whisperTarget = NULL, ChatMsg msgType = CHAT_MSG_ADDON, Language language = LANG_ADDON, CreatureTextRange range = TEXT_RANGE_NORMAL, uint32 sound = 0, TeamId teamId = TEAM_NEUTRAL, bool gmOnly = false, Player* srcPlr = nullptr); + uint32 SendChat(Creature* source, uint8 textGroup, WorldObject const* whisperTarget = nullptr, ChatMsg msgType = CHAT_MSG_ADDON, Language language = LANG_ADDON, CreatureTextRange range = TEXT_RANGE_NORMAL, uint32 sound = 0, TeamId teamId = TEAM_NEUTRAL, bool gmOnly = false, Player* srcPlr = nullptr); bool TextExist(uint32 sourceEntry, uint8 textGroup); std::string GetLocalizedChatString(uint32 entry, uint8 gender, uint8 textGroup, uint32 id, LocaleConstant locale) const; - template void SendChatPacket(WorldObject* source, Builder const& builder, ChatMsg msgType, WorldObject const* whisperTarget = NULL, CreatureTextRange range = TEXT_RANGE_NORMAL, TeamId teamId = TEAM_NEUTRAL, bool gmOnly = false) const; + template void SendChatPacket(WorldObject* source, Builder const& builder, ChatMsg msgType, WorldObject const* whisperTarget = nullptr, CreatureTextRange range = TEXT_RANGE_NORMAL, TeamId teamId = TEAM_NEUTRAL, bool gmOnly = false) const; private: CreatureTextRepeatIds GetRepeatGroup(Creature* source, uint8 textGroup); @@ -166,7 +166,7 @@ private: }; template -void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder, ChatMsg msgType, WorldObject const* whisperTarget /*= NULL*/, CreatureTextRange range /*= TEXT_RANGE_NORMAL*/, TeamId teamId /*= TEAM_NEUTRAL*/, bool gmOnly /*= false*/) const +void CreatureTextMgr::SendChatPacket(WorldObject* source, Builder const& builder, ChatMsg msgType, WorldObject const* whisperTarget /*= nullptr*/, CreatureTextRange range /*= TEXT_RANGE_NORMAL*/, TeamId teamId /*= TEAM_NEUTRAL*/, bool gmOnly /*= false*/) const { if (!source) return; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index f8692b9ad..6fd573bdc 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -201,7 +201,7 @@ WorldSession* World::FindSession(uint32 id) const SessionMap::const_iterator itr = m_sessions.find(id); if (itr != m_sessions.end()) - return itr->second; // also can return NULL for kicked session + return itr->second; // also can return nullptr for kicked session else return nullptr; } diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 6d5d970df..2808efc19 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -48,12 +48,12 @@ public: }; static std::vector disableCommandTable = { - { "add", SEC_ADMINISTRATOR, true, NULL, "", addDisableCommandTable }, - { "remove", SEC_ADMINISTRATOR, true, NULL, "", removeDisableCommandTable }, + { "add", SEC_ADMINISTRATOR, true, nullptr, "", addDisableCommandTable }, + { "remove", SEC_ADMINISTRATOR, true, nullptr, "", removeDisableCommandTable }, }; static std::vector commandTable = { - { "disable", SEC_ADMINISTRATOR, false, NULL, "", disableCommandTable }, + { "disable", SEC_ADMINISTRATOR, false, nullptr, "", disableCommandTable }, }; return commandTable; } diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index cfd73082a..fd01e213b 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -55,7 +55,7 @@ public: static std::vector commandTable = { - { "mmap", SEC_ADMINISTRATOR, true, NULL, "", mmapCommandTable }, + { "mmap", SEC_ADMINISTRATOR, true, nullptr, "", mmapCommandTable }, }; return commandTable; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 892e36004..a40bd2514 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -519,7 +519,7 @@ public: } uint32 itemId = atol(pitem); - char* addMulti = strtok(NULL, " "); + char* addMulti = strtok(nullptr, " "); if (!sObjectMgr->RemoveVendorItem(addMulti ? handler->GetSession()->GetCurrentVendor() : vendor->GetEntry(), itemId)) { handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST, itemId); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index a9c117d6a..177e9b2dd 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -220,7 +220,7 @@ public: break; case EVENT_SPELL_SHOCK_BARRIER: me->CastSpell(me, SPELL_SHOCK_BARRIER, true); - me->CastCustomSpell(SPELL_PYROBLAST, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false); + me->CastCustomSpell(SPELL_PYROBLAST, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false); events.ScheduleEvent(EVENT_SPELL_SHOCK_BARRIER, 50000); break; case EVENT_SPELL_PHOENIX: diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 3d32ab083..8a2d14279 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -81,7 +81,7 @@ public: me->SetReactState(REACT_PASSIVE); DoCastAOE(SPELL_THREAT_PULSE, true); - sCreatureTextMgr->SendChat(me, SAY_PERSUADE_RAND, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, player); + sCreatureTextMgr->SendChat(me, SAY_PERSUADE_RAND, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, player); Talk(SAY_CRUSADER); } } @@ -124,7 +124,7 @@ public: break; case 5: - sCreatureTextMgr->SendChat(me, SAY_PERSUADED5, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, player); + sCreatureTextMgr->SendChat(me, SAY_PERSUADED5, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, player); speechTimer = 8000; break; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index e8ee789cd..955263116 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -116,7 +116,7 @@ public: void HandleDummyTick(AuraEffect const* aurEff) { - GetTarget()->CastSpell((Unit*)NULL, aurEff->GetAmount(), true); + GetTarget()->CastSpell((Unit*)nullptr, aurEff->GetAmount(), true); } void HandleUpdatePeriodic(AuraEffect* aurEff) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index def7c8cbb..184e3b2e5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -421,7 +421,7 @@ public: break; case EVENT_TEXT_SPEACH22: if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA))) - sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_IMPRISONED, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_IMPRISONED, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); break; case EVENT_TEXT_SPEACH23: Talk(SAY_KJ_PHASE3); @@ -432,7 +432,7 @@ public: break; case EVENT_TEXT_SPEACH32: if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA))) - sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_LOST, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_LOST, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); break; case EVENT_TEXT_SPEACH33: Talk(SAY_KJ_PHASE4); @@ -443,7 +443,7 @@ public: break; case EVENT_TEXT_SPEACH42: if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA))) - sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_KALEC, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_KALEC, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); break; case EVENT_TEXT_SPEACH43: if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ))) @@ -451,7 +451,7 @@ public: break; case EVENT_TEXT_SPEACH44: if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA))) - sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_GOODBYE, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_GOODBYE, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); break; case EVENT_TEXT_SPEACH45: if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA))) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 4f72d5d4b..98bca7dfa 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -202,7 +202,7 @@ public: me->InterruptNonMeleeSpells(false); CloudGUID = 0; if (Cloud) - Unit::DealDamage(Cloud, Cloud, Cloud->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(Cloud, Cloud, Cloud->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); SetWeather(WEATHER_STATE_FINE, 0.0f); isRaining = false; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 198ab0cdd..b8a087362 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -327,7 +327,7 @@ public: { Unit* Temp = ObjectAccessor::GetUnit(*me, AddGUID[i]); if (Temp && Temp->IsAlive()) - Unit::DealDamage(Temp, Temp, Temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(Temp, Temp, Temp->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); } } @@ -956,7 +956,7 @@ public: void HandleDispel(DispelInfo* dispelInfo) { if (Unit* caster = GetCaster()) - caster->CastSpell(dispelInfo->GetDispeller(), SPELL_WL_UNSTABLE_AFFL_DISPEL, true, NULL, GetEffect(EFFECT_0)); + caster->CastSpell(dispelInfo->GetDispeller(), SPELL_WL_UNSTABLE_AFFL_DISPEL, true, nullptr, GetEffect(EFFECT_0)); } void Register() override diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 8215e51ff..2ed2547e3 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -170,7 +170,7 @@ public: void DoDie() { //summoner dies here - Unit::DealDamage(me, me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(me, me, me->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); //override any database `spawntimesecs` to prevent duplicated summons uint32 rTime = me->GetRespawnDelay(); if (rTime < 600) diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index c9aec13ef..f98b1fc54 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -183,7 +183,7 @@ public: if (Player* player = itr->GetSource()) { if (player->CanRewardQuest(qReward, false)) - player->RewardQuest(qReward, 0, NULL, false); + player->RewardQuest(qReward, 0, nullptr, false); } Map::PlayerList const& players = me->GetMap()->GetPlayers(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index ff5a3b411..ce4a3eb20 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -623,7 +623,7 @@ public: // If there are more than 30 Wisps then kill Archimonde if (WispCount >= 30) { - Unit::DealDamage(me, me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(me, me, me->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); return; // Finish the encounter and no more event repeat } DoSpawnCreature(CREATURE_ANCIENT_WISP, float(rand() % 40), float(rand() % 40), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 04f6ca1b8..cf56ba3c7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -189,7 +189,7 @@ public: if (target->GetPower(POWER_MANA) == 0) { - target->CastSpell(target, SPELL_MARK_DAMAGE, true, NULL, aurEff); + target->CastSpell(target, SPELL_MARK_DAMAGE, true, nullptr, aurEff); // Remove aura SetDuration(0); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index eff9ffa82..823cd70c8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -960,7 +960,7 @@ public: case EVENT_ACTION_PHASE3+6: if (Creature* cr = GetEventNpc(NPC_CITY_MAN)) { - cr->UpdateEntry(NPC_INFINITE_HUNTER, NULL, false); + cr->UpdateEntry(NPC_INFINITE_HUNTER, nullptr, false); cr->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); cr->SetReactState(REACT_PASSIVE); } @@ -969,7 +969,7 @@ public: case EVENT_ACTION_PHASE3+7: if (Creature* cr = GetEventNpc(NPC_CITY_MAN4)) { - cr->UpdateEntry(NPC_INFINITE_AGENT, NULL, false); + cr->UpdateEntry(NPC_INFINITE_AGENT, nullptr, false); cr->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); cr->SetReactState(REACT_PASSIVE); } @@ -978,7 +978,7 @@ public: case EVENT_ACTION_PHASE3+8: if (Creature* cr = GetEventNpc(NPC_CITY_MAN3)) { - cr->UpdateEntry(NPC_INFINITE_ADVERSARY, NULL, false); + cr->UpdateEntry(NPC_INFINITE_ADVERSARY, nullptr, false); cr->SetReactState(REACT_AGGRESSIVE); cr->SetInCombatWithZone(); cr->AddThreat(me, 0.0f); @@ -1573,7 +1573,7 @@ public: } else if (changeTimer >= 14500 && changeTimer < 20000) { - me->UpdateEntry(NPC_RISEN_ZOMBIE, NULL, false); + me->UpdateEntry(NPC_RISEN_ZOMBIE, nullptr, false); me->SetReactState(REACT_AGGRESSIVE); changeTimer = 20000; } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index a446a2927..84d139bcc 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -63,7 +63,7 @@ public: switch( go->GetEntry() ) { case GO_WHELP_SPAWNER: - go->CastSpell((Unit*)NULL, 17646); + go->CastSpell((Unit*)nullptr, 17646); if( Creature* onyxia = instance->GetCreature(m_uiOnyxiasGUID) ) onyxia->AI()->DoAction(-1); break; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 5da0e4106..7574e58ca 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -67,7 +67,7 @@ public: { _JustDied(); if (Creature* Ossirian = me->GetMap()->GetCreature(instance->GetData64(DATA_OSSIRIAN))) - sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 616c536c9..d908f608a 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -440,7 +440,7 @@ public: void JustRespawned() override { - me->UpdateEntry(RAND(NPC_AGED_KODO, NPC_DYING_KODO, NPC_ANCIENT_KODO), NULL, false); + me->UpdateEntry(RAND(NPC_AGED_KODO, NPC_DYING_KODO, NPC_ANCIENT_KODO), nullptr, false); } void MoveInLineOfSight(Unit* who) override @@ -463,7 +463,7 @@ public: if (!(caster->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) || me->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF)) && (me->GetEntry() == NPC_AGED_KODO || me->GetEntry() == NPC_DYING_KODO || me->GetEntry() == NPC_ANCIENT_KODO)) { - me->UpdateEntry(NPC_TAMED_KODO, NULL, false); + me->UpdateEntry(NPC_TAMED_KODO, nullptr, false); EnterEvadeMode(); me->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, me->GetFollowAngle()); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 363e02518..9470f8dd8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -178,7 +178,7 @@ public: case EVENT_HADRONOX_MOVE2: case EVENT_HADRONOX_MOVE3: Talk(SAY_HADRONOX_EMOTE); - me->GetMotionMaster()->MoveCharge(hadronoxSteps[eventId - 1].GetPositionX(), hadronoxSteps[eventId - 1].GetPositionY(), hadronoxSteps[eventId - 1].GetPositionZ(), 10.0f, 0, NULL, true); + me->GetMotionMaster()->MoveCharge(hadronoxSteps[eventId - 1].GetPositionX(), hadronoxSteps[eventId - 1].GetPositionY(), hadronoxSteps[eventId - 1].GetPositionZ(), 10.0f, 0, nullptr, true); break; } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 2002f37ca..d15371b11 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -650,7 +650,7 @@ public: } break; case EVENT_TWILIGHT_MENDING: - me->CastSpell((Unit*)NULL, SPELL_TWILIGHT_MENDING, true); + me->CastSpell((Unit*)nullptr, SPELL_TWILIGHT_MENDING, true); break; case EVENT_CHECK_CORPOREALITY: UpdateCorporeality(); @@ -751,7 +751,7 @@ public: void UpdateAI(uint32 /*diff*/) override { if (!me->HasUnitState(UNIT_STATE_CASTING)) - me->CastSpell((Unit*)NULL, SPELL_TRACK_ROTATION, false); + me->CastSpell((Unit*)nullptr, SPELL_TRACK_ROTATION, false); } void DoAction(int32 action) override @@ -1122,7 +1122,7 @@ public: { Unit* caster = GetCaster(); caster->CastSpell(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ(), SPELL_SUMMON_TWILIGHT_PORTAL, true); - caster->GetMap()->SummonCreature(NPC_TWILIGHT_HALION, caster->ToCreature()->GetHomePosition(), NULL, 0, caster); + caster->GetMap()->SummonCreature(NPC_TWILIGHT_HALION, caster->ToCreature()->GetHomePosition(), nullptr, 0, caster); } void Register() override @@ -1258,7 +1258,7 @@ public: void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); - GetUnitOwner()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true); + GetUnitOwner()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true); } void Register() override diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 6d936427a..04dfd8722 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -137,7 +137,7 @@ public: damage = me->GetHealth() - 1; if( me->getFaction() != 35 ) { - me->CastSpell((Unit*)NULL, 68575, true); // achievements + me->CastSpell((Unit*)nullptr, 68575, true); // achievements me->GetMap()->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, 68574, me); // paletress' spell credits encounter, but shouldn't credit achievements me->setFaction(35); events.Reset(); @@ -167,7 +167,7 @@ public: case 0: break; case EVENT_SPELL_RADIANCE: - me->CastSpell((Unit*)NULL, SPELL_RADIANCE, false); + me->CastSpell((Unit*)nullptr, SPELL_RADIANCE, false); me->MonsterTextEmote(TEXT_RADIATE, 0, true); events.RepeatEvent(16000); break; @@ -285,7 +285,7 @@ public: if( me->getFaction() != 35 ) { - me->CastSpell((Unit*)NULL, 68574, true); // achievements + me->CastSpell((Unit*)nullptr, 68574, true); // achievements me->setFaction(35); events.Reset(); Talk(TEXT_PALETRESS_DEATH); @@ -327,11 +327,11 @@ public: { me->InterruptNonMeleeSpells(true); Talk(TEXT_PALETRESS_MEMORY_SUMMON); - me->CastSpell((Unit*)NULL, SPELL_HOLY_NOVA, false); + me->CastSpell((Unit*)nullptr, SPELL_HOLY_NOVA, false); me->CastSpell(me, SPELL_SHIELD, false); - me->CastSpell((Unit*)NULL, SPELL_SUMMON_MEMORY, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_MEMORY, false); SummonMemory(); - me->CastSpell((Unit*)NULL, SPELL_CONFESS, false); + me->CastSpell((Unit*)nullptr, SPELL_CONFESS, false); events.ScheduleEvent(EVENT_SPELL_RENEW, urand(6000, 8000)); summoned = true; return; @@ -610,7 +610,7 @@ public: damage = me->GetHealth() - 1; events.DelayEvents(10000); me->CastSpell(me, SPELL_DIVINE_SHIELD_H, true); - me->CastSpell((Unit*)NULL, SPELL_FINAL_MEDITATION_H, true); + me->CastSpell((Unit*)nullptr, SPELL_FINAL_MEDITATION_H, true); } } @@ -678,7 +678,7 @@ public: events.RepeatEvent(urand(12000, 15000)); break; case EVENT_PRIESTESS_SPELL_FOUNTAIN_OF_LIGHT: - me->CastSpell((Unit*)NULL, SPELL_FOUNTAIN_OF_LIGHT, false); + me->CastSpell((Unit*)nullptr, SPELL_FOUNTAIN_OF_LIGHT, false); events.RepeatEvent(urand(35000, 45000)); break; case EVENT_PRIESTESS_SPELL_MIND_CONTROL_H: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 13be5e70d..e7e25821b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -161,7 +161,7 @@ public: pInstance->SetData(BOSS_BLACK_KNIGHT, IN_PROGRESS); Talk(TEXT_BK_AGGRO); - me->CastSpell((Unit*)NULL, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false); + me->CastSpell((Unit*)nullptr, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false); if( Creature* announcer = pInstance->instance->GetCreature(pInstance->GetData64(DATA_ANNOUNCER)) ) announcer->DespawnOrUnsummon(); @@ -265,7 +265,7 @@ public: events.RepeatEvent(urand(14000, 17000)); break; case EVENT_SPELL_DEATH_BITE: - me->CastSpell((Unit*)NULL, SPELL_DEATH_BITE, false); + me->CastSpell((Unit*)nullptr, SPELL_DEATH_BITE, false); events.RepeatEvent(urand(2000, 4000)); break; case EVENT_SPELL_MARKED_DEATH: @@ -301,7 +301,7 @@ public: void JustDied(Unit* /*killer*/) override { - me->CastSpell((Unit*)NULL, SPELL_BK_KILL_CREDIT, true); + me->CastSpell((Unit*)nullptr, SPELL_BK_KILL_CREDIT, true); Talk(TEXT_BK_DEATH); if( pInstance ) pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); @@ -327,7 +327,7 @@ public: void Reset() override { - Start(false, true, 0, NULL); + Start(false, true, 0, nullptr); SetDespawnAtEnd(true); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 00b70bf1c..a73df2f19 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -781,7 +781,7 @@ public: events.RepeatEvent(5000); break; case EVEMT_MAGE_SPELL_BLAST_WAVE: - me->CastSpell((Unit*)NULL, SPELL_BLAST_WAVE, false); + me->CastSpell((Unit*)nullptr, SPELL_BLAST_WAVE, false); events.RepeatEvent(13000); break; case EVEMT_MAGE_SPELL_HASTE: @@ -832,7 +832,7 @@ public: break; case EVENT_HUNTER_SPELL_LIGHTNING_ARROWS: - me->CastSpell((Unit*)NULL, SPELL_LIGHTNING_ARROWS, false); + me->CastSpell((Unit*)nullptr, SPELL_LIGHTNING_ARROWS, false); events.RepeatEvent(urand(20000, 25000)); break; case EVENT_HUNTER_SPELL_MULTI_SHOT: @@ -879,7 +879,7 @@ public: events.RepeatEvent(8000); break; case EVENT_ROGUE_SPELL_FAN_OF_KNIVES: - me->CastSpell((Unit*)NULL, SPELL_FAN_OF_KNIVES, false); + me->CastSpell((Unit*)nullptr, SPELL_FAN_OF_KNIVES, false); events.RepeatEvent(14000); break; case EVENT_ROGUE_SPELL_POISON_BOTTLE: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index cb9aa529e..21520395d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -605,7 +605,7 @@ public: c->GetMotionMaster()->MovePoint(9, 747.36f, 670.07f, 411.9f); if (!creditCasted) { - c->CastSpell((Unit*)NULL, 68572, true); + c->CastSpell((Unit*)nullptr, 68572, true); creditCasted = true; } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index bf7ab2085..aa5f7a623 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -246,7 +246,7 @@ public: events.CancelEvent(EVENT_EMERGE_2); if( !IsHeroic() ) events.CancelEvent(EVENT_SUMMON_NERUBIAN); - me->CastSpell((Unit*)NULL, SPELL_LEECHING_SWARM, false); + me->CastSpell((Unit*)nullptr, SPELL_LEECHING_SWARM, false); Talk(EMOTE_LEECHING_SWARM); Talk(SAY_LEECHING_SWARM); return; @@ -855,7 +855,7 @@ public: Remove(); return; } - target->CastSpell((Unit*)NULL, SPELL_IMPALE, true); + target->CastSpell((Unit*)nullptr, SPELL_IMPALE, true); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index bfa8179fd..25bfc72c2 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -446,9 +446,9 @@ public: break; case EVENT_SPELL_HEROISM_OR_BLOODLUST: if( me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION ) - me->CastSpell((Unit*)NULL, SPELL_HEROISM, true); + me->CastSpell((Unit*)nullptr, SPELL_HEROISM, true); else - me->CastSpell((Unit*)NULL, SPELL_BLOODLUST, true); + me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, true); events.RepeatEvent(600000); EventMapGCD(events, 1500); break; @@ -719,7 +719,7 @@ public: case EVENT_SPELL_PSYCHIC_SCREAM: if( HealthBelowPct(50) && EnemiesInRange(8.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_PSYCHIC_SCREAM, false); + me->CastSpell((Unit*)nullptr, SPELL_PSYCHIC_SCREAM, false); events.RepeatEvent(30000); EventMapGCD(events, 1500); } @@ -869,7 +869,7 @@ public: case EVENT_SPELL_PSYCHIC_SCREAM: if( EnemiesInRange(8.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_PSYCHIC_SCREAM, false); + me->CastSpell((Unit*)nullptr, SPELL_PSYCHIC_SCREAM, false); events.RepeatEvent(30000); EventMapGCD(events, 1500); } @@ -972,7 +972,7 @@ public: case EVENT_SPELL_HELLFIRE: if( EnemiesInRange(9.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_HELLFIRE, false); + me->CastSpell((Unit*)nullptr, SPELL_HELLFIRE, false); events.RepeatEvent(30000); EventMapGCD(events, 1500); } @@ -1117,7 +1117,7 @@ public: case EVENT_SPELL_ARCANE_EXPLOSION: if( EnemiesInRange(9.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_ARCANE_EXPLOSION, false); + me->CastSpell((Unit*)nullptr, SPELL_ARCANE_EXPLOSION, false); events.RepeatEvent(6000); EventMapGCD(events, 1500); } @@ -1127,7 +1127,7 @@ public: case EVENT_SPELL_BLINK: if( HealthBelowPct(50) && EnemiesInRange(10.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_FROST_NOVA, false); + me->CastSpell((Unit*)nullptr, SPELL_FROST_NOVA, false); events.RepeatEvent(15000); EventMapGCD(events, 1500); // blink disabled, fucking movement shit not working @@ -1462,7 +1462,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_FORCE_OF_NATURE: - me->CastSpell((Unit*)NULL, SPELL_FORCE_OF_NATURE, false); + me->CastSpell((Unit*)nullptr, SPELL_FORCE_OF_NATURE, false); events.RepeatEvent(180000); EventMapGCD(events, 1500); break; @@ -1566,7 +1566,7 @@ public: case EVENT_SPELL_INTIMIDATING_SHOUT: if( EnemiesInRange(8.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_INTIMIDATING_SHOUT, false); + me->CastSpell((Unit*)nullptr, SPELL_INTIMIDATING_SHOUT, false); events.RepeatEvent(120000); EventMapGCD(events, 1500); } @@ -2102,14 +2102,14 @@ public: break; case EVENT_SPELL_HEROISM_OR_BLOODLUST: if( me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION ) - me->CastSpell((Unit*)NULL, SPELL_HEROISM, true); + me->CastSpell((Unit*)nullptr, SPELL_HEROISM, true); else - me->CastSpell((Unit*)NULL, SPELL_BLOODLUST, true); + me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, true); events.RepeatEvent(600000); EventMapGCD(events, 1500); break; case EVENT_SUMMON_TOTEM: - me->CastSpell((Unit*)NULL, RAND(SPELL_GROUNDING_TOTEM, SPELL_WINDFURY_TOTEM, SPELL_TREMOR_TOTEM), false); + me->CastSpell((Unit*)nullptr, RAND(SPELL_GROUNDING_TOTEM, SPELL_WINDFURY_TOTEM, SPELL_TREMOR_TOTEM), false); events.RepeatEvent(30000); EventMapGCD(events, 1500); break; @@ -2231,7 +2231,7 @@ public: } if( EnemiesInRange(5.0f) >= 3 ) { - me->CastSpell((Unit*)NULL, SPELL_DIVINE_STORM, false); + me->CastSpell((Unit*)nullptr, SPELL_DIVINE_STORM, false); events.RepeatEvent(urand(10000, 15000)); EventMapGCD(events, 1500); } @@ -2474,7 +2474,7 @@ public: void HandleDispel(DispelInfo* dispelInfo) { if (Unit* caster = GetCaster()) - caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, NULL, GetEffect(EFFECT_0)); + caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, nullptr, GetEffect(EFFECT_0)); } void Register() override 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 9d7ead33c..1351e3ff6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -232,14 +232,14 @@ public: case EVENT_SUMMON_NETHER_PORTAL: Talk(EMOTE_NETHER_PORTAL); Talk(SAY_MISTRESS_OF_PAIN); - me->CastSpell((Unit*)NULL, SPELL_SUMMON_NETHER_PORTAL, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_NETHER_PORTAL, false); events.RescheduleEvent(EVENT_SUMMON_VOLCANO, 60000); break; case EVENT_SUMMON_VOLCANO: Talk(EMOTE_INFERNAL_ERUPTION); Talk(SAY_INFERNAL_ERUPTION); - me->CastSpell((Unit*)NULL, SPELL_SUMMON_VOLCANO, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_VOLCANO, false); events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 60000); break; @@ -410,7 +410,7 @@ public: events.RepeatEvent(urand(25000, 30000)); break; case EVENT_SPELL_MISTRESS_KISS: - me->CastSpell((Unit*)NULL, SPELL_MISTRESS_KISS, false); + me->CastSpell((Unit*)nullptr, SPELL_MISTRESS_KISS, false); events.RepeatEvent(urand(25000, 35000)); break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 2b34cca36..3edc1c3f1 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -149,7 +149,7 @@ public: break; case EVENT_SPELL_SNOBOLLED: if( t->GetTypeId() == TYPEID_PLAYER ) - me->CastSpell((Unit*)NULL, SPELL_SNOBOLLED, true); + me->CastSpell((Unit*)nullptr, SPELL_SNOBOLLED, true); break; case EVENT_SPELL_BATTER: @@ -290,7 +290,7 @@ public: events.RepeatEvent(2500); break; case EVENT_SPELL_STAGGERING_STOMP: - me->CastSpell((Unit*)NULL, SPELL_STAGGERING_STOMP, false); + me->CastSpell((Unit*)nullptr, SPELL_STAGGERING_STOMP, false); events.RepeatEvent(urand(20000, 25000)); break; case EVENT_PICK_SNOBOLD_TARGET: @@ -615,7 +615,7 @@ struct boss_jormungarAI : public ScriptedAI events.RepeatEvent(20000); break; case EVENT_SPELL_SWEEP: - me->CastSpell((Unit*)NULL, SPELL_SWEEP_0, false); + me->CastSpell((Unit*)nullptr, SPELL_SWEEP_0, false); events.RepeatEvent(urand(15000, 30000)); break; case EVENT_SPELL_BITE: @@ -833,7 +833,7 @@ public: if( !DoTrampleIfValid() ) { me->CastSpell(me, SPELL_STAGGERED_DAZE, true); - me->CastSpell((Unit*)NULL, SPELL_TRAMPLE, true); + me->CastSpell((Unit*)nullptr, SPELL_TRAMPLE, true); Talk(EMOTE_TRAMPLE_CRASH); events.DelayEvents(15000); } @@ -867,7 +867,7 @@ public: events.RepeatEvent(urand(15000, 30000)); break; case EVENT_SPELL_WHIRL: - me->CastSpell((Unit*)NULL, SPELL_WHIRL, false); + me->CastSpell((Unit*)nullptr, SPELL_WHIRL, false); events.RepeatEvent(urand(15000, 20000)); break; case EVENT_SPELL_ARCTIC_BREATH: @@ -888,7 +888,7 @@ public: break; case EVENT_SPELL_MASSIVE_CRASH: me->GetMotionMaster()->Clear(); - me->CastSpell((Unit*)NULL, SPELL_MASSIVE_CRASH, false); + me->CastSpell((Unit*)nullptr, SPELL_MASSIVE_CRASH, false); events.RescheduleEvent(EVENT_GAZE, 2000); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 46403f50f..56e32cc4c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -402,7 +402,7 @@ struct boss_twin_valkyrAI : public ScriptedAI switch( s ) { case 0: // light vortex - me->CastSpell((Unit*)NULL, SPELL_LIGHT_VORTEX, false); + me->CastSpell((Unit*)nullptr, SPELL_LIGHT_VORTEX, false); Talk(EMOTE_VORTEX); Talk(SAY_LIGHT); if( Creature* twin = GetSister() ) @@ -411,7 +411,7 @@ struct boss_twin_valkyrAI : public ScriptedAI case 1: // dark vortex if( Creature* twin = GetSister() ) { - twin->CastSpell((Unit*)NULL, SPELL_DARK_VORTEX, false); + twin->CastSpell((Unit*)nullptr, SPELL_DARK_VORTEX, false); twin->AI()->Talk(EMOTE_VORTEX); twin->AI()->Talk(SAY_NIGHT); Talk(SAY_NIGHT); @@ -835,7 +835,7 @@ public: CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL); int32 dmg = urand(2925, 3075) * (caster->GetMap()->GetDifficulty() - 1); if (caster->CanApplyResilience()) - Unit::ApplyResilience(plr, NULL, &dmg, false, CR_CRIT_TAKEN_SPELL); + Unit::ApplyResilience(plr, nullptr, &dmg, false, CR_CRIT_TAKEN_SPELL); uint32 damage = dmg; Unit::CalcAbsorbResist(caster, plr, GetSpellInfo()->GetSchoolMask(), DOT, damage, &absorb, &resist, GetSpellInfo()); Unit::DealDamageMods(plr, damage, &absorb); @@ -880,7 +880,7 @@ public: { me->AI()->DoAction(1); // despawning = true; me->GetMotionMaster()->MoveIdle(); - me->CastSpell((Unit*)NULL, me->GetEntry() == NPC_CONCENTRATED_LIGHT ? SPELL_UNLEASHED_LIGHT : SPELL_UNLEASHED_DARK, false); + me->CastSpell((Unit*)nullptr, me->GetEntry() == NPC_CONCENTRATED_LIGHT ? SPELL_UNLEASHED_LIGHT : SPELL_UNLEASHED_DARK, false); me->SetDisplayId(11686); me->DespawnOrUnsummon(1500); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 054820207..8c8955488 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -324,7 +324,7 @@ public: case TYPE_GORMOK: if( data == DONE ) { - if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], NULL, 25000)) + if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], nullptr, 25000)) { trigger->SetDisplayId(11686); trigger->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -346,7 +346,7 @@ public: { if( ++Counter == 2 ) { - if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], NULL, 25000)) + if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], nullptr, 25000)) { trigger->SetDisplayId(11686); trigger->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -533,7 +533,7 @@ public: events.RescheduleEvent(EVENT_SCENE_501, 20000); } if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) - floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true); + floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); } break; } @@ -1327,7 +1327,7 @@ public: { if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) floor->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED);//floor->ModifyHealth(-10000000, c); - c->CastSpell((Unit*)NULL, 68193, true); + c->CastSpell((Unit*)nullptr, 68193, true); c->SetVisible(false); c->SetDisplayId(11686); if( Creature* t = c->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f, true) ) @@ -1539,7 +1539,7 @@ public: case INSTANCE_PROGRESS_VALKYR_DEAD: case INSTANCE_PROGRESS_ANUB_ARAK: /*if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) - floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);*/ + floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true);*/ if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { if (InstanceProgress == INSTANCE_PROGRESS_ANUB_ARAK) @@ -1570,7 +1570,7 @@ public: break; case INSTANCE_PROGRESS_DONE: if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) - floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true); + floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) { c->SetVisible(false); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 5b1792213..9a23828ed 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -319,7 +319,7 @@ public: void HandleScript(SpellEffIndex /*effIndex*/) { for (uint8 i = 0; i < 4; ++i) - GetCaster()->CastSpell((Unit*)NULL, SPELL_COPY_OF_SUMMON_MINIONS, true); + GetCaster()->CastSpell((Unit*)nullptr, SPELL_COPY_OF_SUMMON_MINIONS, true); } void Register() override diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 3f8ed30e1..2531aa838 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -149,7 +149,7 @@ public: { Talk(SAY_FLESH); me->getThreatManager().resetAllAggro(); - me->CastSpell((Unit*)NULL, SPELL_TURN_FLESH, false); + me->CastSpell((Unit*)nullptr, SPELL_TURN_FLESH, false); events.Reset(); events.ScheduleEvent(EVENT_TURN_FLESH_REAL, 3000); @@ -246,7 +246,7 @@ public: PreventDefaultAction(); GetUnitOwner()->getThreatManager().resetAllAggro(); GetUnitOwner()->GetMotionMaster()->Clear(); - GetUnitOwner()->CastSpell((Unit*)NULL, SPELL_TURN_BONES, false); + GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false); GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index c77da57fb..0cd8f99eb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -115,7 +115,7 @@ public: break; case EVENT_DEFILING_HORROR: Talk(SAY_DEFILING_HORROR); - me->CastSpell((Unit*)NULL, SPELL_DEFILING_HORROR, false); + me->CastSpell((Unit*)nullptr, SPELL_DEFILING_HORROR, false); me->SetControlled(true, UNIT_STATE_ROOT); events.DelayEventsToMax(5000, 0); events.ScheduleEvent(EVENT_UNROOT, 4000); @@ -130,7 +130,7 @@ public: { if (uiHopelessnessCount) me->RemoveOwnedAura(hopelessnessId[uiHopelessnessCount - 1][DUNGEON_MODE(0, 1)]); - me->CastSpell((Unit*)NULL, hopelessnessId[uiHopelessnessCount][DUNGEON_MODE(0, 1)], true); + me->CastSpell((Unit*)nullptr, hopelessnessId[uiHopelessnessCount][DUNGEON_MODE(0, 1)], true); ++uiHopelessnessCount; } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 202fc5607..3efea2c2c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -114,7 +114,7 @@ public: break; case EVENT_CORRUPTED_FLESH: Talk(RAND(SAY_CORRUPTED_FLESH_1, SAY_CORRUPTED_FLESH_2)); - me->CastSpell((Unit*)NULL, SPELL_CORRUPTED_FLESH, false); + me->CastSpell((Unit*)nullptr, SPELL_CORRUPTED_FLESH, false); events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); break; case EVENT_SHARED_SUFFERING: @@ -180,7 +180,7 @@ public: ++count; ticks = (a->GetDuration() / int32(a->GetSpellInfo()->Effects[0].Amplitude)) + 1; int32 dmg = (ticks * dmgPerTick) / count; - caster->CastCustomSpell(GetTarget(), 72373, NULL, &dmg, NULL, true); + caster->CastCustomSpell(GetTarget(), 72373, nullptr, &dmg, nullptr, true); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 65e958ca2..86a057e44 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -864,7 +864,7 @@ public: void JustDied(Unit* /*who*/) override { - me->CastSpell((Unit*)NULL, SPELL_HALLUCINATION_2, false); + me->CastSpell((Unit*)nullptr, SPELL_HALLUCINATION_2, false); } void UpdateAI(uint32 diff) override @@ -1131,7 +1131,7 @@ public: events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); break; case EVENT_FROST_TRAP: - me->CastSpell((Unit*)NULL, SPELL_FROST_TRAP, false); + me->CastSpell((Unit*)nullptr, SPELL_FROST_TRAP, false); events.ScheduleEvent(EVENT_FROST_TRAP, 30000); break; case EVENT_ICE_SHOT: @@ -1201,7 +1201,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_ACTIVATE_REFLECTIONS: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_REFLECTIONS_DUMMY, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_REFLECTIONS_DUMMY, false); pInstance->SetData(ACTION_SPIRITUAL_REFLECTIONS_ACTIVATE, 1); break; case EVENT_THROW_SHIELD: @@ -1280,7 +1280,7 @@ public: void JustDied(Unit* /*killer*/) override { - me->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, false); + me->CastSpell((Unit*)nullptr, SPELL_SPIRIT_BURST, false); } void EnterEvadeMode() override @@ -1511,7 +1511,7 @@ public: leader->CastSpell(leader, SPELL_HOR_SUICIDE, true); Unit::Kill(me, leader); me->InterruptNonMeleeSpells(true); - me->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE, false); + me->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE, false); } break; case EVENT_LK_START_FOLLOWING: @@ -1581,13 +1581,13 @@ public: DoAction(ACTION_CHECK_TRASH_DIED); break; case EVENT_LK_SUMMON_GHOULS: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_RAGING_GHOULS, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_RAGING_GHOULS, false); break; case EVENT_LK_SUMMON_RWD: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_RISEN_WITCH_DOCTOR, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_RISEN_WITCH_DOCTOR, false); break; case EVENT_LK_SUMMON_LA: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_LUMBERING_ABOMINATION, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_LUMBERING_ABOMINATION, false); break; case EVENT_LK_SUMMON_NEXT_ICE_WALL: Talk(SAY_LK_IW_1 + currentWall); @@ -1776,7 +1776,7 @@ public: textId += 10; Talk(textId); if (currentStopPoint <= 4) - me->CastSpell((Unit*)NULL, (me->GetEntry() == NPC_JAINA_PART2 ? SPELL_DESTROY_WALL_JAINA : SPELL_DESTROY_WALL_SYLVANAS), false); + me->CastSpell((Unit*)nullptr, (me->GetEntry() == NPC_JAINA_PART2 ? SPELL_DESTROY_WALL_JAINA : SPELL_DESTROY_WALL_SYLVANAS), false); else { me->SetFacingTo(PathWaypoints[PATH_WP_COUNT - 1].GetOrientation()); @@ -1990,7 +1990,7 @@ public: PreventDefaultAction(); if (Unit* caster = GetCaster()) if (Creature* c = caster->SummonCreature(WORLD_TRIGGER, CannonFirePos[caster->GetEntry() == NPC_JAINA_PART2 ? 0 : 1][urand(0, 2)], TEMPSUMMON_TIMED_DESPAWN, 1)) - c->CastSpell((Unit*)NULL, 70021, true); + c->CastSpell((Unit*)nullptr, 70021, true); } void Register() override diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 338204127..ebe3b9d52 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -27,7 +27,7 @@ public: _owner.AI()->Talk(SAY_BATTERED_HILT_HALT); break; case 3: - _owner.CastSpell((Unit*)NULL, 69966, true); + _owner.CastSpell((Unit*)nullptr, 69966, true); _owner.AI()->Talk(SAY_BATTERED_HILT_REALIZE); if (InstanceScript* instance = _owner.GetInstanceScript()) instance->SetData(DATA_BATTERED_HILT, 4); @@ -76,7 +76,7 @@ public: _owner.m_Events.AddEvent(new UtherBatteredHiltEvent(_owner, _eventId + 1), _owner.m_Events.CalculateTime(5000)); break; case 13: - _owner.CastSpell((Unit*)NULL, 73036, true); + _owner.CastSpell((Unit*)nullptr, 73036, true); _owner.m_Events.AddEvent(new UtherBatteredHiltEvent(_owner, _eventId + 1), _owner.m_Events.CalculateTime(3000)); break; case 14: diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 62d005d4d..1c6ab845b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -232,7 +232,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 140.0f, true)) { WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, NULL, EMOTE_THROW_SARONITE); + ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, EMOTE_THROW_SARONITE); target->ToPlayer()->GetSession()->SendPacket(&data); me->CastSpell(target, SPELL_THROW_SARONITE, false); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index a3cd0e16f..c286c90db 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -108,7 +108,7 @@ public: { WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, NULL, EMOTE_ICK_CHASING); + ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, EMOTE_ICK_CHASING); target->ToPlayer()->GetSession()->SendPacket(&data); AttackStart(target); @@ -122,7 +122,7 @@ public: if (Vehicle* v = me->GetVehicleKit()) if (Unit* p = v->GetPassenger(0)) return p->ToCreature(); - return (Creature*)NULL; + return (Creature*)nullptr; } void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask) override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index e18d1b2d3..ce8764abd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -992,7 +992,7 @@ public: next->SetHealth(current->GetHealth()); current->AI()->DoAction(ACTION_REMOVE_INVOCATION); current->SetHealth(1); - current->CastSpell((Unit*)NULL, visualSpellId, true); + current->CastSpell((Unit*)nullptr, visualSpellId, true); next->AI()->Talk(1); } events.ScheduleEvent(EVENT_INVOCATION_OF_BLOOD, 46000); @@ -1437,7 +1437,7 @@ public: { if (GetTarget()->GetTypeId() == TYPEID_PLAYER && GetTarget()->isMoving()) { - GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, nullptr, aurEff); } } 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 35d9ac249..2ebeabf62 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 @@ -337,7 +337,7 @@ public: if (target) { me->CastSpell(target, SPELL_VAMPIRIC_BITE, false); - me->CastSpell((Unit*)NULL, SPELL_VAMPIRIC_BITE_DUMMY, true); + me->CastSpell((Unit*)nullptr, SPELL_VAMPIRIC_BITE_DUMMY, true); Talk(SAY_VAMPIRIC_BITE); SetGUID(target->GetGUID(), GUID_VAMPIRE); target->CastSpell(target, SPELL_PRESENCE_OF_THE_DARKFALLEN_DUMMY, TRIGGERED_FULL_MASK); @@ -817,7 +817,7 @@ public: { PreventDefaultAction(); int32 heal = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), aurEff->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), TRIGGERED_FULL_MASK, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), TRIGGERED_FULL_MASK, nullptr, aurEff); } void Register() override @@ -957,7 +957,7 @@ public: return; if (InstanceScript* instance = GetHitUnit()->GetInstanceScript()) - GetHitUnit()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_BLOOD_QUEEN_LANA_THEL)); + GetHitUnit()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_BLOOD_QUEEN_LANA_THEL)); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 254de2043..9f90a9754 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -423,7 +423,7 @@ public: break; case EVENT_BLOOD_NOVA: { - me->CastSpell((Unit*)NULL, SPELL_BLOOD_NOVA_TRIGGER, false); + me->CastSpell((Unit*)nullptr, SPELL_BLOOD_NOVA_TRIGGER, false); events.ScheduleEvent(EVENT_BLOOD_NOVA, urand(20000, 25000)); break; } @@ -432,7 +432,7 @@ public: events.ScheduleEvent(EVENT_RUNE_OF_BLOOD, urand(20000, 25000)); break; case EVENT_BOILING_BLOOD: - me->CastSpell((Unit*)NULL, SPELL_BOILING_BLOOD, false); + me->CastSpell((Unit*)nullptr, SPELL_BOILING_BLOOD, false); events.ScheduleEvent(EVENT_BOILING_BLOOD, urand(15000, 20000)); break; case EVENT_BERSERK: 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 2b4be7884..67494c6b9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1445,7 +1445,7 @@ void TriggerBurningPitch(Creature* c) uint32 spellId = i->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_BURNING_PITCH_A : SPELL_BURNING_PITCH_H; if (!c->HasSpellCooldown(spellId)) { - c->CastSpell((Unit*)NULL, spellId, false); + c->CastSpell((Unit*)nullptr, spellId, false); c->_AddCreatureSpellCooldown(spellId, urand(3000, 4000)); } } @@ -1763,11 +1763,11 @@ public: me->SetInCombatWithZone(); me->AddThreat(player, 1.0f); } - me->CastSpell((Unit*)NULL, SPELL_BELOW_ZERO, false); + me->CastSpell((Unit*)nullptr, SPELL_BELOW_ZERO, false); break; case SLOT_MAGE_1: case SLOT_MAGE_2: - me->CastSpell((Unit*)NULL, SPELL_SHADOW_CHANNELING, false); + me->CastSpell((Unit*)nullptr, SPELL_SHADOW_CHANNELING, false); break; default: break; @@ -1911,7 +1911,7 @@ public: if (me->HasSpellCooldown(spellId)) return; - me->CastSpell((Unit*)NULL, spellId, true); + me->CastSpell((Unit*)nullptr, spellId, true); me->_AddCreatureSpellCooldown(spellId, 9000); } @@ -1954,8 +1954,8 @@ public: void HandleRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { SpellInfo const* damageInfo = sSpellMgr->GetSpellInfo(SPELL_ROCKET_PACK_DAMAGE); - GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude()), NULL, true); - GetTarget()->CastSpell((Unit*)NULL, SPELL_ROCKET_BURST, true); + GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude()), nullptr, true); + GetTarget()->CastSpell((Unit*)nullptr, SPELL_ROCKET_BURST, true); } void Register() override @@ -2509,7 +2509,7 @@ public: void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->CastCustomSpell(uint32(GetEffectValue()), SPELLVALUE_BASE_POINT0, 8000, NULL, TRIGGERED_FULL_MASK); + GetCaster()->CastCustomSpell(uint32(GetEffectValue()), SPELLVALUE_BASE_POINT0, 8000, nullptr, TRIGGERED_FULL_MASK); GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BURNING_PITCH, TRIGGERED_FULL_MASK); } @@ -2597,7 +2597,7 @@ public: void DamageGunship(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) - GetCaster()->CastCustomSpell(instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_BURNING_PITCH_DAMAGE_A : SPELL_BURNING_PITCH_DAMAGE_H, SPELLVALUE_BASE_POINT0, 5000, NULL, TRIGGERED_FULL_MASK); + GetCaster()->CastCustomSpell(instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_BURNING_PITCH_DAMAGE_A : SPELL_BURNING_PITCH_DAMAGE_H, SPELLVALUE_BASE_POINT0, 5000, nullptr, TRIGGERED_FULL_MASK); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 5f7216539..f0343d038 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -170,7 +170,7 @@ public: break; case EVENT_SPELL_COLDFLAME: if (!me->HasAura(SPELL_BONE_STORM)) - me->CastSpell((Unit*)NULL, SPELL_COLDFLAME_NORMAL, false); + me->CastSpell((Unit*)nullptr, SPELL_COLDFLAME_NORMAL, false); events.RepeatEvent(5000); break; case EVENT_SPELL_COLDFLAME_BONE_STORM: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index db0575e0f..40ce72a1a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -335,7 +335,7 @@ public: if (Is25ManRaid() && me->HasAura(SPELL_SHADOWS_FATE)) DoCastAOE(SPELL_UNHOLY_INFUSION_CREDIT, true); // ReqTargetAura in dbc - me->CastSpell((Unit*)NULL, SPELL_MUTATED_PLAGUE_CLEAR, true); + me->CastSpell((Unit*)nullptr, SPELL_MUTATED_PLAGUE_CLEAR, true); } void JustSummoned(Creature* summon) override @@ -1204,7 +1204,7 @@ public: int32 damage = spell->Effects[EFFECT_0].CalcValue(caster); damage = damage * pow(2.5f, GetStackAmount()); - GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true, nullptr, aurEff, GetCasterGUID()); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 4b400acba..ad4883690 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -233,7 +233,7 @@ public: { uint32 index = getOozeFloodSpellIndex(spell->Id); if (target->GetGUID() == _oozeFloodDummyGUIDs[index][0] || target->GetGUID() == _oozeFloodDummyGUIDs[index][1]) - target->CastSpell((Unit*)NULL, spell->Effects[0].CalcValue(), false); + target->CastSpell((Unit*)nullptr, spell->Effects[0].CalcValue(), false); } break; } @@ -281,14 +281,14 @@ public: } break; case EVENT_MUTATED_INFECTION: - me->CastCustomSpell(SPELL_MUTATED_INFECTION, SPELLVALUE_MAX_TARGETS, 1, NULL, false); + me->CastCustomSpell(SPELL_MUTATED_INFECTION, SPELLVALUE_MAX_TARGETS, 1, nullptr, false); events.ScheduleEvent(EVENT_MUTATED_INFECTION, infectionCooldown); break; case EVENT_ROTFACE_OOZE_FLOOD: if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE))) { professor->AI()->Talk(SAY_ROTFACE_OOZE_FLOOD); - me->CastSpell((Unit*)NULL, oozeFloodSpells[_oozeFloodStage], true); + me->CastSpell((Unit*)nullptr, oozeFloodSpells[_oozeFloodStage], true); if (++_oozeFloodStage == 4) _oozeFloodStage = 0; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 331af5e89..d33b5864e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -178,7 +178,7 @@ public: bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override { - _owner->CastSpell((Unit*)NULL, SPELL_FROST_BOMB, false, nullptr, nullptr, _sindragosaGUID); + _owner->CastSpell((Unit*)nullptr, SPELL_FROST_BOMB, false, nullptr, nullptr, _sindragosaGUID); _owner->RemoveAurasDueToSpell(SPELL_FROST_BOMB_VISUAL); return true; } @@ -560,11 +560,11 @@ public: break; case EVENT_UNCHAINED_MAGIC: Talk(SAY_UNCHAINED_MAGIC); - me->CastSpell((Unit*)NULL, SPELL_UNCHAINED_MAGIC, false); + me->CastSpell((Unit*)nullptr, SPELL_UNCHAINED_MAGIC, false); events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(30000, 35000), EVENT_GROUP_LAND_PHASE); break; case EVENT_ICY_GRIP: - me->CastSpell((Unit*)NULL, SPELL_ICY_GRIP, false); + me->CastSpell((Unit*)nullptr, SPELL_ICY_GRIP, false); events.DelayEventsToMax(1001, 0); events.ScheduleEvent(EVENT_BLISTERING_COLD, 1000, EVENT_GROUP_LAND_PHASE); if (uint32 evTime = events.GetNextEventTime(EVENT_ICE_TOMB)) @@ -1020,7 +1020,7 @@ public: void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) - GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff, GetCasterGUID()); } void Register() override 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 eec1bf272..31b7560e6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -452,7 +452,7 @@ public: switch (go->GetEntry()) { case GO_ARTHAS_PLATFORM: - go->SetDestructibleState(GO_DESTRUCTIBLE_INTACT, NULL, true); + go->SetDestructibleState(GO_DESTRUCTIBLE_INTACT, nullptr, true); break; case GO_DOODAD_ICECROWN_THRONEFROSTYWIND01: go->SetGoState(GO_STATE_ACTIVE); @@ -509,7 +509,7 @@ public: { _owner->SetReactState(REACT_AGGRESSIVE); _owner->CastSpell(_owner, SPELL_VILE_SPIRIT_MOVE_SEARCH, true); - _owner->CastSpell((Unit*)NULL, SPELL_VILE_SPIRIT_DAMAGE_SEARCH, true); + _owner->CastSpell((Unit*)nullptr, SPELL_VILE_SPIRIT_DAMAGE_SEARCH, true); return true; } @@ -527,7 +527,7 @@ public: bool Execute(uint64 /*time*/, uint32 /*diff*/) override { - _owner->CastCustomSpell(SPELL_TRIGGER_VILE_SPIRIT_HEROIC, SPELLVALUE_MAX_TARGETS, 1, NULL, true); + _owner->CastCustomSpell(SPELL_TRIGGER_VILE_SPIRIT_HEROIC, SPELLVALUE_MAX_TARGETS, 1, nullptr, true); if (--_counter) { @@ -566,7 +566,7 @@ public: bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override { - _owner.CastSpell((Unit*)NULL, SPELL_PLAY_MOVIE, false); + _owner.CastSpell((Unit*)nullptr, SPELL_PLAY_MOVIE, false); return true; } @@ -726,8 +726,8 @@ public: events.ScheduleEvent(EVENT_START_ATTACK, 5250); break; case ACTION_BREAK_FROSTMOURNE: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE, true); - me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE_2, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE, true); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE_2, false); SetEquipmentSlots(false, EQUIP_BROKEN_FROSTMOURNE); if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) tirion->AI()->DoAction(ACTION_BREAK_FROSTMOURNE); @@ -788,7 +788,7 @@ public: me->AttackStop(); me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_FURY_OF_FROSTMOURNE); me->InterruptNonMeleeSpells(true); - me->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE, false); + me->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE, false); me->SetWalk(true); if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) @@ -1008,7 +1008,7 @@ public: me->InterruptNonMeleeSpells(false); me->ClearUnitState(UNIT_STATE_CASTING); me->SetFacingTo(0.0f); - me->CastSpell((Unit*)NULL, SPELL_QUAKE, false); + me->CastSpell((Unit*)nullptr, SPELL_QUAKE, false); me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL); Talk(SAY_LK_QUAKE); break; @@ -1023,7 +1023,7 @@ public: me->InterruptNonMeleeSpells(false); me->ClearUnitState(UNIT_STATE_CASTING); me->SetFacingTo(0.0f); - me->CastSpell((Unit*)NULL, SPELL_QUAKE, false); + me->CastSpell((Unit*)nullptr, SPELL_QUAKE, false); me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL); Talk(SAY_LK_QUAKE); break; @@ -1067,7 +1067,7 @@ public: events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, (IsHeroic() ? urand(1250, 1750) : urand(1750, 2250)), EVENT_GROUP_ABILITIES); break; case EVENT_SUMMON_ICE_SPHERE: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_ICE_SPHERE, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_ICE_SPHERE, false); events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 7500, EVENT_GROUP_ABILITIES); break; case EVENT_SUMMON_RAGING_SPIRIT: @@ -1124,7 +1124,7 @@ public: { me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL); Talk(SAY_LK_SUMMON_VALKYR); - me->CastSpell((Unit*)NULL, SUMMON_VALKYR, false); + me->CastSpell((Unit*)nullptr, SUMMON_VALKYR, false); events.ScheduleEvent(EVENT_SUMMON_VALKYR, 45000, EVENT_GROUP_ABILITIES); // schedule a defile (or reschedule it) if next defile event @@ -1139,7 +1139,7 @@ public: break; case EVENT_VILE_SPIRITS: me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL); - me->CastSpell((Unit*)NULL, SPELL_VILE_SPIRITS, false); + me->CastSpell((Unit*)nullptr, SPELL_VILE_SPIRITS, false); events.ScheduleEvent(EVENT_VILE_SPIRITS, 30000, EVENT_GROUP_VILE_SPIRITS); break; case EVENT_HARVEST_SOUL: @@ -1154,7 +1154,7 @@ public: break; case EVENT_HARVEST_SOULS: Talk(SAY_LK_HARVEST_SOUL); - me->CastSpell((Unit*)NULL, SPELL_HARVEST_SOULS, false); + me->CastSpell((Unit*)nullptr, SPELL_HARVEST_SOULS, false); _phase = PHASE_FROSTMOURNE; me->SetReactState(REACT_PASSIVE); me->AttackStop(); @@ -1188,7 +1188,7 @@ public: break; case EVENT_FROSTMOURNE_HEROIC: _bFrostmournePhase = true; - if (TempSummon* terenas = me->GetMap()->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE_H, TerenasSpawnHeroic, NULL, 55000)) + if (TempSummon* terenas = me->GetMap()->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE_H, TerenasSpawnHeroic, nullptr, 55000)) { terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); if (Creature* spawner = terenas->FindNearestCreature(NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f, true)) @@ -1246,7 +1246,7 @@ public: EntryCheckPredicate pred(NPC_STRANGULATE_VEHICLE); summons.DoAction(ACTION_TELEPORT_BACK, pred); instance->SetBossState(DATA_THE_LICH_KING, FAIL); - me->CastSpell((Unit*)NULL, SPELL_KILL_FROSTMOURNE_PLAYERS, true); + me->CastSpell((Unit*)nullptr, SPELL_KILL_FROSTMOURNE_PLAYERS, true); BossAI::EnterEvadeMode(); me->SetReactState(REACT_AGGRESSIVE); @@ -1414,7 +1414,7 @@ public: if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { theLichKing->AI()->Talk(SAY_LK_INTRO_3); - theLichKing->CastSpell((Unit*)NULL, SPELL_ICE_LOCK, false); + theLichKing->CastSpell((Unit*)nullptr, SPELL_ICE_LOCK, false); _events.ScheduleEvent(EVENT_INTRO_FINISH, 1000); } break; @@ -1455,7 +1455,7 @@ public: if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { theLichKing->AI()->Talk(SAY_LK_OUTRO_1); - theLichKing->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE_NO_REZ, true); + theLichKing->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE_NO_REZ, true); Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if (Player* p = itr->GetSource()) @@ -1467,7 +1467,7 @@ public: if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { theLichKing->AI()->Talk(SAY_LK_OUTRO_2); - theLichKing->CastSpell((Unit*)NULL, SPELL_EMOTE_QUESTION_NO_SHEATH, false); + theLichKing->CastSpell((Unit*)nullptr, SPELL_EMOTE_QUESTION_NO_SHEATH, false); } break; case EVENT_OUTRO_LK_EMOTE_TALK: @@ -1502,7 +1502,7 @@ public: case EVENT_OUTRO_LK_RAISE_DEAD: if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { - theLichKing->CastSpell((Unit*)NULL, SPELL_RAISE_DEAD, false); + theLichKing->CastSpell((Unit*)nullptr, SPELL_RAISE_DEAD, false); theLichKing->ClearUnitState(UNIT_STATE_CASTING); me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_FINAL); } @@ -1523,7 +1523,7 @@ public: theLichKing->AI()->Talk(SAY_LK_OUTRO_6); me->SetFacingToObject(theLichKing); theLichKing->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, EQUIP_UNEQUIP); - theLichKing->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE_3, true); + theLichKing->CastSpell((Unit*)nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE_3, true); me->GetMap()->SetZoneOverrideLight(AREA_THE_FROZEN_THRONE, LIGHT_SOULSTORM, 10000); me->GetMap()->SetZoneWeather(AREA_THE_FROZEN_THRONE, WEATHER_STATE_BLACKSNOW, 0.5f); @@ -1534,16 +1534,16 @@ public: break; case EVENT_OUTRO_AFTER_SUMMON_BROKEN_FROSTMOURNE: if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) - frostmourne->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE, true); + frostmourne->CastSpell((Unit*)nullptr, SPELL_BROKEN_FROSTMOURNE, true); break; case EVENT_OUTRO_KNOCK_BACK: if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) - frostmourne->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE_KNOCK, false); + frostmourne->CastSpell((Unit*)nullptr, SPELL_BROKEN_FROSTMOURNE_KNOCK, false); break; case EVENT_OUTRO_SOUL_BARRAGE: if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { - theLichKing->CastSpell((Unit*)NULL, SPELL_SOUL_BARRAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS); + theLichKing->CastSpell((Unit*)nullptr, SPELL_SOUL_BARRAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS); sCreatureTextMgr->SendSound(theLichKing, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_NEUTRAL, false); theLichKing->SetDisableGravity(true); theLichKing->SetByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); @@ -1559,7 +1559,7 @@ public: case EVENT_OUTRO_SUMMON_TERENAS: if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) { - frostmourne->CastSpell((Unit*)NULL, SPELL_SUMMON_TERENAS, false); + frostmourne->CastSpell((Unit*)nullptr, SPELL_SUMMON_TERENAS, false); if (Creature* terenas = me->FindNearestCreature(NPC_TERENAS_MENETHIL_OUTRO, 50.0f)) terenas->SetFacingToObject(frostmourne); } @@ -1574,7 +1574,7 @@ public: if (Creature* terenas = me->FindNearestCreature(NPC_TERENAS_MENETHIL_OUTRO, 50.0f)) { terenas->AI()->Talk(SAY_TERENAS_OUTRO_2); - terenas->CastSpell((Unit*)NULL, SPELL_MASS_RESURRECTION, false); + terenas->CastSpell((Unit*)nullptr, SPELL_MASS_RESURRECTION, false); if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { lichKing->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC); @@ -1615,7 +1615,7 @@ public: me->GetMotionMaster()->MovePoint(POINT_TIRION_OUTRO, OutroPosition1); break; case EVENT_OUTRO_FORDRING_JUMP: - me->CastSpell((Unit*)NULL, SPELL_JUMP, false); + me->CastSpell((Unit*)nullptr, SPELL_JUMP, false); break; default: @@ -1710,7 +1710,7 @@ public: PreventHitDefaultEffect(effIndex); GetHitUnit()->RemoveAurasDueToSpell(SPELL_RAISE_DEAD); GetHitUnit()->InterruptNonMeleeSpells(true); - GetHitUnit()->CastSpell((Unit*)NULL, SPELL_JUMP_2, true); + GetHitUnit()->CastSpell((Unit*)nullptr, SPELL_JUMP_2, true); if (Creature* creature = GetHitCreature()) creature->AI()->DoAction(ACTION_BREAK_FROSTMOURNE); } @@ -1932,7 +1932,7 @@ public: CustomSpellValues values; if (dispel) values.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1) - GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID()); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID()); if (Unit* caster = GetCaster()) caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); @@ -2039,7 +2039,7 @@ public: CustomSpellValues values; values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); - GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID()); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID()); if (Unit* caster = GetCaster()) caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); } @@ -2058,7 +2058,7 @@ public: CustomSpellValues values; values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); values.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1) - GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID()); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID()); if (Unit* caster = GetCaster()) caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); @@ -2128,7 +2128,7 @@ public: if (targets.empty()) return; - GetCaster()->CastSpell((Unit*)NULL, SPELL_SHADOW_TRAP_KNOCKBACK, true); + GetCaster()->CastSpell((Unit*)nullptr, SPELL_SHADOW_TRAP_KNOCKBACK, true); if (Aura* a = GetCaster()->GetAura(SPELL_SHADOW_TRAP_AURA)) a->SetDuration(0); if (GetCaster()->GetTypeId() == TYPEID_UNIT) @@ -2522,7 +2522,7 @@ public: void GoSiphon() { didbelow50pct = true; - me->CastSpell((Unit*)NULL, SPELL_EJECT_ALL_PASSENGERS, false); + me->CastSpell((Unit*)nullptr, SPELL_EJECT_ALL_PASSENGERS, false); float dist = rand_norm() * 10.0f + 5.0f; float angle = CenterPosition.GetAngle(me); _destPoint.Relocate(CenterPosition.GetPositionX() + dist * cos(angle), CenterPosition.GetPositionY() + dist * sin(angle), 855.0f + frand(0.0f, 4.0f), 0.0f); @@ -2611,7 +2611,7 @@ public: if (Vehicle* v = me->GetVehicleKit()) if (Unit* passenger = v->GetPassenger(0)) p = passenger->ToPlayer();*/ - me->CastSpell((Unit*)NULL, SPELL_EJECT_ALL_PASSENGERS, false); + me->CastSpell((Unit*)nullptr, SPELL_EJECT_ALL_PASSENGERS, false); if (IsHeroic()) GoSiphon(); @@ -2650,7 +2650,7 @@ public: case EVENT_GRAB_PLAYER: if (!_grabbedPlayer) { - me->CastSpell((Unit*)NULL, SPELL_VALKYR_TARGET_SEARCH, false); + me->CastSpell((Unit*)nullptr, SPELL_VALKYR_TARGET_SEARCH, false); _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000); } break; @@ -2929,7 +2929,7 @@ public: void OnPeriodic(AuraEffect const* aurEff) { if (_is25Man || ((aurEff->GetTickNumber() - 1) % 5)) - GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, nullptr, aurEff, GetCasterGUID()); } void Register() override @@ -3045,7 +3045,7 @@ public: c->RemoveAurasDueToSpell(SPELL_VILE_SPIRIT_DAMAGE_SEARCH); c->GetMotionMaster()->Clear(true); c->StopMoving(); - c->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, true); + c->CastSpell((Unit*)nullptr, SPELL_SPIRIT_BURST, true); c->DespawnOrUnsummon(3000); c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } @@ -3081,7 +3081,7 @@ public: { // m_originalCaster to allow stacking from different casters, meh if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH) - GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); + GetTarget()->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); } void Register() override @@ -3159,17 +3159,17 @@ public: if (summoner->GetTypeId() == TYPEID_PLAYER && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) { if (buff) - summoner->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING)); + summoner->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING)); me->CastSpell(summoner, SPELL_HARVEST_SOUL_TELEPORT_BACK, false); } else if (buff) - me->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING)); + me->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING)); summoner->RemoveAurasDueToSpell(IsHeroic() ? SPELL_HARVEST_SOULS_TELEPORT : SPELL_HARVEST_SOUL_TELEPORT); } else - me->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING)); + me->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING)); } _events.Reset(); @@ -3194,7 +3194,7 @@ public: { if (summoner->IsAlive() && summoner->GetTypeId() == TYPEID_PLAYER) { - summoner->CastSpell((Unit*)NULL, SPELL_HARVEST_SOUL_VISUAL, true); + summoner->CastSpell((Unit*)nullptr, SPELL_HARVEST_SOUL_VISUAL, true); summoner->ExitVehicle(summoner); me->UpdatePosition(me->GetPositionX(), me->GetPositionY(), 840.87f, me->GetOrientation(), true); me->StopMovingOnCurrentPos(); @@ -3272,7 +3272,7 @@ public: if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { _events.Reset(); - me->CastSpell((Unit*)NULL, SPELL_RESTORE_SOUL, false); + me->CastSpell((Unit*)nullptr, SPELL_RESTORE_SOUL, false); me->DespawnOrUnsummon(3000); } break; @@ -3292,7 +3292,7 @@ public: _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000); if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) { - warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, false); + warden->CastSpell((Unit*)nullptr, SPELL_DESTROY_SOUL, false); warden->DespawnOrUnsummon(2000); } me->CastSpell(me, SPELL_TERENAS_LOSES_INSIDE, false); @@ -3317,7 +3317,7 @@ public: me->SetControlled(false, UNIT_STATE_ROOT); Talk(SAY_TERENAS_INTRO_1); if (IsHeroic()) - me->CastSpell((Unit*)NULL, SPELL_RESTORE_SOULS, false); + me->CastSpell((Unit*)nullptr, SPELL_RESTORE_SOULS, false); break; case EVENT_FROSTMOURNE_TALK_2: Talk(SAY_TERENAS_INTRO_2); @@ -3327,7 +3327,7 @@ public: break; case EVENT_DESTROY_SOUL: if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) - warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, false); + warden->CastSpell((Unit*)nullptr, SPELL_DESTROY_SOUL, false); me->CastSpell(me, SPELL_TERENAS_LOSES_INSIDE, false); me->SetDisplayId(16946); me->SetReactState(REACT_PASSIVE); @@ -3523,7 +3523,7 @@ public: { PreventDefaultAction(); int32 heal = int32(eventInfo.GetDamageInfo()->GetDamage() / 2); - GetTarget()->CastCustomSpell(SPELL_DARK_HUNGER_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_DARK_HUNGER_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, nullptr, aurEff); } void Register() override @@ -3552,7 +3552,7 @@ public: PreventDefaultAction(); // shouldn't be needed, this is channeled if (Unit* caster = GetCaster()) - caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); + caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, nullptr, aurEff, GetCasterGUID()); } void Register() override @@ -3600,7 +3600,7 @@ public: void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetHitUnit()->CastSpell((Unit*)NULL, uint32(GetEffectValue()), true); + GetHitUnit()->CastSpell((Unit*)nullptr, uint32(GetEffectValue()), true); } void Register() override @@ -3657,7 +3657,7 @@ public: { timer = 0; me->RemoveAllAuras(); - me->CastSpell((Unit*)NULL, SPELL_EXPLOSION, false); + me->CastSpell((Unit*)nullptr, SPELL_EXPLOSION, false); me->DespawnOrUnsummon(1000); } else diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index b867066ba..1c4e230bd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -333,7 +333,7 @@ public: _instance->DoRemoveAurasDueToSpellOnPlayers(70766); me->RemoveAurasDueToSpell(SPELL_CORRUPTION_VALITHRIA); me->CastSpell(me, SPELL_ACHIEVEMENT_CHECK, true); - me->CastSpell((Unit*)NULL, SPELL_DREAMWALKERS_RAGE, false); + me->CastSpell((Unit*)nullptr, SPELL_DREAMWALKERS_RAGE, false); _events.Reset(); _events.ScheduleEvent(EVENT_DREAM_SLIP, 3500); _instance->SetBossState(DATA_VALITHRIA_DREAMWALKER, DONE); @@ -977,7 +977,7 @@ public: return; if (!me->HasUnitState(UNIT_STATE_CASTING) && !me->isMoving() && me->IsWithinMeleeRange(me->GetVictim())) - me->CastSpell((Unit*)NULL, SPELL_SUPPRESSION, false); + me->CastSpell((Unit*)nullptr, SPELL_SUPPRESSION, false); } }; @@ -1169,7 +1169,7 @@ public: return; if (InstanceScript* instance = GetHitUnit()->GetInstanceScript()) - GetHitUnit()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_VALITHRIA_DREAMWALKER)); + GetHitUnit()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_VALITHRIA_DREAMWALKER)); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index d406f9729..fedf21546 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1691,7 +1691,7 @@ public: case 0: break; case 1: // Ice Trap - me->CastSpell((Unit*)NULL, 71249, false); + me->CastSpell((Unit*)nullptr, 71249, false); events.RepeatEvent(urand(35000, 40000)); break; case 2: // Rapid Shot @@ -1734,7 +1734,7 @@ public: events.RepeatEvent(urand(40000, 50000)); break; case 33: // Twisted Winds - me->CastSpell((Unit*)NULL, 71306, false); + me->CastSpell((Unit*)nullptr, 71306, false); events.RepeatEvent(urand(35000, 50000)); break; case 41: // Empowered Shadow Bolt @@ -2536,7 +2536,7 @@ public: void HandleDummy() { for (uint8 i = 0; i < 10; ++i) - GetCaster()->CastSpell((Unit*)NULL, 70963, true); + GetCaster()->CastSpell((Unit*)nullptr, 70963, true); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 3f2e762cb..70286973a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1590,7 +1590,7 @@ public: return; stalkers.sort(acore::ObjectDistanceOrderPred(teleporter)); - stalkers.front()->CastSpell((Unit*)NULL, SPELL_ARTHAS_TELEPORTER_CEREMONY, false); + stalkers.front()->CastSpell((Unit*)nullptr, SPELL_ARTHAS_TELEPORTER_CEREMONY, false); stalkers.pop_front(); for (std::list::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) (*itr)->AI()->Reset(); @@ -1749,7 +1749,7 @@ public: } case EVENT_REBUILD_PLATFORM: if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) - platform->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true); + platform->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); if (GameObject* edge = instance->GetGameObject(FrozenThroneEdgeGUID)) edge->SetGoState(GO_STATE_READY); if (GameObject* wind = instance->GetGameObject(FrozenThroneWindGUID)) @@ -1815,7 +1815,7 @@ public: } break; case EVENT_TELEPORT_TO_FROSMOURNE: // Harvest Soul (normal mode) - if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, NULL, 65000)) + if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, nullptr, 65000)) { terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); std::list triggers; @@ -1827,7 +1827,7 @@ public: visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true); } - if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, NULL, 65000)) + if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, nullptr, 65000)) { terenas->AI()->AttackStart(warden); warden->AddThreat(terenas, 300000.0f); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 93d28b025..5bb6802f7 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -219,7 +219,7 @@ public: me->DisableSpline(); me->SetFacingTo(ZapAngle); me->SetControlled(true, UNIT_STATE_ROOT); - me->CastSpell((Unit*)NULL, SPELL_ENERGIZE_CORES, false); + me->CastSpell((Unit*)nullptr, SPELL_ENERGIZE_CORES, false); ZapAngle += M_PI / 2; if( ZapAngle >= 2 * M_PI ) ZapAngle -= 2 * M_PI; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index b81aaf92f..4a098444d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -125,7 +125,7 @@ public: AddWaypoint(13, 1281.2f, -26.8f, 33.5f, 0); AddWaypoint(14, 1262, -26.9f, 33.5f, 0); - Start(true, false, 0, NULL, false, true); + Start(true, false, 0, nullptr, false, true); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 12d722b61..654fbd92d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -136,7 +136,7 @@ public: } case EVENT_SHATTER: { - me->CastSpell((Unit*)NULL, DUNGEON_MODE(SHATTER, SHATTER_H), false); + me->CastSpell((Unit*)nullptr, DUNGEON_MODE(SHATTER, SHATTER_H), false); Talk(SAY_SHATTER); events.RescheduleEvent(EVENT_REMOVE_STONED, 1500); break; @@ -179,7 +179,7 @@ public: if (Unit* target = GetHitUnit()) { target->RemoveAurasDueToSpell(GROUND_SLAM_STONED_EFFECT); - target->CastSpell((Unit*)NULL, SPELL_SHATTER_EFFECT, true); + target->CastSpell((Unit*)nullptr, SPELL_SHATTER_EFFECT, true); } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index bdefc931e..6a0992894 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -523,9 +523,9 @@ public: me->CastSpell(summon, SPELL_REORIGINATION, true); break; case NPC_BLACK_HOLE: - summon->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_TRIGGER, true); + summon->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_TRIGGER, true); summon->CastSpell(summon, SPELL_CONSTELLATION_PHASE_TRIGGER, true); - summon->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_EXPLOSION, false); + summon->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_EXPLOSION, false); summon->CastSpell(summon, SPELL_SUMMON_VOID_ZONE_VISUAL, true); break; case NPC_ALGALON_VOID_ZONE_VISUAL_STALKER: @@ -612,7 +612,7 @@ public: Talk(SAY_ALGALON_INTRO_1); break; case EVENT_INTRO_2: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_AZEROTH, true); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_AZEROTH, true); Talk(SAY_ALGALON_INTRO_2); break; case EVENT_INTRO_3: @@ -634,7 +634,7 @@ public: break; case EVENT_INTRO_TIMER_DONE: events.SetPhase(PHASE_NORMAL); - me->CastSpell((Unit*)NULL, SPELL_SUPERMASSIVE_FAIL, true); + me->CastSpell((Unit*)nullptr, SPELL_SUPERMASSIVE_FAIL, true); // Hack: _IsValidTarget failed earlier due to flags, call AttackStart again me->SetReactState(REACT_AGGRESSIVE); me->setFaction(14); @@ -662,7 +662,7 @@ public: break; case EVENT_COSMIC_SMASH: Talk(EMOTE_ALGALON_COSMIC_SMASH); - me->CastCustomSpell(SPELL_COSMIC_SMASH, SPELLVALUE_MAX_TARGETS, RAID_MODE(1, 3), (Unit*)NULL); + me->CastCustomSpell(SPELL_COSMIC_SMASH, SPELLVALUE_MAX_TARGETS, RAID_MODE(1, 3), (Unit*)nullptr); events.RepeatEvent(25500); break; case EVENT_ACTIVATE_LIVING_CONSTELLATION: @@ -685,13 +685,13 @@ public: EntryCheckPredicate pred(NPC_LIVING_CONSTELLATION); summons.DoAction(ACTION_BIG_BANG, pred); - me->CastSpell((Unit*)NULL, SPELL_BIG_BANG, false); + me->CastSpell((Unit*)nullptr, SPELL_BIG_BANG, false); events.RepeatEvent(90500); break; } case EVENT_ASCEND_TO_THE_HEAVENS: Talk(SAY_ALGALON_ASCEND); - me->CastSpell((Unit*)NULL, SPELL_ASCEND_TO_THE_HEAVENS, false); + me->CastSpell((Unit*)nullptr, SPELL_ASCEND_TO_THE_HEAVENS, false); events.ScheduleEvent(EVENT_EVADE, 2500); break; case EVENT_EVADE: @@ -714,13 +714,13 @@ public: me->GetMotionMaster()->MovePoint(POINT_ALGALON_OUTRO, AlgalonOutroPos); break; case EVENT_OUTRO_3: - me->CastSpell((Unit*)NULL, SPELL_KILL_CREDIT); + me->CastSpell((Unit*)nullptr, SPELL_KILL_CREDIT); // Summon Chest if (GameObject* go = me->SummonGameObject(RAID_MODE(GO_ALGALON_CHEST, GO_ALGALON_CHEST_HERO), 1632.1f, -306.561f, 417.321f, 4.69494f, 0, 0, 0, 1, 0)) go->SetUInt32Value(GAMEOBJECT_FLAGS, 0); break; case EVENT_OUTRO_4: - me->CastSpell((Unit*)NULL, SPELL_SUPERMASSIVE_FAIL); + me->CastSpell((Unit*)nullptr, SPELL_SUPERMASSIVE_FAIL); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); break; case EVENT_OUTRO_5: @@ -758,7 +758,7 @@ public: Talk(SAY_ALGALON_DESPAWN_3); break; case EVENT_DESPAWN_ALGALON_4: - me->CastSpell((Unit*)NULL, SPELL_ASCEND_TO_THE_HEAVENS, false); + me->CastSpell((Unit*)nullptr, SPELL_ASCEND_TO_THE_HEAVENS, false); break; case EVENT_DESPAWN_ALGALON_5: me->SetStandState(UNIT_STAND_STATE_STAND); @@ -974,7 +974,7 @@ public: if (InstanceScript* instance = me->GetInstanceScript()) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_ID_SUPERMASSIVE_START); - caster->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_CREDIT, TRIGGERED_FULL_MASK); + caster->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_CREDIT, TRIGGERED_FULL_MASK); caster->ToCreature()->DespawnOrUnsummon(1); me->DespawnOrUnsummon(1); if (Creature* voidZone = caster->FindNearestCreature(NPC_ALGALON_VOID_ZONE_VISUAL_STALKER, 10.0f)) @@ -990,7 +990,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_ARCANE_BARRAGE: - me->CastCustomSpell(SPELL_ARCANE_BARRAGE, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, true); + me->CastCustomSpell(SPELL_ARCANE_BARRAGE, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, true); events.RepeatEvent(2500); break; case EVENT_RESUME_UPDATING: @@ -1031,7 +1031,7 @@ public: _summonTimer += diff; if (_summonTimer >= 30000) { - me->CastSpell((Unit*)NULL, SPELL_SUMMON_UNLEASHED_DARK_MATTER, true); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_UNLEASHED_DARK_MATTER, true); _summonTimer = 0; } } @@ -1173,7 +1173,7 @@ public: void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); - Unit::DealDamage(GetTarget(), GetTarget(), GetTarget()->CountPctFromMaxHealth(1), NULL, NODAMAGE); + Unit::DealDamage(GetTarget(), GetTarget(), GetTarget()->CountPctFromMaxHealth(1), nullptr, NODAMAGE); } void Register() override diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 89cf09be3..585c68fc6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -430,7 +430,7 @@ public: (*itr)->m_positionZ = prevZ; } - me->CastSpell((Unit*)NULL, SPELL_FLASH_FREEZE_CAST, false); + me->CastSpell((Unit*)nullptr, SPELL_FLASH_FREEZE_CAST, false); me->MonsterTextEmote("Hodir begins to cast Flash Freeze!", 0, true); me->MonsterYell(TEXT_HODIR_FLASH_FREEZE, LANG_UNIVERSAL, 0); me->PlayDirectSound(SOUND_HODIR_FLASH_FREEZE, 0); @@ -803,7 +803,7 @@ public: } break; case EVENT_PRIEST_DISPELL_MAGIC: - me->CastCustomSpell(SPELL_PRIEST_DISPELL_MAGIC, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false); + me->CastCustomSpell(SPELL_PRIEST_DISPELL_MAGIC, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false); events.RepeatEvent(7000); break; case EVENT_PRIEST_GREAT_HEAL: @@ -1415,7 +1415,7 @@ public: { PreventDefaultAction(); if (Unit* target = GetTarget()) - target->CastSpell((Unit*)NULL, (GetId() == SPELL_SHAMAN_STORM_CLOUD_10 ? SPELL_SHAMAN_STORM_POWER_10 : SPELL_SHAMAN_STORM_POWER_25), true); + target->CastSpell((Unit*)nullptr, (GetId() == SPELL_SHAMAN_STORM_CLOUD_10 ? SPELL_SHAMAN_STORM_POWER_10 : SPELL_SHAMAN_STORM_POWER_25), true); } void Register() override diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 7245d6e2a..caab3540b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -343,7 +343,7 @@ public: case 0: break; case EVENT_ACTIVATE_CONSTRUCT: - me->CastCustomSpell(SPELL_ACTIVATE_CONSTRUCT, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false); + me->CastCustomSpell(SPELL_ACTIVATE_CONSTRUCT, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false); if (++counter >= 20) { me->MonsterYell(TEXT_BERSERK, LANG_UNIVERSAL, 0); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 4a5f07649..258cd0238 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1525,7 +1525,7 @@ public: events.RepeatEvent(10000); break; case EVENT_FROST_BOMB: - me->CastCustomSpell(SPELL_VX001_FROST_BOMB, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false); + me->CastCustomSpell(SPELL_VX001_FROST_BOMB, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false); events.RepeatEvent(45000); break; } @@ -2167,7 +2167,7 @@ public: if (Unit* c = GetCaster()) { uint32 id = ( c->GetMap()->Is25ManRaid() ? ((aurEff->GetTickNumber() % 2) ? SPELL_RAPID_BURST_DAMAGE_25_2 : SPELL_RAPID_BURST_DAMAGE_25_1) : ((aurEff->GetTickNumber() % 2) ? SPELL_RAPID_BURST_DAMAGE_10_2 : SPELL_RAPID_BURST_DAMAGE_10_1) ); - c->CastSpell((Unit*)NULL, id, true); + c->CastSpell((Unit*)nullptr, id, true); } } @@ -2219,8 +2219,8 @@ public: lastOrientation = new_o; c->SetOrientation(new_o); c->SetFacingTo(new_o); - c->CastSpell((Unit*)NULL, 63297, true); - c->CastSpell((Unit*)NULL, 64042, true); + c->CastSpell((Unit*)nullptr, 63297, true); + c->CastSpell((Unit*)nullptr, 64042, true); } } @@ -2473,7 +2473,7 @@ public: } break; case EVENT_EMERGENCY_BOT_ATTACK: - me->CastSpell((Unit*)NULL, SPELL_WATER_SPRAY, false); + me->CastSpell((Unit*)nullptr, SPELL_WATER_SPRAY, false); events.RescheduleEvent(EVENT_EMERGENCY_BOT_CHECK, 5000); break; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 0e906d373..07b040f84 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -659,7 +659,7 @@ public: // Illusion shatters (param - stun time) WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, NULL, "Illusion shatters and a path to the central chamber opens!"); + ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, "Illusion shatters and a path to the central chamber opens!"); me->SendMessageToSetInRange(&data, 500, false); uint32 timer = events.GetNextEventTime(EVENT_SARA_P2_OPEN_PORTALS); @@ -986,7 +986,7 @@ public: void JustDied(Unit*) override { - me->CastSpell((Unit*)NULL, SPELL_SHADOW_NOVA, true); + me->CastSpell((Unit*)nullptr, SPELL_SHADOW_NOVA, true); } void UpdateAI(uint32 diff) override @@ -1904,12 +1904,12 @@ public: WorldPacket data; if (creature->GetGUID() != _yoggGUID) { - ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text); + ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text); creature->SendMessageToSetInRange(&data, 90, true); } else if (Creature* cr = me->SummonTrigger(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 5, 0, 5000)) { - ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text); + ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text); cr->SendMessageToSetInRange(&data, 90, true); } else @@ -2018,12 +2018,12 @@ public: WorldPacket data; if (creature->GetGUID() != _yoggGUID) { - ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text); + ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text); creature->SendMessageToSetInRange(&data, 90, true); } else if (Creature* cr = me->SummonTrigger(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 5, 0, 5000)) { - ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text); + ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text); cr->SendMessageToSetInRange(&data, 90, true); } else @@ -2138,12 +2138,12 @@ public: WorldPacket data; if (creature->GetGUID() != _yoggGUID) { - ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text); + ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text); creature->SendMessageToSetInRange(&data, 90, true); } else if (Creature* cr = me->SummonTrigger(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 5, 0, 5000)) { - ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text); + ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text); cr->SendMessageToSetInRange(&data, 90, true); } else @@ -2893,7 +2893,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { int32 damage = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), 60); - GetTarget()->CastCustomSpell(SPELL_GRIM_REPRISAL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetDamageInfo()->GetAttacker(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_GRIM_REPRISAL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetDamageInfo()->GetAttacker(), true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 9ebe5a3db..c21c2edb3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -609,7 +609,7 @@ public: case TYPE_THORIM: case TYPE_FREYA: m_auiEncounter[type] = data; - ShowKeeperGossip(type, NULL, m_keepersGossipGUID[type - TYPE_FREYA]); + ShowKeeperGossip(type, nullptr, m_keepersGossipGUID[type - TYPE_FREYA]); if (GetData(TYPE_MIMIRON) == DONE && GetData(TYPE_FREYA) == DONE && GetData(TYPE_HODIR) == DONE && GetData(TYPE_THORIM) == DONE) { if (GameObject* go = instance->GetGameObject(m_keepersgateGUID)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index e88a9c34d..28be3d0ee 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -309,9 +309,9 @@ public: me->_AddCreatureSpellCooldown(SPELL_DREADFUL_ROAR, 0); if (me->GetDisplayId() == DISPLAYID_DEFAULT) - me->CastSpell((Unit*)NULL, SPELL_STAGGERING_ROAR, false); + me->CastSpell((Unit*)nullptr, SPELL_STAGGERING_ROAR, false); else - me->CastSpell((Unit*)NULL, SPELL_DREADFUL_ROAR, false); + me->CastSpell((Unit*)nullptr, SPELL_DREADFUL_ROAR, false); events.RepeatEvent(urand(15000, 20000)); break; case EVENT_SPELL_CLEAVE_OR_WOE_STRIKE: @@ -336,9 +336,9 @@ public: me->DisableRotate(true); me->SendMovementFlagUpdate(); if (me->GetDisplayId() == DISPLAYID_DEFAULT) - me->CastSpell((Unit*)NULL, SPELL_SMASH, false); + me->CastSpell((Unit*)nullptr, SPELL_SMASH, false); else - me->CastSpell((Unit*)NULL, SPELL_DARK_SMASH, false); + me->CastSpell((Unit*)nullptr, SPELL_DARK_SMASH, false); events.RepeatEvent(urand(9000, 11000)); events.RescheduleEvent(EVENT_UNROOT, 3750); break; @@ -350,7 +350,7 @@ public: } else { - me->CastSpell((Unit*)NULL, SPELL_SHADOW_AXE, true); + me->CastSpell((Unit*)nullptr, SPELL_SHADOW_AXE, true); SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); events.RepeatEvent(35000); events.RescheduleEvent(EVENT_AXE_RETURN, 10000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 030735664..72ec744a4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -64,7 +64,7 @@ public: if( me->GetInstanceScript() && me->GetInstanceScript()->instance->IsHeroic() ) { const int32 dmg = 2000; - c->CastCustomSpell(s, SPELL_FROST_TOMB_AURA, NULL, &dmg, NULL, true); + c->CastCustomSpell(s, SPELL_FROST_TOMB_AURA, nullptr, &dmg, nullptr, true); } else c->CastSpell(s, SPELL_FROST_TOMB_AURA, true); @@ -304,7 +304,7 @@ public: break; case EVENT_SPELL_BONE_ARMOR: if( !me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) ) - me->CastSpell((Unit*)NULL, SPELL_BONE_ARMOR, false); + me->CastSpell((Unit*)nullptr, SPELL_BONE_ARMOR, false); events.RepeatEvent(urand(40000, 120000)); break; case EVENT_RESURRECT: @@ -343,7 +343,7 @@ public: PreventDefaultAction(); if (aurEff->GetTickNumber() == 1) if( Unit* target = GetTarget() ) - target->CastSpell((Unit*)NULL, SPELL_FROST_TOMB_SUMMON, true); + target->CastSpell((Unit*)nullptr, SPELL_FROST_TOMB_SUMMON, true); } void Register() override diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 8c52ee7a4..1f5698cf6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -150,7 +150,7 @@ public: } } - me->CastSpell((Unit*)NULL, SPELL_SUMMON_SKARVALD_GHOST, true); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_SKARVALD_GHOST, true); } void UpdateAI(uint32 diff) override @@ -303,7 +303,7 @@ public: } } } - me->CastSpell((Unit*)NULL, SPELL_SUMMON_DALRONN_GHOST, true); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_DALRONN_GHOST, true); } void UpdateAI(uint32 diff) override @@ -341,7 +341,7 @@ public: events.RepeatEvent(3000); break; case EVENT_SPELL_SUMMON_SKELETONS: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_SKELETONS, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_SKELETONS, false); events.RepeatEvent(urand(20000, 30000)); break; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 10e18ae25..f3bff7abe 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -505,7 +505,7 @@ public: grauf->AI()->DoAction(ACTION_MYGIRL_ACHIEVEMENT); } - go->CastSpell((Unit*)NULL, SPELL_LAUNCH_HARPOON); + go->CastSpell((Unit*)nullptr, SPELL_LAUNCH_HARPOON); } return true; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index fc4eff3cd..a0cdb8a2e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -400,7 +400,7 @@ public: if (unitTarget->GetTypeId() != TYPEID_UNIT) return; - Unit::DealDamage(GetCaster(), unitTarget, 7000, NULL, DIRECT_DAMAGE); + Unit::DealDamage(GetCaster(), unitTarget, 7000, nullptr, DIRECT_DAMAGE); } } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index e67cc1818..19aa29fc6 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -194,7 +194,7 @@ public: void TriggerFists(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, NULL, aurEff); + GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, nullptr, aurEff); } void Register() override @@ -226,7 +226,7 @@ public: void TriggerFists(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, NULL, aurEff); + GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index e8a237fcd..6ba359d00 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -109,7 +109,7 @@ public: case 0: break; case EVENT_SPELL_ARCANE_VACUUM: - me->CastSpell((Unit*)NULL, SPELL_ARCANE_VACUUM, false); + me->CastSpell((Unit*)nullptr, SPELL_ARCANE_VACUUM, false); DoResetThreat(); me->SetControlled(true, UNIT_STATE_ROOT); me->setAttackTimer(BASE_ATTACK, 3000); diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 1ce050494..1e2b36e5d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -108,11 +108,11 @@ public: case 0: break; case EVENT_SPELL_BLOODLUST: - me->CastSpell((Unit*)NULL, SPELL_BLOODLUST, false); + me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, false); events.RepeatEvent(urand(35000, 45000)); break; case EVENT_SPELL_BREAK_BONDS: - me->CastSpell((Unit*)NULL, SPELL_BREAK_BONDS, false); + me->CastSpell((Unit*)nullptr, SPELL_BREAK_BONDS, false); events.RepeatEvent(urand(16000, 22000)); break; case EVENT_SPELL_CHAIN_HEAL: diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index b5b0331a7..458025b79 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -228,7 +228,7 @@ public: { if (uiWaterBoltVolleyTimer <= uiDiff) { - me->CastSpell((Unit*)NULL, SPELL_WATER_BOLT_VOLLEY, false); + me->CastSpell((Unit*)nullptr, SPELL_WATER_BOLT_VOLLEY, false); uiWaterBoltVolleyTimer = urand(10000, 15000); } else uiWaterBoltVolleyTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 766ab3203..cb72633ae 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -92,7 +92,7 @@ public: events.RepeatEvent(urand(14000, 20000)); break; case EVENT_SPELL_CAUTERIZING_FLAMES: - me->CastSpell((Unit*)NULL, SPELL_FLAME_BREATH, false); + me->CastSpell((Unit*)nullptr, SPELL_FLAME_BREATH, false); events.RepeatEvent(urand(10000, 16000)); break; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 17176fd68..6c822d34f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -96,7 +96,7 @@ public: case 0: break; case EVENT_SPELL_ARCANE_BARRAGE_VOLLEY: - me->CastSpell((Unit*)NULL, SPELL_ARCANE_BARRAGE_VOLLEY, false); + me->CastSpell((Unit*)nullptr, SPELL_ARCANE_BARRAGE_VOLLEY, false); events.RepeatEvent(20000); break; case EVENT_SPELL_ARCANE_BUFFET: @@ -107,13 +107,13 @@ public: Talk(SAY_SUMMON_ENERGY); spheres.DespawnAll(); uint32 entry1 = RAND(SPELL_SUMMON_ETHEREAL_SPHERE_1, SPELL_SUMMON_ETHEREAL_SPHERE_2, SPELL_SUMMON_ETHEREAL_SPHERE_3); - me->CastSpell((Unit*)NULL, entry1, true); + me->CastSpell((Unit*)nullptr, entry1, true); if (IsHeroic()) { uint32 entry2; do { entry2 = RAND(SPELL_SUMMON_ETHEREAL_SPHERE_1, SPELL_SUMMON_ETHEREAL_SPHERE_2, SPELL_SUMMON_ETHEREAL_SPHERE_3); } while (entry1 == entry2); - me->CastSpell((Unit*)NULL, entry2, true); + me->CastSpell((Unit*)nullptr, entry2, true); } events.RepeatEvent(45000); events.RescheduleEvent(EVENT_SPELL_ARCANE_BUFFET, 5000); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 43d732f1f..ee19e8ef3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -108,7 +108,7 @@ public: events.RepeatEvent(urand(18000, 22000)); break; case EVENT_SPELL_SUMMON_VOID_SENTRY: - me->CastSpell((Unit*)NULL, SPELL_SUMMON_VOID_SENTRY, false); + me->CastSpell((Unit*)nullptr, SPELL_SUMMON_VOID_SENTRY, false); events.RepeatEvent(12000); break; } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index a0040aa42..6a4a4bedf 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -360,7 +360,7 @@ struct violet_hold_trashAI : public npc_escortAI { RemoveEscortState(STATE_ESCORT_ESCORTING | STATE_ESCORT_RETURNING | STATE_ESCORT_PAUSED); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC); - me->CastSpell((Unit*)NULL, SPELL_DESTROY_DOOR_SEAL, true); + me->CastSpell((Unit*)nullptr, SPELL_DESTROY_DOOR_SEAL, true); } void EnterEvadeMode() override diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 7acb4d9ab..433c4c153 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -36,7 +36,7 @@ public: { faction = me->getFaction(); me->Respawn(); - me->UpdateEntry(NPC_BROKEN_KEEP_CANNON, NULL, false); + me->UpdateEntry(NPC_BROKEN_KEEP_CANNON, nullptr, false); me->RemoveVehicleKit(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); } @@ -46,7 +46,7 @@ public: { if (spellInfo->Id == SPELL_REPAIR_TURRET_DUMMY && me->GetEntry() == NPC_BROKEN_KEEP_CANNON) { - me->UpdateEntry(NPC_KEEP_CANNON, NULL, false); + me->UpdateEntry(NPC_KEEP_CANNON, nullptr, false); if (faction) me->setFaction(faction); me->CreateVehicleKit(510, NPC_KEEP_CANNON); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index a9a42bcab..59eccb03b 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -585,7 +585,7 @@ public: EnterEvadeMode(); //We make sure that the npc is not attacking the player! me->SetReactState(REACT_PASSIVE); StartFollow(pCaster->ToPlayer(), 0, nullptr); - me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, NULL, false); + me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, nullptr, false); DoCast(me, SPELL_COSMETIC_ENSLAVE_CHAINS_SELF, true); me->DespawnOrUnsummon(45000); diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 1d6125b46..e85316122 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -902,7 +902,7 @@ public: events.ScheduleEvent(7, 11000); break; case 6: // repel hammer - me->CastSpell((Unit*)NULL, SPELL_SAC_REPEL_HAMMER, false); + me->CastSpell((Unit*)nullptr, SPELL_SAC_REPEL_HAMMER, false); if (Creature* c = me->FindNearestCreature(NPC_SAC_LIGHTS_VENGEANCE_VEH_1, 150.0f, true)) c->CastSpell(c, SPELL_SAC_BLUE_EXPLOSION, true); @@ -921,7 +921,7 @@ public: events.ScheduleEvent(9, 11500); break; case 8: // summon ghouls - me->CastSpell((Unit*)NULL, SPELL_SAC_SUMMON_GHOULS_AURA, false); + me->CastSpell((Unit*)nullptr, SPELL_SAC_SUMMON_GHOULS_AURA, false); break; case 9: // talk 3 Talk(3); @@ -1030,7 +1030,7 @@ public: { if (spell->Id == SPELL_SAC_REPEL_HAMMER && target->GetTypeId() == TYPEID_UNIT) { - target->CastSpell((Unit*)NULL, SPELL_SAC_THROW_HAMMER, true); + target->CastSpell((Unit*)nullptr, SPELL_SAC_THROW_HAMMER, true); target->ToCreature()->DespawnOrUnsummon(1); if (Unit* c = target->GetVehicleBase()) c->RemoveAurasDueToSpell(SPELL_SAC_HOLY_ZONE_AURA); @@ -1304,7 +1304,7 @@ public: AttackStart(t); break; case 2: - me->CastSpell((Unit*)NULL, 70866, false); + me->CastSpell((Unit*)nullptr, 70866, false); events.RepeatEvent(urand(30000, 35000)); break; case 3: diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 236b2dd3a..b069d4763 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -232,7 +232,7 @@ public: break; case QUEST_BFV_SIGRID: PrepareSummons(); - me->MonsterTextEmote("Circling Valhalas, Sigrid Iceborn approaches to seek her revenge!", NULL, true); + me->MonsterTextEmote("Circling Valhalas, Sigrid Iceborn approaches to seek her revenge!", nullptr, true); break; case QUEST_BFV_CARNAGE: events.ScheduleEvent(EVENT_VALHALAS_SECOND, 8000); @@ -258,20 +258,20 @@ public: { case QUEST_BFV_FALLEN_HEROES: me->MonsterYell("There can only be one outcome to such a battle: death for one side or the other. Let $n prove himself upon the bones of these outsiders who have fallen before!", LANG_UNIVERSAL, ObjectAccessor::GetPlayer(*me, playerGUID)); - me->MonsterTextEmote("The fallen heroes of Valhalas emerge from the ground to do battle once more!", NULL, true); + me->MonsterTextEmote("The fallen heroes of Valhalas emerge from the ground to do battle once more!", nullptr, true); break; case QUEST_BFV_DARK_MASTER: - me->MonsterTextEmote("Khit'rix the Dark Master skitters into Valhalas from the southeast!", NULL, true); + me->MonsterTextEmote("Khit'rix the Dark Master skitters into Valhalas from the southeast!", nullptr, true); break; case QUEST_BFV_CARNAGE: - me->MonsterTextEmote("Lumbering in from the south, the smell of Carnage precedes him!", NULL, true); + me->MonsterTextEmote("Lumbering in from the south, the smell of Carnage precedes him!", nullptr, true); break; case QUEST_BFV_THANE: - me->MonsterTextEmote("Thane Banahogg appears upon the overlook to the southeast!", NULL, true); + me->MonsterTextEmote("Thane Banahogg appears upon the overlook to the southeast!", nullptr, true); break; case QUEST_BFV_FINAL: me->MonsterYell("Warriors of Jotunheim, I present to you, Blood Prince Sandoval!", LANG_UNIVERSAL, nullptr); - me->MonsterTextEmote("Without warning, Prince Sandoval magically appears within Valhalas!", NULL, true); + me->MonsterTextEmote("Without warning, Prince Sandoval magically appears within Valhalas!", nullptr, true); break; } @@ -1368,7 +1368,7 @@ public: fireCount++; if (fireCount) - Unit::DealDamage(me, me, 3000 * fireCount, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_FIRE); + Unit::DealDamage(me, me, 3000 * fireCount, nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_FIRE); else // Heal me->ModifyHealth(2000); diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index dd3e8aba2..018a22a53 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -1018,7 +1018,7 @@ public: void HandlePeriodic(AuraEffect const* /* aurEff */) { if (++_counter == 5) - GetTarget()->CastSpell((Unit*)NULL, SPELL_DESPAWN_RIFT, true); + GetTarget()->CastSpell((Unit*)nullptr, SPELL_DESPAWN_RIFT, true); } void Register() override diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 05a350e11..7cee0203d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -53,7 +53,7 @@ public: me->RemoveAurasDueToSpell(SPELL_BANISH); Talk(SAY_INTRO); - Start(true, false, 0, NULL, false, true); + Start(true, false, 0, nullptr, false, true); isBanished = false; } @@ -70,7 +70,7 @@ public: me->CastSpell(me, SPELL_BANISH, true); } else - Start(true, false, 0, NULL, false, true); + Start(true, false, 0, nullptr, false, true); } } diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 266e0ae78..52b3cae37 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -656,7 +656,7 @@ public: return; int32 bp = absorbAmount / 2; - target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_REFLECTIVE_SHIELD_T, &bp, nullptr, nullptr, true, NULL, aurEff); + target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_REFLECTIVE_SHIELD_T, &bp, nullptr, nullptr, true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 1f9cc267f..25a427915 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -465,7 +465,7 @@ public: void Update(AuraEffect const* effect) { PreventDefaultAction(); - if (Unit* target = GetUnitOwner()->SelectNearbyNoTotemTarget((Unit*)NULL, 50.0f)) + if (Unit* target = GetUnitOwner()->SelectNearbyNoTotemTarget((Unit*)nullptr, 50.0f)) GetUnitOwner()->CastSpell(target, GetSpellInfo()->Effects[effect->GetEffIndex()].TriggerSpell, true); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 25c9bcd5b..bc4907f3f 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -210,7 +210,7 @@ public: if (Unit* target = GetHitUnit()) { target->RemoveAurasDueToSpell(SPELL_STONED); - target->CastSpell((Unit*)NULL, SPELL_SHATTER_EFFECT, true); + target->CastSpell((Unit*)nullptr, SPELL_SHATTER_EFFECT, true); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 959b4b13e..8da1ab7d1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -173,7 +173,7 @@ public: uint32 triggerSpell = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell; int32 mod = int32(((float(aurEff->GetTickNumber()) / aurEff->GetTotalTicks()) * 0.9f + 0.1f) * 10000 * 2 / 3); - GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_RADIUS_MOD, mod, (Unit*)NULL, TRIGGERED_FULL_MASK, NULL, aurEff); + GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_RADIUS_MOD, mod, (Unit*)nullptr, TRIGGERED_FULL_MASK, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 87a19bae1..15b5a1f7e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -288,7 +288,7 @@ public: void HandleDummyApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - GetUnitOwner()->CastSpell((Unit*)NULL, SPELL_SHADOW_GRASP_VISUAL, false); + GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_SHADOW_GRASP_VISUAL, false); } void HandleDummyRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) 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 ca4449a90..843a59bae 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -126,7 +126,7 @@ public: instance->LoadGrid(230, -80); if (Creature* kargath = instance->GetCreature(warchiefKargathGUID)) - sCreatureTextMgr->SendChat(kargath, TeamIdInInstance == TEAM_ALLIANCE ? 3 : 4, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_MAP); + sCreatureTextMgr->SendChat(kargath, TeamIdInInstance == TEAM_ALLIANCE ? 3 : 4, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_MAP); RescueTimer = 80 * MINUTE * IN_MILLISECONDS; } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index e9ee61f86..827971dca 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -355,7 +355,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); me->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH); - me->CastSpell((Unit*)NULL, SPELL_TARGET_OMEGA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_OMEGA, false); instance->HandleGameObject(instance->GetData64(DATA_WARDENS_SHIELD), true); instance->SetBossState(DATA_WARDEN_MELLICHAR, NOT_STARTED); } @@ -427,7 +427,7 @@ public: break; case EVENT_WARDEN_INTRO4: me->SetFacingTo(0.5f); - me->CastSpell((Unit*)NULL, SPELL_TARGET_ALPHA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_ALPHA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO5, 2000); break; case EVENT_WARDEN_INTRO5: @@ -436,7 +436,7 @@ public: break; case EVENT_WARDEN_INTRO6: me->SetFacingTo(M_PI * 1.5f); - me->CastSpell((Unit*)NULL, SPELL_TARGET_OMEGA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_OMEGA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO7, 5000); break; case EVENT_WARDEN_INTRO7: @@ -450,7 +450,7 @@ public: events.ScheduleEvent(EVENT_WARDEN_INTRO10, 4000); break; case EVENT_WARDEN_INTRO10: - me->CastSpell((Unit*)NULL, SPELL_TARGET_BETA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_BETA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO11, 2000); break; case EVENT_WARDEN_INTRO11: @@ -460,7 +460,7 @@ public: break; case EVENT_WARDEN_INTRO12: me->SetFacingTo(M_PI * 1.5f); - me->CastSpell((Unit*)NULL, SPELL_TARGET_OMEGA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_OMEGA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO13, 6000); break; case EVENT_WARDEN_INTRO13: @@ -474,7 +474,7 @@ public: events.ScheduleEvent(EVENT_WARDEN_INTRO15, 5000); break; case EVENT_WARDEN_INTRO15: - me->CastSpell((Unit*)NULL, SPELL_TARGET_DELTA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_DELTA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO16, 2000); break; case EVENT_WARDEN_INTRO16: @@ -483,7 +483,7 @@ public: break; case EVENT_WARDEN_INTRO17: me->SetFacingTo(M_PI * 1.5f); - me->CastSpell((Unit*)NULL, SPELL_TARGET_OMEGA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_OMEGA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO18, 6000); break; case EVENT_WARDEN_INTRO18: @@ -497,7 +497,7 @@ public: events.ScheduleEvent(EVENT_WARDEN_INTRO20, 4000); break; case EVENT_WARDEN_INTRO20: - me->CastSpell((Unit*)NULL, SPELL_TARGET_GAMMA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_GAMMA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO21, 2000); break; case EVENT_WARDEN_INTRO21: @@ -506,7 +506,7 @@ public: break; case EVENT_WARDEN_INTRO22: me->SetFacingTo(M_PI * 1.5f); - me->CastSpell((Unit*)NULL, SPELL_TARGET_OMEGA, false); + me->CastSpell((Unit*)nullptr, SPELL_TARGET_OMEGA, false); events.ScheduleEvent(EVENT_WARDEN_INTRO23, 6000); break; case EVENT_WARDEN_INTRO23: @@ -539,7 +539,7 @@ public: case EVENT_WARDEN_INTRO28: instance->HandleGameObject(instance->GetData64(DATA_WARDENS_SHIELD), true); if (Creature* creature = summons.GetCreatureWithEntry(NPC_HARBINGER_SKYRISS)) - creature->CastSpell((Unit*)NULL, SPELL_MIND_REND, false); + creature->CastSpell((Unit*)nullptr, SPELL_MIND_REND, false); events.ScheduleEvent(EVENT_WARDEN_INTRO29, 4000); break; diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 9be93be12..d8681cbfe 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -189,7 +189,7 @@ public: if (target->GetPower(POWER_MANA) == 0) { - target->CastSpell(target, SPELL_MARK_OF_KAZZAK_DAMAGE, true, NULL, aurEff); + target->CastSpell(target, SPELL_MARK_OF_KAZZAK_DAMAGE, true, nullptr, aurEff); // Remove aura SetDuration(0); } diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 0094ab9b2..5d5478895 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -497,7 +497,7 @@ public: { me->SetVisible(false); me->SetDisableGravity(false); - Unit::DealDamage(me, me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(me, me, me->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); me->RemoveCorpse(); } me->DespawnOrUnsummon(1); @@ -667,7 +667,7 @@ public: events.ScheduleEvent(EVENT_KILL, 5000); break; case EVENT_KILL: - Unit::DealDamage(me, me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Unit::DealDamage(me, me, me->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false); break; } return; diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index b5fcfd730..5823afa73 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -686,7 +686,7 @@ public: { uint8 limit = 0; if (player->GetGroup()) - for (GroupReference* itr = player->GetGroup()->GetFirstMember(); itr != NULL && limit < 4; itr = itr->next(), ++limit) + for (GroupReference* itr = player->GetGroup()->GetFirstMember(); itr != nullptr && limit < 4; itr = itr->next(), ++limit) if (Player* groupPlayer = itr->GetSource()) if (groupPlayer != player) groupPlayer->GetSession()->SendPacket(&_data); diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 3a0ac0aee..308ecccdd 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -90,7 +90,7 @@ public: me->SetReactState(REACT_DEFENSIVE); // Xinef: Inherit Master's Threat List (not yet implemented) - //owner->CastSpell((Unit*)NULL, SPELL_MAGE_MASTERS_THREAT_LIST, true); + //owner->CastSpell((Unit*)nullptr, SPELL_MAGE_MASTERS_THREAT_LIST, true); HostileReference* ref = owner->getHostileRefManager().getFirst(); while (ref) { diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 95df2c5b5..0fb3ebd5e 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -701,7 +701,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - eventInfo.GetActor()->CastSpell(eventInfo.GetActionTarget(), aurEff->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell, true, NULL, aurEff); + eventInfo.GetActor()->CastSpell(eventInfo.GetActionTarget(), aurEff->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell, true, nullptr, aurEff); // Xinef: Shadowmourne hack (blood-caked blade trigger proc disabled...) if (roll_chance_i(75) && eventInfo.GetActor()->FindMap() && !eventInfo.GetActor()->FindMap()->IsBattlegroundOrArena() && eventInfo.GetActor()->HasAura(71903) && !eventInfo.GetActor()->HasAura(SPELL_SHADOWMOURNE_CHAOS_BANE_BUFF)) @@ -797,7 +797,7 @@ public: // xinef: ugly hack if (!procSpell->IsAffectingArea()) GetUnitOwner()->SetFloatValue(UNIT_FIELD_COMBATREACH, 10.0f); - dancingRuneWeapon->CastSpell(target, procSpell->Id, true, NULL, aurEff, dancingRuneWeapon->GetGUID()); + dancingRuneWeapon->CastSpell(target, procSpell->Id, true, nullptr, aurEff, dancingRuneWeapon->GetGUID()); GetUnitOwner()->SetFloatValue(UNIT_FIELD_COMBATREACH, 0.01f); } else @@ -1114,7 +1114,7 @@ public: // damage absorbed by Anti-Magic Shell energizes the DK with additional runic power. // This, if I'm not mistaken, shows that we get back ~20% of the absorbed damage as runic power. int32 bp = CalculatePct(absorbAmount, 20); - GetTarget()->CastCustomSpell(SPELL_DK_RUNIC_POWER_ENERGIZE, SPELLVALUE_BASE_POINT0, bp, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_DK_RUNIC_POWER_ENERGIZE, SPELLVALUE_BASE_POINT0, bp, GetTarget(), true, nullptr, aurEff); } void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -1272,7 +1272,7 @@ public: { PreventDefaultAction(); int32 bp = int32(eventInfo.GetDamageInfo()->GetDamage() * 1.5f); - GetTarget()->CastCustomSpell(SPELL_DK_BLOOD_GORGED_HEAL, SPELLVALUE_BASE_POINT0, bp, _procTarget, true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_DK_BLOOD_GORGED_HEAL, SPELLVALUE_BASE_POINT0, bp, _procTarget, true, nullptr, aurEff); } void Register() override @@ -1875,7 +1875,7 @@ public: { Unit* target = GetTarget(); if ((target->HasAura(SPELL_DK_FROST_PRESENCE) || target->HasAura(SPELL_DK_UNHOLY_PRESENCE)) && !target->HasAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED)) - target->CastCustomSpell(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT1, aurEff->GetAmount(), target, true, NULL, aurEff); + target->CastCustomSpell(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT1, aurEff->GetAmount(), target, true, nullptr, aurEff); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -1923,7 +1923,7 @@ public: { Unit* target = GetTarget(); if ((target->HasAura(SPELL_DK_BLOOD_PRESENCE) || target->HasAura(SPELL_DK_UNHOLY_PRESENCE)) && !target->HasAura(SPELL_DK_FROST_PRESENCE_TRIGGERED)) - target->CastCustomSpell(SPELL_DK_FROST_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), target, true, NULL, aurEff); + target->CastCustomSpell(SPELL_DK_FROST_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), target, true, nullptr, aurEff); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -1975,11 +1975,11 @@ public: { // Not listed as any effect, only base points set in dbc int32 basePoints = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints, &basePoints, &basePoints, true, NULL, aurEff); + target->CastCustomSpell(target, SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints, &basePoints, &basePoints, true, nullptr, aurEff); } if ((target->HasAura(SPELL_DK_BLOOD_PRESENCE) || target->HasAura(SPELL_DK_FROST_PRESENCE)) && !target->HasAura(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED)) - target->CastCustomSpell(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), target, true, NULL, aurEff); + target->CastCustomSpell(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), target, true, nullptr, aurEff); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -2088,7 +2088,7 @@ public: target->CastSpell(target, SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, true); else if (AuraEffect const* impAurEff = target->GetAuraEffectOfRankedSpell(SPELL_DK_IMPROVED_BLOOD_PRESENCE_R1, EFFECT_0)) if (!target->HasAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED)) - target->CastCustomSpell(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT1, impAurEff->GetAmount(), target, true, NULL, aurEff); + target->CastCustomSpell(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT1, impAurEff->GetAmount(), target, true, nullptr, aurEff); } void HandleImprovedFrostPresence(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) @@ -2099,7 +2099,7 @@ public: target->CastSpell(target, SPELL_DK_FROST_PRESENCE_TRIGGERED, true); else if (AuraEffect const* impAurEff = target->GetAuraEffectOfRankedSpell(SPELL_DK_IMPROVED_FROST_PRESENCE_R1, EFFECT_0)) if (!target->HasAura(SPELL_DK_FROST_PRESENCE_TRIGGERED)) - target->CastCustomSpell(SPELL_DK_FROST_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, impAurEff->GetAmount(), target, true, NULL, aurEff); + target->CastCustomSpell(SPELL_DK_FROST_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, impAurEff->GetAmount(), target, true, nullptr, aurEff); } void HandleImprovedUnholyPresence(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) @@ -2115,10 +2115,10 @@ public: { // Not listed as any effect, only base points set int32 bp = impAurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &bp, &bp, &bp, true, NULL, aurEff); + target->CastCustomSpell(target, SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &bp, &bp, &bp, true, nullptr, aurEff); } else if (!target->HasAura(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED)) - target->CastCustomSpell(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, impAurEff->GetAmount(), target, true, NULL, aurEff); + target->CastCustomSpell(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED, SPELLVALUE_BASE_POINT0, impAurEff->GetAmount(), target, true, nullptr, aurEff); } } @@ -2277,7 +2277,7 @@ public: SpellCastTargets targets; targets.SetDst(*GetHitUnit()); - GetCaster()->CastSpell(targets, spellInfo, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCaster()->GetGUID()); + GetCaster()->CastSpell(targets, spellInfo, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCaster()->GetGUID()); GetCaster()->ToPlayer()->RemoveSpellCooldown(GetSpellInfo()->Id, true); } @@ -2347,7 +2347,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_DK_SCENT_OF_BLOOD, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_DK_SCENT_OF_BLOOD, true, nullptr, aurEff); GetTarget()->RemoveAuraFromStack(GetSpellInfo()->Id); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index af123e7fe..736a8f203 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -74,7 +74,7 @@ public: int32 amount = CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount()) / triggeredSpell->GetMaxTicks(); eventInfo.GetProcTarget()->CastDelayedSpellWithPeriodicAmount(GetTarget(), triggered_spell_id, SPELL_AURA_PERIODIC_DAMAGE, amount, EFFECT_0); - //GetTarget()->CastCustomSpell(triggered_spell_id, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); + //GetTarget()->CastCustomSpell(triggered_spell_id, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -137,7 +137,7 @@ public: { if (Player* player = GetTarget()->ToPlayer()) if (uint8 rank = player->HasTalent(SPELL_DRUID_FERAL_SWIFTNESS_R1, player->GetActiveSpec()) ? 1 : (player->HasTalent(SPELL_DRUID_FERAL_SWIFTNESS_R2, player->GetActiveSpec()) ? 2 : 0)) - player->CastSpell(player, rank == 1 ? SPELL_DRUID_FERAL_SWIFTNESS_PASSIVE_1 : SPELL_DRUID_FERAL_SWIFTNESS_PASSIVE_2, true, NULL, aurEff, GetCasterGUID()); + player->CastSpell(player, rank == 1 ? SPELL_DRUID_FERAL_SWIFTNESS_PASSIVE_1 : SPELL_DRUID_FERAL_SWIFTNESS_PASSIVE_2, true, nullptr, aurEff, GetCasterGUID()); } void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -220,7 +220,7 @@ public: void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { // xinef: chance of success stores proper amount of damage increase - // xinef: little hack because GetSpellModOwner will return NULL pointer at this point (early summoning stage) + // xinef: little hack because GetSpellModOwner will return nullptr pointer at this point (early summoning stage) if (GetUnitOwner()->IsSummon()) if (Unit* owner = GetUnitOwner()->ToTempSummon()->GetSummoner()) if (Player* player = owner->GetSpellModOwner()) @@ -604,9 +604,9 @@ public: healAmount = GetTarget()->SpellHealingBonusTaken(caster, finalHeal, healAmount, HEAL, stack); // restore mana int32 returnmana = (GetSpellInfo()->ManaCostPercentage * caster->GetCreateMana() / 100) * stack / 2; - caster->CastCustomSpell(caster, SPELL_DRUID_LIFEBLOOM_ENERGIZE, &returnmana, nullptr, nullptr, true, NULL, aurEff, GetCasterGUID()); + caster->CastCustomSpell(caster, SPELL_DRUID_LIFEBLOOM_ENERGIZE, &returnmana, nullptr, nullptr, true, nullptr, aurEff, GetCasterGUID()); } - GetTarget()->CastCustomSpell(GetTarget(), SPELL_DRUID_LIFEBLOOM_FINAL_HEAL, &healAmount, nullptr, nullptr, true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastCustomSpell(GetTarget(), SPELL_DRUID_LIFEBLOOM_FINAL_HEAL, &healAmount, nullptr, nullptr, true, nullptr, aurEff, GetCasterGUID()); } void HandleDispel(DispelInfo* dispelInfo) @@ -665,7 +665,7 @@ public: { PreventDefaultAction(); int32 amount = CalculatePct(eventInfo.GetHealInfo()->GetHeal(), aurEff->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_PROC, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_PROC, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -698,7 +698,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff); } void Register() override @@ -985,7 +985,7 @@ public: void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->CastSpell(target, SPELL_DRUID_SAVAGE_ROAR, true, NULL, aurEff, GetCasterGUID()); + target->CastSpell(target, SPELL_DRUID_SAVAGE_ROAR, true, nullptr, aurEff, GetCasterGUID()); } void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 876bae8fe..e3ee4347f 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1607,7 +1607,7 @@ public: default: return; } - GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), spellId, true, nullptr, aurEff); } void Register() override @@ -2004,7 +2004,7 @@ public: default: return; } - GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), spellId, true, nullptr, aurEff); } void Register() override @@ -2676,7 +2676,7 @@ public: void AchievementCredit(SpellEffIndex /*effIndex*/) { - // but in effect handling OriginalCaster can become NULL + // but in effect handling OriginalCaster can become nullptr if (Unit* originalCaster = GetOriginalCaster()) if (GameObject* go = GetHitGObj()) if (go->GetGOValue()->Building.Health > 0 && go->GetGOInfo()->type == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING) @@ -2735,7 +2735,7 @@ public: if (stackAmount >= 15 && stackAmount < 40) { stackAmount = 40; - GetTarget()->CastSpell(GetTarget(), SPELL_TURKEY_VENGEANCE, true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastSpell(GetTarget(), SPELL_TURKEY_VENGEANCE, true, nullptr, aurEff, GetCasterGUID()); } } @@ -3603,7 +3603,7 @@ public: for (uint8 i = 0; i < GetSpellInfo()->StackAmount; ++i) target->RemoveAurasDueToSpell(SPELL_VISUAL_SHIELD_1 + i); - target->CastSpell(target, SPELL_VISUAL_SHIELD_1 + GetAura()->GetStackAmount() - 1, true, NULL, aurEff); + target->CastSpell(target, SPELL_VISUAL_SHIELD_1 + GetAura()->GetStackAmount() - 1, true, nullptr, aurEff); } else GetTarget()->RemoveAurasDueToSpell(GetId()); @@ -4339,7 +4339,7 @@ public: return; // final heal - GetTarget()->CastSpell(GetTarget(), _spellId, true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastSpell(GetTarget(), _spellId, true, nullptr, aurEff, GetCasterGUID()); } void Register() override @@ -4923,7 +4923,7 @@ public: void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); - GetTarget()->CastSpell((Unit*)NULL, SPELL_YOGG_SARON_WHISPER_DUMMY, true); + GetTarget()->CastSpell((Unit*)nullptr, SPELL_YOGG_SARON_WHISPER_DUMMY, true); } void Register() override diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 26c9af643..943f5856b 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -442,14 +442,14 @@ public: if (AuraEffect const* glyph = GetTarget()->GetAuraEffect(SPELL_HUNTER_GLYPH_OF_ASPECT_OF_THE_VIPER, EFFECT_0)) AddPct(mana, glyph->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff); } void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { // Hunter T7 4P Bonus if (GetTarget()->HasAura(SPELL_HUNTER_VIPER_ATTACK_SPEED)) - GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_VICIOUS_VIPER, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_VICIOUS_VIPER, true, nullptr, aurEff); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -592,7 +592,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_IMPROVED_MEND_PET, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_IMPROVED_MEND_PET, true, nullptr, aurEff); } void Register() override @@ -1008,7 +1008,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, nullptr, aurEff); } void Register() override @@ -1172,7 +1172,7 @@ public: void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { if (GetTarget()->HasAura(SPELL_HUNTER_ASPECT_OF_THE_VIPER)) - GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_VICIOUS_VIPER, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_VICIOUS_VIPER, true, nullptr, aurEff); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 16d09e39b..1c41da5fe 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1491,7 +1491,7 @@ public: return; // ignore for non-healing classes } - unitTarget->CastSpell(unitTarget, spell_id, true, NULL, aurEff); + unitTarget->CastSpell(unitTarget, spell_id, true, nullptr, aurEff); } } @@ -1662,7 +1662,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_AEGIS_HEAL, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_AEGIS_HEAL, true, nullptr, aurEff); } void Register() override @@ -1777,7 +1777,7 @@ public: protEff->GetBase()->RefreshDuration(); } else - GetTarget()->CastCustomSpell(SPELL_PROTECTION_OF_ANCIENT_KINGS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_PROTECTION_OF_ANCIENT_KINGS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -1874,7 +1874,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_DESPERATE_RAGE, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_DESPERATE_RAGE, true, nullptr, aurEff); } void Register() override @@ -2322,7 +2322,7 @@ public: { PreventDefaultAction(); int32 bp = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), aurEff->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_ITEM_NECROTIC_TOUCH_PROC, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_ITEM_NECROTIC_TOUCH_PROC, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -2794,14 +2794,14 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_SHADOWMOURNE_SOUL_FRAGMENT, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_SHADOWMOURNE_SOUL_FRAGMENT, true, nullptr, aurEff); // this can't be handled in AuraScript of SoulFragments because we need to know victim if (Aura* soulFragments = GetTarget()->GetAura(SPELL_SHADOWMOURNE_SOUL_FRAGMENT)) { if (soulFragments->GetStackAmount() >= 10) { - GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHADOWMOURNE_CHAOS_BANE_DAMAGE, true, NULL, aurEff); + GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHADOWMOURNE_CHAOS_BANE_DAMAGE, true, nullptr, aurEff); soulFragments->Remove(); } } @@ -3034,7 +3034,7 @@ public: spellId = SPELL_UNDERBELLY_ELIXIR_TRIGGERED3; break; } - caster->CastSpell(caster, spellId, true, GetCastItem(), NULL, caster->GetGUID()); + caster->CastSpell(caster, spellId, true, GetCastItem(), nullptr, caster->GetGUID()); } void Register() override diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index c4ed71cef..48c62c32e 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -213,7 +213,7 @@ public: void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { - GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true); + GetTarget()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true); } void CalcPeriodic(AuraEffect const* /*effect*/, bool& isPeriodic, int32& /*amplitude*/) @@ -260,7 +260,7 @@ public: int32 mana = int32(eventInfo.GetDamageInfo()->GetSpellInfo()->CalcPowerCost(GetTarget(), eventInfo.GetDamageInfo()->GetSchoolMask())); mana = CalculatePct(mana, aurEff->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_MAGE_BURNOUT_TRIGGER, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_MAGE_BURNOUT_TRIGGER, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff); } void Register() override @@ -518,7 +518,7 @@ public: currentAura->GetBase()->RefreshDuration(); } else - target->CastCustomSpell(target, SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED, &bp, nullptr, nullptr, true, NULL, aurEff); + target->CastCustomSpell(target, SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED, &bp, nullptr, nullptr, true, nullptr, aurEff); } } }; @@ -644,7 +644,7 @@ public: if (roll_chance_i(chance)) { int32 bp = dmgInfo.GetDamage(); - target->CastCustomSpell(target, SPELL_MAGE_FROST_WARDING_TRIGGERED, &bp, nullptr, nullptr, true, NULL, aurEff); + target->CastCustomSpell(target, SPELL_MAGE_FROST_WARDING_TRIGGERED, &bp, nullptr, nullptr, true, nullptr, aurEff); absorbAmount = 0; // Xinef: trigger Incanters Absorbtion @@ -704,7 +704,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(_procTarget, SPELL_MAGE_FOCUS_MAGIC_PROC, true, NULL, aurEff); + GetTarget()->CastSpell(_procTarget, SPELL_MAGE_FOCUS_MAGIC_PROC, true, nullptr, aurEff); } void Register() override @@ -779,7 +779,7 @@ public: if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_AURA_SCHOOL_ABSORB, (SpellFamilyNames)GetSpellInfo()->SpellFamilyName, GetSpellInfo()->SpellIconID, EFFECT_0)) { - int32 newAmount = GetSpellInfo()->Effects[EFFECT_0].CalcValue(caster, NULL, nullptr); + int32 newAmount = GetSpellInfo()->Effects[EFFECT_0].CalcValue(caster, nullptr, nullptr); newAmount = CalculateSpellAmount(caster, newAmount, GetSpellInfo(), aurEff); if (aurEff->GetAmount() > newAmount) @@ -840,7 +840,7 @@ public: // Xinef: implement ignite bug eventInfo.GetProcTarget()->CastDelayedSpellWithPeriodicAmount(eventInfo.GetActor(), SPELL_MAGE_IGNITE, SPELL_AURA_PERIODIC_DAMAGE, amount); - //GetTarget()->CastCustomSpell(SPELL_MAGE_IGNITE, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); + //GetTarget()->CastCustomSpell(SPELL_MAGE_IGNITE, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -880,7 +880,7 @@ public: return; if (Unit* caster = GetCaster()) - caster->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true, NULL, aurEff); + caster->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true, nullptr, aurEff); } void Register() override @@ -961,7 +961,7 @@ public: mana = CalculatePct(mana, aurEff->GetAmount()); if (mana > 0) - GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 07f3b0579..9836bb3fb 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -103,7 +103,7 @@ public: if (procSpell->IsAffectingArea()) targets = 1; - eventInfo.GetActor()->CastCustomSpell(aurEff->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell, SPELLVALUE_MAX_TARGETS, targets, eventInfo.GetActionTarget(), false, NULL, aurEff); + eventInfo.GetActor()->CastCustomSpell(aurEff->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell, SPELLVALUE_MAX_TARGETS, targets, eventInfo.GetActionTarget(), false, nullptr, aurEff); } void Register() override @@ -269,7 +269,7 @@ public: cooldown = aurEffect->GetAmount() * IN_MILLISECONDS; eventInfo.GetActionTarget()->AddSpellCooldown(triggered_spell_id, 0, cooldown); - eventInfo.GetActionTarget()->CastCustomSpell(eventInfo.GetActionTarget(), triggered_spell_id, &basepoints, nullptr, nullptr, true, NULL, aurEff, eventInfo.GetActionTarget()->GetGUID()); + eventInfo.GetActionTarget()->CastCustomSpell(eventInfo.GetActionTarget(), triggered_spell_id, &basepoints, nullptr, nullptr, true, nullptr, aurEff, eventInfo.GetActionTarget()->GetGUID()); } void Register() override @@ -397,7 +397,7 @@ public: if (AuraEffect const* aurEff = target->GetAuraEffectOfRankedSpell(SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1, EFFECT_2)) { int32 basepoints = aurEff->GetAmount(); - target->CastCustomSpell(target, SPELL_PALADIN_SANCTIFIED_WRATH, &basepoints, &basepoints, NULL, true, NULL, aurEff); + target->CastCustomSpell(target, SPELL_PALADIN_SANCTIFIED_WRATH, &basepoints, &basepoints, nullptr, true, nullptr, aurEff); } } @@ -520,7 +520,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_BLESSING_OF_SANCTUARY_ENERGIZE, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_BLESSING_OF_SANCTUARY_ENERGIZE, true, nullptr, aurEff); } void Register() override @@ -736,7 +736,7 @@ public: PreventDefaultAction(); // return damage % to attacker but < 50% own total health int32 damage = int32(std::min(CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount()), GetTarget()->GetMaxHealth() / 2)); - GetTarget()->CastCustomSpell(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -1257,7 +1257,7 @@ public: holy += aurEff->GetAmount(); int32 bp = std::max(0, int32((ap * 0.022f + 0.044f * holy) * GetTarget()->GetAttackTime(BASE_ATTACK) / 1000)); - GetTarget()->CastCustomSpell(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 58acbd773..29105c5cb 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -207,7 +207,7 @@ public: absorb = std::min(absorb, eventInfo.GetProcTarget()->getLevel() * 125); - GetTarget()->CastCustomSpell(SPELL_PRIEST_DIVINE_AEGIS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_PRIEST_DIVINE_AEGIS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -279,7 +279,7 @@ public: SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL); int32 heal = int32(CalculatePct(int32(eventInfo.GetHealInfo()->GetHeal()), aurEff->GetAmount()) / triggeredSpellInfo->GetMaxTicks()); - GetTarget()->CastCustomSpell(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL, SPELLVALUE_BASE_POINT0, heal, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL, SPELLVALUE_BASE_POINT0, heal, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -412,7 +412,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_PRIEST_ITEM_EFFICIENCY, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_PRIEST_ITEM_EFFICIENCY, true, nullptr, aurEff); } void Register() override @@ -518,7 +518,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, NULL, aurEff); + GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, nullptr, aurEff); } void Register() override @@ -750,7 +750,7 @@ public: int32 bp = CalculatePct(absorbAmount, talentAurEff->GetAmount()); // xinef: prevents infinite loop! if (!dmgInfo.GetSpellInfo() || dmgInfo.GetSpellInfo()->Id != SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED) - target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, &bp, nullptr, nullptr, true, NULL, aurEff); + target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, &bp, nullptr, nullptr, true, nullptr, aurEff); } } @@ -779,7 +779,7 @@ public: if (AuraEffect* aurEff = target->GetAuraEffect(SPELL_AURA_SCHOOL_ABSORB, (SpellFamilyNames)GetSpellInfo()->SpellFamilyName, GetSpellInfo()->SpellIconID, EFFECT_0)) { - int32 newAmount = GetSpellInfo()->Effects[EFFECT_0].CalcValue(caster, NULL, nullptr); + int32 newAmount = GetSpellInfo()->Effects[EFFECT_0].CalcValue(caster, nullptr, nullptr); newAmount = CalculateSpellAmount(caster, newAmount, GetSpellInfo(), aurEff); if (aurEff->GetAmount() > newAmount) @@ -862,7 +862,7 @@ public: heal = GetTarget()->SpellHealingBonusTaken(caster, GetSpellInfo(), heal, DOT); int32 basepoints0 = empoweredRenewAurEff->GetAmount() * GetEffect(EFFECT_0)->GetTotalTicks() * int32(heal) / 100; - caster->CastCustomSpell(GetTarget(), SPELL_PRIEST_EMPOWERED_RENEW, &basepoints0, nullptr, nullptr, true, NULL, aurEff); + caster->CastCustomSpell(GetTarget(), SPELL_PRIEST_EMPOWERED_RENEW, &basepoints0, nullptr, nullptr, true, nullptr, aurEff); } } } @@ -936,7 +936,7 @@ public: int32 damage = aurEff->GetBaseAmount(); damage = aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue(caster, &damage, nullptr) * 8; // backfire damage - caster->CastCustomSpell(target, SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL, &damage, nullptr, nullptr, true, NULL, aurEff); + caster->CastCustomSpell(target, SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL, &damage, nullptr, nullptr, true, nullptr, aurEff); } } @@ -948,7 +948,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), 57669, true, NULL, aurEff); + eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), 57669, true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 515820b69..24bd365c0 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2886,7 +2886,7 @@ public: return; } - GetCaster()->CastSpell((Unit*)NULL, spellId, true); + GetCaster()->CastSpell((Unit*)nullptr, spellId, true); } void Register() override @@ -2915,7 +2915,7 @@ public: { PreventDefaultAction(); if (Unit* caster = GetCaster()) - caster->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff); + caster->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 68c159b81..d95405f2a 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -143,7 +143,7 @@ public: CustomSpellValues values; values.AddSpellMod(SPELLVALUE_BASE_POINT0, damage); values.AddSpellMod(SPELLVALUE_FORCED_CRIT_RESULT, int32(eventInfo.GetHitMask() & PROC_EX_CRITICAL_HIT)); - GetTarget()->CastCustomSpell(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK, values, procTarget, TRIGGERED_FULL_MASK, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK, values, procTarget, TRIGGERED_FULL_MASK, nullptr, aurEff); } } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index f3ac535cd..9bab69b31 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -75,7 +75,7 @@ public: { int32 bp0 = CalculatePct(totemSpell->Effects[EFFECT_0].CalcValue(), aurEff->GetAmount()); int32 bp1 = CalculatePct(totemSpell->Effects[EFFECT_1].CalcValue(), aurEff->GetAmount()); - GetCaster()->CastCustomSpell(GetCaster(), 63283, &bp0, &bp1, NULL, true); + GetCaster()->CastCustomSpell(GetCaster(), 63283, &bp0, &bp1, nullptr, true); } } @@ -604,7 +604,7 @@ public: { int32 bp = 1; if (GetCaster() && GetHitUnit() && GetOriginalCaster()) - GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_SHAMAN_CLEANSING_TOTEM_EFFECT, NULL, &bp, NULL, true, nullptr, nullptr, GetOriginalCaster()->GetGUID()); + GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_SHAMAN_CLEANSING_TOTEM_EFFECT, nullptr, &bp, nullptr, true, nullptr, nullptr, GetOriginalCaster()->GetGUID()); } void Register() override @@ -667,7 +667,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastCustomSpell(SPELL_SHAMAN_EARTH_SHIELD_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastCustomSpell(SPELL_SHAMAN_EARTH_SHIELD_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff, GetCasterGUID()); GetTarget()->AddSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL, 0, 3500); } @@ -707,7 +707,7 @@ public: if (Player* owner = GetCaster()->GetCharmerOrOwnerPlayerOrPlayerItself()) if (AuraEffect* aur = owner->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0)) if (roll_chance_i(aur->GetBaseAmount())) - GetTarget()->CastSpell((Unit*)NULL, SPELL_SHAMAN_TOTEM_EARTHEN_POWER, true); + GetTarget()->CastSpell((Unit*)nullptr, SPELL_SHAMAN_TOTEM_EARTHEN_POWER, true); } void Apply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -1042,7 +1042,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD, true, NULL, aurEff); + GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD, true, nullptr, aurEff); } void Register() override @@ -1075,7 +1075,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE, true, NULL, aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE, true, nullptr, aurEff); } void Register() override @@ -1116,7 +1116,7 @@ public: int32 mana = eventInfo.GetDamageInfo()->GetSpellInfo()->CalcPowerCost(GetTarget(), eventInfo.GetSchoolMask()); int32 damage = CalculatePct(mana, 35); - GetTarget()->CastCustomSpell(SPELL_SHAMAN_ITEM_MANA_SURGE, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_SHAMAN_ITEM_MANA_SURGE, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 9859fec9f..fab508f4e 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -898,7 +898,7 @@ public: if (AuraEffect const* glyph = GetTarget()->GetAuraEffect(SPELL_WARLOCK_GLYPH_OF_SIPHON_LIFE, EFFECT_0)) AddPct(amount, glyph->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_WARLOCK_SIPHON_LIFE_HEAL, SPELLVALUE_BASE_POINT0, amount, GetTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_WARLOCK_SIPHON_LIFE_HEAL, SPELLVALUE_BASE_POINT0, amount, GetTarget(), true, nullptr, aurEff); } void Register() override @@ -1098,7 +1098,7 @@ public: PreventDefaultAction(); int32 heal = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), aurEff->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_WARLOCK_FEL_SYNERGY_HEAL, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); // TARGET_UNIT_PET + GetTarget()->CastCustomSpell(SPELL_WARLOCK_FEL_SYNERGY_HEAL, SPELLVALUE_BASE_POINT0, heal, (Unit*)nullptr, true, nullptr, aurEff); // TARGET_UNIT_PET } void Register() override @@ -1151,7 +1151,7 @@ public: if (Unit* caster = GetCaster()) { int32 amount = aurEff->GetAmount(); - GetTarget()->CastCustomSpell(caster, SPELL_WARLOCK_HAUNT_HEAL, &amount, nullptr, nullptr, true, NULL, aurEff, GetCasterGUID()); + GetTarget()->CastCustomSpell(caster, SPELL_WARLOCK_HAUNT_HEAL, &amount, nullptr, nullptr, true, nullptr, aurEff, GetCasterGUID()); } } @@ -1195,7 +1195,7 @@ public: int32 damage = aurEff->GetBaseAmount(); damage = aurEff->GetSpellInfo()->Effects[EFFECT_0].CalcValue(caster, &damage, nullptr) * 9; // backfire damage and silence - caster->CastCustomSpell(dispelInfo->GetDispeller(), SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL, &damage, nullptr, nullptr, true, NULL, aurEff); + caster->CastCustomSpell(dispelInfo->GetDispeller(), SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL, &damage, nullptr, nullptr, true, nullptr, aurEff); } } @@ -1241,7 +1241,7 @@ public: return; if (GetCaster()->ToPlayer()->isHonorOrXPTarget(GetTarget())) - GetCaster()->CastSpell(GetTarget(), SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT, true, NULL, aurEff); + GetCaster()->CastSpell(GetTarget(), SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT, true, nullptr, aurEff); } void Register() override @@ -1354,7 +1354,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME, true, NULL, aurEff); + GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME, true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index a2c2dc918..31bb095cf 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -105,7 +105,7 @@ public: void HandleApplyAura(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) - target->CastSpell((Unit*)NULL, SPELL_WARRIOR_INTERVENE_TRIGGER, true); + target->CastSpell((Unit*)nullptr, SPELL_WARRIOR_INTERVENE_TRIGGER, true); } void Register() override @@ -399,7 +399,7 @@ public: // % of amount blocked int32 damage = CalculatePct(int32(GetTarget()->GetShieldBlockValue()), aurEff->GetAmount()); - GetTarget()->CastCustomSpell(SPELL_WARRIOR_DAMAGE_SHIELD_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, NULL, aurEff); + GetTarget()->CastCustomSpell(SPELL_WARRIOR_DAMAGE_SHIELD_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, nullptr, aurEff); } void Register() override @@ -738,7 +738,7 @@ public: { PreventDefaultAction(); int32 damage = eventInfo.GetDamageInfo()->GetDamage(); - GetTarget()->CastCustomSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK, &damage, 0, 0, true, NULL, aurEff); + GetTarget()->CastCustomSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK, &damage, 0, 0, true, nullptr, aurEff); } void Register() override @@ -827,7 +827,7 @@ public: void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_VIGILANCE_PROC, true, NULL, aurEff); + GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_VIGILANCE_PROC, true, nullptr, aurEff); } void Register() override @@ -940,7 +940,7 @@ public: void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARRIOR_RETALIATION_DAMAGE, true, NULL, aurEff); + GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARRIOR_RETALIATION_DAMAGE, true, nullptr, aurEff); } void Register() override diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index a6d53151a..2b45bf351 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -364,7 +364,7 @@ public: switch (eventId) { case EVENT_SHADOW_BOLT_WHIRL: - me->CastSpell((Unit*)NULL, SPELL_SHADOW_BOLT_WHIRL, false); + me->CastSpell((Unit*)nullptr, SPELL_SHADOW_BOLT_WHIRL, false); events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, urand(15000, 30000)); break; default: @@ -407,7 +407,7 @@ public: { if (moveType == FOLLOW_MOTION_TYPE && data == _summonerGuid) { - me->CastSpell((Unit*)NULL, SPELL_DARK_OFFERING, false); + me->CastSpell((Unit*)nullptr, SPELL_DARK_OFFERING, false); me->DespawnOrUnsummon(1000); } } diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 91ea7b952..342141937 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -414,7 +414,7 @@ void ProcessUnlearnAction(Player* player, Creature* creature, uint32 spellId, ui player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, 0, 0); } else - player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, nullptr); + player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, nullptr, nullptr); CloseGossipMenuFor(player); } @@ -1208,19 +1208,19 @@ public: { // Learn Goblin case GOSSIP_ACTION_INFO_DEF + 1: - ProcessCastaction(player, NULL, S_GOBLIN, S_LEARN_GOBLIN, DoLearnCost(player)); + ProcessCastaction(player, nullptr, S_GOBLIN, S_LEARN_GOBLIN, DoLearnCost(player)); break; // Learn Gnomish case GOSSIP_ACTION_INFO_DEF + 2: - ProcessCastaction(player, NULL, S_GNOMISH, S_LEARN_GNOMISH, DoLearnCost(player)); + ProcessCastaction(player, nullptr, S_GNOMISH, S_LEARN_GNOMISH, DoLearnCost(player)); break; //Unlearn Goblin case GOSSIP_ACTION_INFO_DEF + 3: - ProcessUnlearnAction(player, NULL, S_UNLEARN_GOBLIN, 0, DoHighUnlearnCost(player)); + ProcessUnlearnAction(player, nullptr, S_UNLEARN_GOBLIN, 0, DoHighUnlearnCost(player)); break; //Unlearn Gnomish case GOSSIP_ACTION_INFO_DEF + 4: - ProcessUnlearnAction(player, NULL, S_UNLEARN_GNOMISH, 0, DoHighUnlearnCost(player)); + ProcessUnlearnAction(player, nullptr, S_UNLEARN_GNOMISH, 0, DoHighUnlearnCost(player)); break; } } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index f94bc50db..ddb95ec96 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -562,7 +562,7 @@ public: if (!playerTarget) return; - Creature* lastSpawnedGuard = SpawnedGUID == 0 ? NULL : GetSummonedGuard(); + Creature* lastSpawnedGuard = SpawnedGUID == 0 ? nullptr : GetSummonedGuard(); // prevent calling ObjectAccessor::GetUnit at next MoveInLineOfSight call - speedup if (!lastSpawnedGuard) diff --git a/src/server/shared/DataStores/DBCStore.cpp b/src/server/shared/DataStores/DBCStore.cpp index 6ecc9f6fc..576066e13 100644 --- a/src/server/shared/DataStores/DBCStore.cpp +++ b/src/server/shared/DataStores/DBCStore.cpp @@ -37,7 +37,7 @@ bool DBCStorageBase::Load(char const* path, char**& indexTable) if (char* stringBlock = dbc.AutoProduceStrings(_fileFormat, _dataTable)) _stringPool.push_back(stringBlock); - // error in dbc file at loading if NULL + // error in dbc file at loading if nullptr return indexTable != nullptr; } diff --git a/src/server/worldserver/ACSoap/ACSoap.cpp b/src/server/worldserver/ACSoap/ACSoap.cpp index c650e3cab..54ed00d71 100644 --- a/src/server/worldserver/ACSoap/ACSoap.cpp +++ b/src/server/worldserver/ACSoap/ACSoap.cpp @@ -154,8 +154,8 @@ struct Namespace namespaces[] = { { "SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", nullptr, nullptr }, // must be first { "SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", nullptr, nullptr }, // must be second - { "xsi", "http://www.w3.org/1999/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL }, - { "xsd", "http://www.w3.org/1999/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL }, + { "xsi", "http://www.w3.org/1999/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", nullptr }, + { "xsd", "http://www.w3.org/1999/XMLSchema", "http://www.w3.org/*/XMLSchema", nullptr }, { "ns1", "urn:AC", nullptr, nullptr }, // "ns1" namespace prefix { nullptr, nullptr, nullptr, nullptr } }; diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 611fe5e2f..88a20637c 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -53,7 +53,7 @@ char* command_finder(const char* text, int state) return strdup(ret); } - return ((char*)NULL); + return ((char*)nullptr); } char** cli_completion(const char* text, int start, int /*end*/)